From 6371f66677d91b5ee1d1af1934613c1a734d35d2 Mon Sep 17 00:00:00 2001 From: z3d Date: Fri, 27 Nov 2009 12:03:56 +0000 Subject: [PATCH 01/28] Midnight console theme tweaks. --- .../themes/console/midnight/console.css | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index 1c89b49e69..10ac6422ba 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -47,7 +47,7 @@ div.logo hr { background: #99f; height: 1px; border: 0px solid #99f; - margin: 8px -3px; + margin: 8px -5px; } div.logo a:link, div.logo a:visited { @@ -103,7 +103,7 @@ div.warning hr { background: #fb7; height: 1px; border: 0px solid #fb7; - margin: 10px 0 5px 0; + margin: 10px 0; } div.warning h3 { @@ -114,6 +114,7 @@ div.warning h3 { font-variant: small-caps; text-transform: capitalize; font-size: 12.5pt; + background: none; } /* console error messages */ @@ -220,7 +221,7 @@ div.routersummary table { border: 0; text-align: center !important; margin: -5px 0px -5px 2px; - width: 185px !important; + width: 186px !important; overflow: hidden; font-size: 8pt; padding: 0 -12px; @@ -257,6 +258,7 @@ div.tunnels table{ width: 16px; text-align: right; margin-right: -2px; + padding-right: 0; } div.routersummary form { @@ -564,7 +566,7 @@ h2, h3 { .proxyfooter{ font-size: 7pt; - display: none !important; + display: none !important; } table { @@ -860,4 +862,12 @@ div.graphspanel h3 { table code { font-size: 8.5pt; +} + +table li:last-child{ + margin-bottom: 15px; +} + +table ul { + font-size: 8.5pt; } \ No newline at end of file From 0642fa80939d9ca5c0972ef65f0defc645caf443 Mon Sep 17 00:00:00 2001 From: sponge Date: Sat, 28 Nov 2009 13:53:34 +0000 Subject: [PATCH 02/28] * Improvement to BOB's TCPio to hopefully lower load average. It seems to be helping a little when stress-tested with Robert. --- apps/BOB/nbproject/private/private.xml | 3 --- apps/BOB/src/net/i2p/BOB/DoCMDS.java | 2 +- apps/BOB/src/net/i2p/BOB/TCPio.java | 8 ++++++-- history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index 685ecc5a17..c1f155a782 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -1,7 +1,4 @@ - - file:/usblv/NetBeansProjects/wi2p.i2p/apps/BOB/src/net/i2p/BOB/BOB.java - diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 8e4afb1433..14c83c4ba1 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java @@ -50,7 +50,7 @@ public class DoCMDS implements Runnable { // FIX ME // I need a better way to do versioning, but this will do for now. - public static final String BMAJ = "00", BMIN = "00", BREV = "08", BEXT = ""; + public static final String BMAJ = "00", BMIN = "00", BREV = "09", BEXT = ""; public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT; private Socket server; private Properties props; diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java index d501759ef1..5e99637dd9 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPio.java +++ b/apps/BOB/src/net/i2p/BOB/TCPio.java @@ -78,16 +78,20 @@ public class TCPio implements Runnable { * --Sponge * * Tested with 128 bytes, and there was no performance gain. + * 8192 bytes did lower load average across many connections. + * Should I raise it higer? The correct thing to do would be to + * override... perhaps use NTCP, but I2P's streaming lib lacks + * anything NTCP compatable. * * --Sponge */ int b; - byte a[] = new byte[1]; + byte a[] = new byte[8192]; try { try { while (lives.get()) { - b = Ain.read(a, 0, 1); + b = Ain.read(a, 0, 8192); if (b > 0) { Aout.write(a, 0, b); } else if (b == 0) { diff --git a/history.txt b/history.txt index c82497128e..f70d505c5c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-11-28 sponge + * Improvement to BOB's TCPio to hopefully lower load average. It seems + to be helping a little when stress-tested with Robert. + 2009-11-24 zzz * DataStructures: Remove unused Logs * OrderedProperties: Simplify, use in i2psnark diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1ca622af59..b9d2a6b01f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 21; + public final static long BUILD = 22; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 278b9174942349b4886e984023f7434c67e85854 Mon Sep 17 00:00:00 2001 From: sponge Date: Sun, 29 Nov 2009 15:02:50 +0000 Subject: [PATCH 03/28] net.i2p.router.transport.udp deadwood code cleanup. documented rare NPE in InboundEstablishState.java. --- apps/BOB/nbproject/private/private.xml | 3 +++ history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../router/transport/udp/InboundEstablishState.java | 8 ++++---- .../router/transport/udp/IntroductionManager.java | 6 ++---- .../router/transport/udp/OutboundEstablishState.java | 3 +-- .../transport/udp/OutboundMessageFragments.java | 12 ++++++------ .../router/transport/udp/OutboundMessageState.java | 4 ++-- .../i2p/router/transport/udp/OutboundRefiller.java | 4 ++-- .../net/i2p/router/transport/udp/PacketBuilder.java | 6 ++---- .../net/i2p/router/transport/udp/PacketHandler.java | 3 +-- .../net/i2p/router/transport/udp/PacketPusher.java | 4 ++-- .../src/net/i2p/router/transport/udp/PeerState.java | 7 +++---- .../net/i2p/router/transport/udp/UDPEndpoint.java | 1 - .../src/net/i2p/router/transport/udp/UDPFlooder.java | 6 +++--- .../src/net/i2p/router/transport/udp/UDPPacket.java | 8 ++++---- .../net/i2p/router/transport/udp/UDPReceiver.java | 2 +- .../net/i2p/router/transport/udp/UDPTransport.java | 10 +++------- 18 files changed, 44 insertions(+), 49 deletions(-) diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index c1f155a782..653e554c3d 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -1,4 +1,7 @@ + + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/TCPio.java + diff --git a/history.txt b/history.txt index f70d505c5c..79bb5b2a1b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-11-29 sponge + * net.i2p.router.transport.udp deadwood code cleanup. + * documented rare NPE in InboundEstablishState.java. + 2009-11-28 sponge * Improvement to BOB's TCPio to hopefully lower load average. It seems to be helping a little when stress-tested with Robert. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b9d2a6b01f..7de969bf40 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 22; + public final static long BUILD = 23; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java index fab4ce5501..46085e3b4d 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java @@ -46,7 +46,7 @@ public class InboundEstablishState { // general status private long _establishBegin; private long _lastReceive; - private long _lastSend; + // private long _lastSend; private long _nextSend; private RemoteHostId _remoteHostId; private int _currentState; @@ -129,6 +129,7 @@ public class InboundEstablishState { public synchronized byte[] getSentY() { if (_sentY == null) + // Rare NPE seen here... _sentY = _keyBuilder.getMyPublicValueBytes(); return _sentY; } @@ -198,7 +199,7 @@ public class InboundEstablishState { /** note that we just sent a SessionCreated packet */ public synchronized void createdPacketSent() { - _lastSend = _context.clock().now(); + // _lastSend = _context.clock().now(); if ( (_currentState == STATE_UNKNOWN) || (_currentState == STATE_REQUEST_RECEIVED) ) _currentState = STATE_CREATED_SENT; } @@ -210,8 +211,7 @@ public class InboundEstablishState { public synchronized void setNextSendTime(long when) { _nextSend = when; } /** RemoteHostId, uniquely identifies an attempt */ - // FIXME Exporting non-public type through public API FIXME - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } public synchronized void receiveSessionConfirmed(UDPPacketReader.SessionConfirmedReader conf) { if (_receivedIdentity == null) diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index 20db8a0662..2e3329a8f0 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -157,8 +157,7 @@ public class IntroductionManager { return found; } - /* FIXME Exporting non-public type through public API FIXME */ - public void receiveRelayIntro(RemoteHostId bob, UDPPacketReader reader) { + void receiveRelayIntro(RemoteHostId bob, UDPPacketReader reader) { if (_context.router().isHidden()) return; if (_log.shouldLog(Log.INFO)) @@ -167,8 +166,7 @@ public class IntroductionManager { _transport.send(_builder.buildHolePunch(reader)); } - /* FIXME Exporting non-public type through public API FIXME */ - public void receiveRelayRequest(RemoteHostId alice, UDPPacketReader reader) { + void receiveRelayRequest(RemoteHostId alice, UDPPacketReader reader) { if (_context.router().isHidden()) return; long tag = reader.getRelayRequestReader().readTag(); diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java index 13a9b277f2..ece42da7a1 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java @@ -413,8 +413,7 @@ public class OutboundEstablishState { } /** uniquely identifies an attempt */ - /* FIXME Exporting non-public type through public API FIXME */ - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } /** we have received a real data packet, so we're done establishing */ public synchronized void dataReceived() { diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java index 69f9f75545..f1d10e1226 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java @@ -26,7 +26,7 @@ public class OutboundMessageFragments { private RouterContext _context; private Log _log; private UDPTransport _transport; - private ActiveThrottle _throttle; // LINT not used ?? + // private ActiveThrottle _throttle; // LINT not used ?? /** peers we are actively sending messages to */ private final List _activePeers; private boolean _alive; @@ -34,8 +34,8 @@ public class OutboundMessageFragments { private int _nextPeer; private PacketBuilder _builder; /** if we can handle more messages explicitly, set this to true */ - private boolean _allowExcess; // LINT not used?? - private volatile long _packetsRetransmitted; // LINT not used?? + // private boolean _allowExcess; // LINT not used?? + // private volatile long _packetsRetransmitted; // LINT not used?? // private static final int MAX_ACTIVE = 64; // not used. // don't send a packet more than 10 times @@ -45,12 +45,12 @@ public class OutboundMessageFragments { _context = ctx; _log = ctx.logManager().getLog(OutboundMessageFragments.class); _transport = transport; - _throttle = throttle; + // _throttle = throttle; _activePeers = new ArrayList(256); _nextPeer = 0; _builder = new PacketBuilder(ctx, transport); _alive = true; - _allowExcess = false; + // _allowExcess = false; _context.statManager().createRateStat("udp.sendVolleyTime", "Long it takes to send a full volley", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendConfirmTime", "How long it takes to send a message and get the ACK", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendConfirmFragments", "How many fragments are included in a fully ACKed message", "udp", UDPTransport.RATES); @@ -376,7 +376,7 @@ public class OutboundMessageFragments { if (state.getPushCount() > 1) { int toSend = fragments-sparseCount; peer.messageRetransmitted(toSend); - _packetsRetransmitted += toSend; // lifetime for the transport + // _packetsRetransmitted += toSend; // lifetime for the transport _context.statManager().addRateData("udp.peerPacketsRetransmitted", peer.getPacketsRetransmitted(), peer.getPacketsTransmitted()); _context.statManager().addRateData("udp.packetsRetransmitted", state.getLifetime(), peer.getPacketsTransmitted()); if (_log.shouldLog(Log.INFO)) diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index 650c17592a..f4afa45c63 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -32,7 +32,7 @@ public class OutboundMessageState { private long _nextSendTime; private int _pushCount; private short _maxSends; - private int _nextSendFragment; + // private int _nextSendFragment; public static final int MAX_MSG_SIZE = 32 * 1024; /** is this enough for a high-bandwidth router? */ @@ -45,7 +45,7 @@ public class OutboundMessageState { _log = _context.logManager().getLog(OutboundMessageState.class); _pushCount = 0; _maxSends = 0; - _nextSendFragment = 0; + // _nextSendFragment = 0; } public boolean initialize(OutNetMessage msg) { diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java b/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java index 457f7668e2..1f61b896c5 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundRefiller.java @@ -16,14 +16,14 @@ public class OutboundRefiller implements Runnable { private OutboundMessageFragments _fragments; private MessageQueue _messages; private boolean _alive; - private Object _refillLock; + // private Object _refillLock; public OutboundRefiller(RouterContext ctx, OutboundMessageFragments fragments, MessageQueue messages) { _context = ctx; _log = ctx.logManager().getLog(OutboundRefiller.class); _fragments = fragments; _messages = messages; - _refillLock = this; + // _refillLock = this; _context.statManager().createRateStat("udp.timeToActive", "Message lifetime until it reaches the outbound fragment queue", "udp", UDPTransport.RATES); } diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java index 8b09dab411..5fe177764f 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -879,8 +879,7 @@ public class PacketBuilder { */ private static final byte PEER_RELAY_INTRO_FLAG_BYTE = (UDPPacket.PAYLOAD_TYPE_RELAY_INTRO << 4); - /* FIXME Exporting non-public type through public API FIXME */ - public UDPPacket buildRelayIntro(RemoteHostId alice, PeerState charlie, UDPPacketReader.RelayRequestReader request) { + UDPPacket buildRelayIntro(RemoteHostId alice, PeerState charlie, UDPPacketReader.RelayRequestReader request) { UDPPacket packet = UDPPacket.acquire(_context, false); byte data[] = packet.getPacket().getData(); Arrays.fill(data, 0, data.length, (byte)0x0); @@ -930,8 +929,7 @@ public class PacketBuilder { */ private static final byte PEER_RELAY_RESPONSE_FLAG_BYTE = (UDPPacket.PAYLOAD_TYPE_RELAY_RESPONSE << 4); - /* FIXME Exporting non-public type through public API FIXME */ - public UDPPacket buildRelayResponse(RemoteHostId alice, PeerState charlie, long nonce, SessionKey aliceIntroKey) { + UDPPacket buildRelayResponse(RemoteHostId alice, PeerState charlie, long nonce, SessionKey aliceIntroKey) { InetAddress aliceAddr = null; try { aliceAddr = InetAddress.getByAddress(alice.getIP()); diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java index 053bb14b0d..8edcc5def7 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java @@ -36,8 +36,7 @@ public class PacketHandler { /** let packets be up to 30s slow */ private static final long GRACE_PERIOD = Router.CLOCK_FUDGE_FACTOR + 30*1000; - /* FIXME Exporting non-public type through public API FIXME */ - public PacketHandler(RouterContext ctx, UDPTransport transport, UDPEndpoint endpoint, EstablishmentManager establisher, InboundMessageFragments inbound, PeerTestManager testManager, IntroductionManager introManager) {// LINT -- Exporting non-public type through public API + PacketHandler(RouterContext ctx, UDPTransport transport, UDPEndpoint endpoint, EstablishmentManager establisher, InboundMessageFragments inbound, PeerTestManager testManager, IntroductionManager introManager) {// LINT -- Exporting non-public type through public API _context = ctx; _log = ctx.logManager().getLog(PacketHandler.class); _transport = transport; diff --git a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java index 8ec9cbb0d2..cb31376b4f 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketPusher.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketPusher.java @@ -10,14 +10,14 @@ import net.i2p.util.Log; * */ public class PacketPusher implements Runnable { - private RouterContext _context; + // private RouterContext _context; private Log _log; private OutboundMessageFragments _fragments; private UDPSender _sender; private boolean _alive; public PacketPusher(RouterContext ctx, OutboundMessageFragments fragments, UDPSender sender) { - _context = ctx; + // _context = ctx; _log = ctx.logManager().getLog(PacketPusher.class); _fragments = fragments; _sender = sender; diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java index 275a68b002..050d87d4de 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java @@ -72,7 +72,7 @@ public class PeerState { /** how many consecutive messages have we sent and not received an ACK to */ private int _consecutiveFailedSends; /** when did we last have a failed send (beginning of period) */ - private long _lastFailedSendPeriod; + // private long _lastFailedSendPeriod; /** list of messageIds (Long) that we have received but not yet sent */ private final List _currentACKs; /** @@ -805,7 +805,7 @@ public class PeerState { _concurrentMessagesActive = 0; _consecutiveFailedSends = 0; - _lastFailedSendPeriod = -1; + // _lastFailedSendPeriod = -1; if (numSends < 2) { if (_context.random().nextInt(_concurrentMessagesAllowed) <= 0) _concurrentMessagesAllowed++; @@ -1003,8 +1003,7 @@ public class PeerState { return MAX_RTO; } - /* FIXME Exporting non-public type through public API FIXME */ - public RemoteHostId getRemoteHostId() { return _remoteHostId; } + RemoteHostId getRemoteHostId() { return _remoteHostId; } public int add(OutboundMessageState state) { if (_dead) { diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java index 26563c210f..ac9369d8eb 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java @@ -4,7 +4,6 @@ import java.net.DatagramSocket; import java.net.InetAddress; import java.net.SocketException; -import net.i2p.router.CommSystemFacade; import net.i2p.router.RouterContext; import net.i2p.util.Log; diff --git a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java index 633b924219..ef091ff53d 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPFlooder.java @@ -9,14 +9,14 @@ import net.i2p.data.i2np.I2NPMessage; import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; -import net.i2p.util.Log; +// import net.i2p.util.Log; /** * */ class UDPFlooder implements Runnable { private RouterContext _context; - private Log _log; + // private Log _log; private UDPTransport _transport; private final List _peers; private boolean _alive; @@ -24,7 +24,7 @@ class UDPFlooder implements Runnable { public UDPFlooder(RouterContext ctx, UDPTransport transport) { _context = ctx; - _log = ctx.logManager().getLog(UDPFlooder.class); + // _log = ctx.logManager().getLog(UDPFlooder.class); _transport = transport; _peers = new ArrayList(4); ctx.random().nextBytes(_floodData); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java index 11ffbc67e8..97e112df39 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -38,7 +38,7 @@ public class UDPPacket { private long _beforeReceiveFragments; private long _afterHandlingTime; private int _validateCount; - private boolean _isInbound; + // private boolean _isInbound; private static final List _packetCache; static { @@ -83,13 +83,14 @@ public class UDPPacket { _ivBuf = new byte[IV_SIZE]; init(ctx, inbound); } + // FIXME optimization, remove the inbound parameter, as it is unused. FIXME private void init(I2PAppContext ctx, boolean inbound) { _context = ctx; //_dataBuf = _dataCache.acquire(); Arrays.fill(_data, (byte)0); //_packet = new DatagramPacket(_data, MAX_PACKET_SIZE); _packet.setData(_data); - _isInbound = inbound; + // _isInbound = inbound; _initializeTime = _context.clock().now(); _markedType = -1; _validateCount = 0; @@ -125,8 +126,7 @@ public class UDPPacket { int getFragmentCount() { return _fragmentCount; } void setFragmentCount(int count) { _fragmentCount = count; } - // FIXME Exporting non-public type through public API FIXME - public RemoteHostId getRemoteHost() { + RemoteHostId getRemoteHost() { if (_remoteHost == null) { long before = System.currentTimeMillis(); InetAddress addr = _packet.getAddress(); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java index 2a03cb6278..c1bd5133a5 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -28,7 +28,7 @@ public class UDPReceiver { private boolean _keepRunning; private Runner _runner; private UDPTransport _transport; - private static int __id; + // private static int __id; private int _id; public UDPReceiver(RouterContext ctx, UDPTransport transport, DatagramSocket socket, String name) { diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index a96a4d5075..7bc5990b9c 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -3,7 +3,6 @@ package net.i2p.router.transport.udp; import java.io.IOException; import java.io.Writer; import java.net.InetAddress; -import java.net.SocketException; import java.net.UnknownHostException; import java.text.DecimalFormat; import java.util.ArrayList; @@ -545,8 +544,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority * get the state for the peer at the given remote host/port, or null * if no state exists */ - /* FIXME Exporting non-public type through public API FIXME */ - public PeerState getPeerState(RemoteHostId hostInfo) { + PeerState getPeerState(RemoteHostId hostInfo) { synchronized (_peersByRemoteHost) { return (PeerState)_peersByRemoteHost.get(hostInfo); } @@ -783,8 +781,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } - /* FIXME Exporting non-public type through public API FIXME */ - public boolean isInDropList(RemoteHostId peer) { synchronized (_dropList) { return _dropList.contains(peer); } } + boolean isInDropList(RemoteHostId peer) { synchronized (_dropList) { return _dropList.contains(peer); } } void dropPeer(Hash peer, boolean shouldShitlist, String why) { PeerState state = getPeerState(peer); @@ -2235,8 +2232,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _testEvent.runTest(); } - /* FIXME Exporting non-public type through public API FIXME */ - public PeerState pickTestPeer(RemoteHostId dontInclude) { + PeerState pickTestPeer(RemoteHostId dontInclude) { List peers = null; synchronized (_peersByIdent) { peers = new ArrayList(_peersByIdent.values()); From f3a88398f2828ce7aeec43c767d8140a3079e6cf Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:46:48 +0000 Subject: [PATCH 04/28] Fix the default inbound burst --- .../src/net/i2p/router/transport/FIFOBandwidthRefiller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index b24d79a11c..cd246bf2cb 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -42,7 +42,7 @@ public class FIFOBandwidthRefiller implements Runnable { * adjusting bandwidth class boundaries. */ public static final int DEFAULT_OUTBOUND_BANDWIDTH = 40; - public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 80; + public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 96; public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 40; public static final int DEFAULT_BURST_SECONDS = 60; From 1ca651e803d9e494dc5e10e3c16038a88671e2b1 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:47:12 +0000 Subject: [PATCH 05/28] Fix an error message --- .../java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java index be398f770e..db37b9e597 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java @@ -55,7 +55,7 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase { I2PSocket destSock = serv.getDestinationI2PSocket(this); new I2PTunnelRunner(clientSock, destSock, sockLock, null, mySockets); } catch (SOCKSException e) { - _log.error("Error from SOCKS connection: " + e.getMessage()); + _log.error("Error from SOCKS connection", e); closeSocket(s); } } From 64ee1b313be4748e1934a463ee3578c0bd073e40 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 29 Nov 2009 18:47:34 +0000 Subject: [PATCH 06/28] Comment out unused stuff better --- apps/routerconsole/jsp/config.jsp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index c422e1016f..9a9942c79f 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -32,15 +32,18 @@

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

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

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

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

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

  • inproxy.tino.i2p et perv.i2p: listent les eepsites actifs
  • forum.i2p: une connection sécurisée et anonyme vers forum.i2p2.de
  • -
  • www.i2p2.i2p et le miroir i2p-projekt.i2p: - connections sécurisées et anonyme vers www.i2p2.de
  • +
  • www.i2p2.i2p et le miroir i2p-projekt.i2p: + connections sécurisées et anonyme vers www.i2p2.de
  • eepsites.i2p: un moteur de recherche d'eepsites
  • ugha.i2p: l'eepsite d'ugha, un wiki que chaucun peut éditer ainsi que
  • fproxy.tino.i2p: un proxy Freenet 0.5
  • @@ -38,4 +38,4 @@

    Dépannage

    -

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


    +

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


    diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index d3cf05a771..2ebf15bdee 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -12,7 +12,7 @@
  • 浏览 I2P 站点 "eepsites" - I2P 网络内匿名运行的小站 - 您要首先设置浏览器的 HTTP 代理 为 127.0.0.1:4444, 然后才能浏览 I2P 站点 -