propagate from branch 'i2p.i2p.zzz.test2' (head 9dca19f228a66b5ac646c3d97d4f018c733081de)

to branch 'i2p.i2p' (head e7f2b0990f1ff9ab0e0d8633ac2faf35a993b917)
This commit is contained in:
zzz
2014-11-06 17:53:02 +00:00
115 changed files with 56462 additions and 45656 deletions

View File

@@ -15,11 +15,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.SortedSet;
import java.util.StringTokenizer;
import java.util.concurrent.Executors;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.LinkedBlockingQueue;
import net.i2p.I2PAppContext;
import net.i2p.app.ClientAppManager;
@@ -37,6 +33,7 @@ import net.i2p.util.FileUtil;
import net.i2p.util.I2PAppThread;
import net.i2p.util.PortMapper;
import net.i2p.util.SecureDirectory;
import net.i2p.util.I2PSSLSocketFactory;
import net.i2p.util.SystemVersion;
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.ConstraintMapping;
@@ -121,7 +118,9 @@ public class RouterConsoleRunner implements RouterApp {
private static final String USAGE = "Bad RouterConsoleRunner arguments, check clientApp.0.args in your clients.config file! " +
"Usage: [[port host[,host]] [-s sslPort [host[,host]]] [webAppsDir]]";
/** this is for the handlers only. We will adjust for the connectors and acceptors below. */
private static final int MIN_THREADS = 1;
/** this is for the handlers only. We will adjust for the connectors and acceptors below. */
private static final int MAX_THREADS = 24;
private static final int MAX_IDLE_TIME = 90*1000;
private static final String THREAD_NAME = "RouterConsole Jetty";
@@ -343,19 +342,45 @@ public class RouterConsoleRunner implements RouterApp {
_server = new Server();
_server.setGracefulShutdown(1000);
try {
ThreadPool ctp = new CustomThreadPoolExecutor();
// Gone in Jetty 7
//ctp.prestartAllCoreThreads();
_server.setThreadPool(ctp);
} catch (Throwable t) {
// In Jetty 6, QTP was not concurrent, so we switched to
// ThreadPoolExecutor with a fixed-size queue, a set maxThreads,
// and a RejectedExecutionPolicy of CallerRuns.
// Unfortunately, CallerRuns causes lockups in Jetty NIO (ticket #1395)
// In addition, no flavor of TPE gives us what QTP does:
// - TPE direct handoff (which we were using) never queues.
// This doesn't provide any burst management when maxThreads is reached.
// CallerRuns was an attempt to work around that.
// - TPE unbounded queue does not adjust the number of threads.
// This doesn't provide automatic resource management.
// - TPE bounded queue does not add threads until the queue is full.
// This doesn't provide good responsiveness to even small bursts.
// QTP adds threads as soon as the queue is non-empty.
// QTP as of Jetty 7 uses concurrent.
// QTP unbounded queue is the default in Jetty.
// So switch back to QTP with a bounded queue.
//
// ref:
// http://docs.oracle.com/javase/6/docs/api/java/util/concurrent/ThreadPoolExecutor.html
// https://wiki.eclipse.org/Jetty/Howto/High_Load
//
//try {
// ThreadPool ctp = new CustomThreadPoolExecutor();
// // Gone in Jetty 7
// //ctp.prestartAllCoreThreads();
// _server.setThreadPool(ctp);
//} catch (Throwable t) {
// class not found...
System.out.println("INFO: Jetty concurrent ThreadPool unavailable, using QueuedThreadPool");
QueuedThreadPool qtp = new QueuedThreadPool(MAX_THREADS);
qtp.setMinThreads(MIN_THREADS);
//System.out.println("INFO: Jetty concurrent ThreadPool unavailable, using QueuedThreadPool");
LinkedBlockingQueue<Runnable> lbq = new LinkedBlockingQueue<Runnable>(4*MAX_THREADS);
QueuedThreadPool qtp = new QueuedThreadPool(lbq);
// min and max threads will be set below
//qtp.setMinThreads(MIN_THREADS);
//qtp.setMaxThreads(MAX_THREADS);
qtp.setMaxIdleTimeMs(MAX_IDLE_TIME);
qtp.setName(THREAD_NAME);
qtp.setDaemon(true);
_server.setThreadPool(qtp);
}
//}
HandlerCollection hColl = new HandlerCollection();
ContextHandlerCollection chColl = new ContextHandlerCollection();
@@ -490,6 +515,10 @@ public class RouterConsoleRunner implements RouterApp {
sslFactory.setKeyStorePassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
// the X.509 cert password (if not present, verifyKeyStore() returned false)
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(
new String[I2PSSLSocketFactory.EXCLUDE_CIPHERS.size()]));
StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,");
while (tok.hasMoreTokens()) {
String host = tok.nextToken().trim();
@@ -548,6 +577,10 @@ public class RouterConsoleRunner implements RouterApp {
System.err.println("Unable to bind routerconsole to any address on port " + _listenPort + (sslPort > 0 ? (" or SSL port " + sslPort) : ""));
return;
}
// Each address spawns a Connector and an Acceptor thread
// If the min is less than this, we have no thread for the handlers or the expiration thread.
qtp.setMinThreads(MIN_THREADS + (2 * boundAddresses));
qtp.setMaxThreads(MAX_THREADS + (2 * boundAddresses));
File tmpdir = new SecureDirectory(workDir, ROUTERCONSOLE + "-" +
(_listenPort != null ? _listenPort : _sslListenPort));
@@ -859,6 +892,7 @@ public class RouterConsoleRunner implements RouterApp {
* Just to set the name and set Daemon
* @since Jetty 6
*/
/*****
private static class CustomThreadPoolExecutor extends ExecutorThreadPool {
public CustomThreadPoolExecutor() {
super(new ThreadPoolExecutor(
@@ -869,11 +903,13 @@ public class RouterConsoleRunner implements RouterApp {
);
}
}
*****/
/**
* Just to set the name and set Daemon
* @since Jetty 6
*/
/*****
private static class CustomThreadFactory implements ThreadFactory {
public Thread newThread(Runnable r) {
@@ -883,5 +919,6 @@ public class RouterConsoleRunner implements RouterApp {
return rv;
}
}
*****/
}

View File

@@ -9,6 +9,7 @@
# blabla <blabla@trash-mail.com>, 2014
# D.A. Loader <>, 2012
# ducki2p <ducki2p@gmail.com>, 2011
# Ettore Atalan <atalanttore@googlemail.com>, 2014
# foo <foo@bar>, 2009
# mixxy, 2011
# nextloop <ga25day@mytum.de>, 2013
@@ -19,8 +20,8 @@ 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-15 18:37+0000\n"
"Last-Translator: blabla <blabla@trash-mail.com>\n"
"PO-Revision-Date: 2014-09-19 15:50+0000\n"
"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\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"
@@ -29,7 +30,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "Anonymous Proxy"
msgstr "anonymer Proxy"
msgstr "Anonymer Proxy"
msgid "Satellite Provider"
msgstr "Satellitenanbieter"

View File

@@ -5,14 +5,15 @@
#
# Translators:
# tengo <akin@rbcmail.ru>, 2013
# rlagutin <rlagutin@tradingview.com>, 2014
# tengo <akin@rbcmail.ru>, 2013
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-25 11:14+0000\n"
"Last-Translator: The_Keeper <alexdyomin@mail.ru>\n"
"PO-Revision-Date: 2014-10-27 15:59+0000\n"
"Last-Translator: rlagutin <rlagutin@tradingview.com>\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"
@@ -38,7 +39,7 @@ msgstr "Пока Вы ждете, самое время зайти в {2}сет
msgid ""
"Also you can setup your browser to use the I2P proxy to reach eepsites."
msgstr "Вы также можете настроить браузер на использование I2P-прокси чтобы иметь доступ к I2P-сайтам (eepsites)."
msgstr "Вы также можете настроить браузер на использование I2P-прокси, чтобы иметь доступ к I2P-сайтам (eepsites)."
msgid ""
"Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-17 21:49+0000\n"
"POT-Creation-Date: 2014-10-30 20:10+0000\n"
"PO-Revision-Date: 2010-06-15 14:09+0100\n"
"Last-Translator: duck <duck@mail.i2p>\n"
"Language-Team: duck <duck@mail.i2p>\n"
@@ -26,7 +26,7 @@ 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:1525
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1472
#, java-format
msgid "1 ms"
msgid_plural "{0,number,####} ms"
@@ -35,7 +35,7 @@ msgstr[1] ""
#. seconds
#. alternates: secs, sec. 'seconds' is probably too long.
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1476
#, java-format
msgid "1 sec"
msgid_plural "{0} sec"
@@ -44,7 +44,7 @@ msgstr[1] ""
#. minutes
#. alternates: mins, min. 'minutes' is probably too long.
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1480
#, java-format
msgid "1 min"
msgid_plural "{0} min"
@@ -53,20 +53,20 @@ msgstr[1] ""
#. hours
#. alternates: hrs, hr., hrs.
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484
#, java-format
msgid "1 hour"
msgid_plural "{0} hours"
msgstr[0] ""
msgstr[1] ""
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1486
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343
msgid "n/a"
msgstr ""
#. days
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542
#: ../../../core/java/src/net/i2p/data/DataHelper.java:1489
#, java-format
msgid "1 day"
msgid_plural "{0} days"
@@ -234,7 +234,7 @@ msgstr ""
msgid "Known fast peers"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373
#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:442
msgid "NetDb entry"
msgstr ""
@@ -243,45 +243,49 @@ msgstr ""
msgid "No transports (hidden or starting up?)"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:563
msgid "Unsupported signature type"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:567
msgid "Unreachable on any transport"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622
msgid "Router Transport Addresses"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:630
#, java-format
msgid "{0} is used for outbound connections only"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:646
#: ../java/src/net/i2p/router/web/HomeHelper.java:33
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167
msgid "Help"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:647
msgid ""
"Your transport connection limits are automatically set based on your "
"configured bandwidth."
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:649
msgid ""
"To override these limits, add the settings i2np.ntcp.maxConnections=nnn and "
"i2np.udp.maxConnections=nnn on the advanced configuration page."
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:651
#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275
msgid "Definitions"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:652
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1186
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2563
#: ../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
@@ -290,146 +294,146 @@ msgstr ""
msgid "Peer"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:652
msgid "The remote peer, identified by router hash"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:653
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1187
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
msgid "Dir"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:654
msgid "Inbound connection"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:656
msgid "Outbound connection"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:658
msgid "They offered to introduce us (help other peers traverse our firewall)"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:660
msgid "We offered to introduce them (help other peers traverse their firewall)"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:661
msgid "How long since a packet has been received / sent"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:661
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1189
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2569
msgid "Idle"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1190
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
msgid "In/Out"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:662
msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
msgid "How long ago this connection was established"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:663
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1191
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
#: ../java/src/net/i2p/router/web/SummaryHelper.java:885
msgid "Up"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2581
msgid "Skew"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:664
msgid "The difference between the peer's clock and your own"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:665
msgid ""
"The congestion window, which is how many bytes can be sent without an "
"acknowledgement"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:666
msgid "The number of sent messages awaiting acknowledgement"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:667
msgid "The maximum number of concurrent messages to send"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:668
msgid "The number of pending sends which exceed congestion window"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:669
msgid "The slow start threshold"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:670
msgid "The round trip time in milliseconds"
msgstr ""
#. "<b id=\"def.dev\">").append(_("Dev")).append("</b>: ").append(_("The standard deviation of the round trip time in milliseconds")).append("<br>\n" +
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:672
msgid "The retransmit timeout in milliseconds"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:673
msgid ""
"Current maximum send packet size / estimated maximum receive packet size "
"(bytes)"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1193
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
msgid "TX"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674
msgid "The total number of packets sent to the peer"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
msgid "RX"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:675
msgid "The total number of packets received from the peer"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603
msgid "Dup TX"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:676
msgid "The total number of packets retransmitted to the peer"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2605
msgid "Dup RX"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615
#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:677
msgid "The total number of duplicate packets received from the peer"
msgstr ""
@@ -553,190 +557,190 @@ msgstr ""
msgid "UPnP is not enabled"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:540
#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:844
#, java-format
msgid "Excessive clock skew: {0}"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1181
msgid "NTCP connections"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1182
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
msgid "Limit"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1183
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560
msgid "Timeout"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1188
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
msgid "IPv6"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1195
msgid "Out Queue"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1196
msgid "Backlogged?"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1209
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
msgid "Inbound"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1211
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2624
#: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:92
msgid "Outbound"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763
#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1266
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2789
#, java-format
msgid "{0} peer"
msgid_plural "{0} peers"
msgstr[0] ""
msgstr[1] ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558
msgid "UDP connections"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565
msgid "Sort by peer hash"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567
msgid "Direction/Introduction"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2570
msgid "Sort by idle inbound"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572
msgid "Sort by idle outbound"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
msgid "Sort by inbound rate"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577
msgid "Sort by outbound rate"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
msgid "Sort by connection uptime"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2582
msgid "Sort by clock skew"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585
msgid "Sort by congestion window"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587
msgid "Sort by slow start threshold"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2590
msgid "Sort by round trip time"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2594
msgid "Sort by retransmission timeout"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2597
msgid "Sort by outbound maximum transmit unit"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2599
msgid "Sort by packets sent"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601
msgid "Sort by packets received"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2604
msgid "Sort by packets retransmitted"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
msgid "Sort by packets received more than once"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2626
msgid "We offered to introduce them"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2628
msgid "They offered to introduce us"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2632
msgid "Choked"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2640
msgid "1 fail"
msgstr ""
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2642
#, java-format
msgid "{0} fails"
msgstr ""
#. 1
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2648
#: ../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:2681
#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2707
msgid "backlogged"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:213
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:220
msgid "Dropping tunnel requests: Too slow"
msgstr ""
#. don't even bother, since we are so overloaded locally
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:371
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:378
msgid "Dropping tunnel requests: Overloaded"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:618
msgid "Rejecting tunnels: Hidden mode"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:646
msgid "Rejecting tunnels: Request overload"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:677
msgid "Rejecting tunnels: Connection limit"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:889
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:922
msgid "Dropping tunnel requests: High load"
msgstr ""
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980
#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1001
msgid "Dropping tunnel requests: Queue time"
msgstr ""
@@ -1351,7 +1355,7 @@ msgid "Plugin"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:208
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321
msgid "Version"
@@ -1670,7 +1674,7 @@ msgid "Peers"
msgstr ""
#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240
msgid "Stats"
msgstr ""
@@ -2614,7 +2618,7 @@ msgid "{0} for {1}"
msgstr ""
#: ../java/src/net/i2p/router/web/GraphHelper.java:223
#: ../java/src/net/i2p/router/web/StatSummarizer.java:304
#: ../java/src/net/i2p/router/web/StatSummarizer.java:332
msgid "Bandwidth usage"
msgstr ""
@@ -3113,148 +3117,156 @@ msgid "Unpublished"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:152
msgid "Destination"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188
msgid "Add to local addressbook"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:166
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:193
#, java-format
msgid "Expires in {0}"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:195
#, java-format
msgid "Expired {0} ago"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:187
#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162
msgid "Gateway"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:187
msgid "Lease"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:189
msgid "Tunnel"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:255
msgid "Not initialized"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:305
msgid "Network Database Router Statistics"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:312
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:326
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
msgid "Count"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:326
msgid "Transports"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:344
msgid "Country"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403
msgid "Our info"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:405
msgid "Peer info for"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:407
msgid "Full entry"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
#: ../java/src/net/i2p/router/web/SummaryHelper.java:152
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700
msgid "Hidden"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:414
msgid "Updated"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
#, java-format
msgid "{0} ago"
msgstr ""
#. shouldnt happen
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:417
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:421
msgid "Published"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423
msgid "Signing Key"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425
msgid "Address(es)"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:437
msgid "cost"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
msgid "Hidden or starting up"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
msgid "SSU"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463
msgid "SSU with introducers"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
msgid "NTCP"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
msgid "NTCP and SSU"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:464
msgid "NTCP and SSU with introducers"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
msgid "IPv6 Only SSU, introducers"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
msgid "IPv6 SSU"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:465
msgid "IPv6 SSU, introducers"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
msgid "IPv6 NTCP"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
msgid "IPv6 NTCP, SSU"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
msgid "IPv6 NTCP, SSU, introducers"
msgstr ""
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459
#: ../java/src/net/i2p/router/web/NetDbRenderer.java:466
msgid "IPv6 Only NTCP, SSU, introducers"
msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff