marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '1ffee552dec6b7d41faffb34cab1771773dc0bcd'

Browse Source 
and '528475be65a5b99629fadd09c3d2f42bbc907914'
This commit is contained in:
dream
2011-10-01 17:22:29 +00:00
parent 863fb08fa1 5d43282188
commit 00b9864dbf
82 changed files with 6794 additions and 5415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.tx/config
View File

@@ -89,6 +89,7 @@ trans.es = apps/susimail/locale/messages_es.po
trans.fr = apps/susimail/locale/messages_fr.po
trans.it = apps/susimail/locale/messages_it.po
trans.nl = apps/susimail/locale/messages_nl.po
trans.ru = apps/susimail/locale/messages_ru.po
trans.sv_SE = apps/susimail/locale/messages_sv.po
trans.pl = apps/susimail/locale/messages_pl.po
trans.vi = apps/susimail/locale/messages_vi.po

2
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -1371,7 +1371,7 @@ public class SnarkManager implements Snark.CompleteListener {
"Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
// , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
// ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
};
/** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */

2
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@@ -1886,7 +1886,7 @@ public class I2PSnarkServlet extends Default {
buf.append("</TR>\n");
}
if (showSaveButton) {
buf.append("<thead><tr><th colspan=\"3\">&nbsp;</th><th align=\"center\"><input type=\"submit\" value=\"");
buf.append("<thead><tr><th colspan=\"3\">&nbsp;</th><th class=\"headerpriority\"><input type=\"submit\" value=\"");
buf.append(_("Save priorities"));
buf.append("\" name=\"foo\" ></th></tr></thead>\n");
}

500
apps/i2psnark/locale/messages_en.po
View File

File diff suppressed because it is too large Load Diff

516
apps/i2psnark/locale/messages_es.po
View File

File diff suppressed because it is too large Load Diff

505
apps/i2psnark/locale/messages_it.po
View File

File diff suppressed because it is too large Load Diff

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
View File

@@ -292,11 +292,9 @@ class HTTPResponseOutputStream extends FilterOutputStream {
} finally {
if (_log.shouldLog(Log.INFO) && (_in != null))
_log.info("After decompression, written=" + written +
(_in != null ?
" read=" + _in.getTotalRead()
+ ", expanded=" + _in.getTotalExpanded() + ", remaining=" + _in.getRemaining()
+ ", finished=" + _in.getFinished()
: ""));
+ ", finished=" + _in.getFinished());
if (ba != null)
_cache.release(ba);
if (_out != null) try {

11
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
View File

@@ -212,10 +212,11 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
}
}
if (sockMgr == null) {
l.log("Invalid I2CP configuration");
throw new IllegalArgumentException("Socket manager could not be created");
}
// can't be null unless we limit the loop above
//if (sockMgr == null) {
// l.log("Invalid I2CP configuration");
// throw new IllegalArgumentException("Socket manager could not be created");
//}
l.log("Tunnels ready for client: " + handlerName);
} // else delay creating session until createI2PSocket() is called
@@ -556,7 +557,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
if (localPort == 0) {
localPort = ss.getLocalPort();
}
notifyEvent("clientLocalPort", new Integer(ss.getLocalPort()));
notifyEvent("clientLocalPort", Integer.valueOf(ss.getLocalPort()));
// duplicates message in constructor
//l.log("Listening for clients on port " + localPort + " of " + getTunnel().listenHost);

18
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
View File

@@ -336,7 +336,17 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
@Override
protected boolean shouldCompress() {
return (_dataExpected < 0 || _dataExpected >= MIN_TO_COMPRESS) &&
(_contentType == null || !_contentType.startsWith("image/"));
(_contentType == null ||
((!_contentType.startsWith("audio/")) &&
(!_contentType.startsWith("image/")) &&
(!_contentType.startsWith("video/")) &&
(!_contentType.equals("application/compress")) &&
(!_contentType.equals("application/bzip2")) &&
(!_contentType.equals("application/gzip")) &&
(!_contentType.equals("application/x-bzip")) &&
(!_contentType.equals("application/x-bzip2")) &&
(!_contentType.equals("application/x-gzip")) &&
(!_contentType.equals("application/zip"))));
}
@Override
@@ -402,9 +412,9 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
protected static String formatHeaders(Map<String, List<String>> headers, StringBuilder command) {
StringBuilder buf = new StringBuilder(command.length() + headers.size() * 64);
buf.append(command.toString().trim()).append("\r\n");
for (Iterator<String> iter = headers.keySet().iterator(); iter.hasNext(); ) {
String name = (String)iter.next();
for(String val: headers.get(name)) {
for (Map.Entry<String, List<String>> e : headers.entrySet()) {
String name = e.getKey();
for(String val: e.getValue()) {
buf.append(name.trim()).append(": ").append(val.trim()).append("\r\n");
}
}

9
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java
View File

@@ -76,7 +76,8 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr
* @param initialSocketData may be null
* @param sockList may be null. Caller must add i2ps to the list! It will be removed here on completion.
* Will synchronize on slock when removing.
* @param onTimeout may be null
* @param onTimeout May be null. If non-null and no data (except initial data) was sent or received,
it will be run before closing s.
*/
public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
byte[] initialSocketData, List<I2PSocket> sockList, Runnable onTimeout) {
@@ -384,7 +385,13 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr
// or else input end gives up and we have data loss.
// http://techtavern.wordpress.com/2008/07/16/whats-this-ioexception-write-end-dead/
//out.flush();
// DON'T close if we have a timeout job and we haven't received anything,
// or else the timeout job can't write the error message to the stream.
// close() above will close it after the timeout job is run.
if (!(onTimeout != null && (!_toI2P) && totalReceived <= 0))
out.close();
else if (_log.shouldLog(Log.INFO))
_log.info(direction + ": not closing so we can write the error message");
} catch (IOException ioe) {
if (_log.shouldLog(Log.WARN))
_log.warn(direction + ": Error flushing to close", ioe);

259
apps/i2ptunnel/locale/messages_es.po
View File

@@ -3,123 +3,133 @@
# This file is distributed under the same license as the i2ptunnel package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# foo <foo@bar>, 2009.
# punkibastardo <punkibastardo@gmail.com>, 2011.
# Translators:
# ducki2p <ducki2p@gmail.com>, 2011.
# foo <foo@bar>, 2009.
# <punkibastardo@gmail.com>, 2011.
# punkibastardo <punkibastardo@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-06-11 08:23+0000\n"
"PO-Revision-Date: 2011-07-20 00:55+0000\n"
"Last-Translator: blabla <blabla@trash-mail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/team/es/)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-16 21:54+0000\n"
"PO-Revision-Date: 2011-09-07 15:35+0000\n"
"Last-Translator: punkibastardo <punkibastardo@gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/"
"team/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:514
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:485
msgid "This seems to be a bad destination:"
msgstr "Este parece ser un destino malo:"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:485
msgid "i2paddresshelper cannot help you with a destination like that!"
msgstr "i2paddresshelper no le puede ayudar con un destino así!"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:554
#, java-format
msgid ""
"To visit the destination in your host database, click <a "
"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
"click <a href=\"{1}\">here</a>."
"To visit the destination in your host database, click <a href=\"{0}\">here</"
"a>. To visit the conflicting addresshelper destination, click <a href="
"\"{1}\">here</a>."
msgstr ""
"Para visitar el destino en la base de datos de hosts, haga clic <a "
"href=\"{0}\">aquí</a> . Para visitar el destino del ayudante de direcciones "
"en conflicto, haga clic <a href=\"{1}\">aquí</a> ."
"Para visitar el destino en la base de datos de hosts, haga clic <a href="
"\"{0}\">aquí</a> . Para visitar el destino del ayudante de direcciones en "
"conflicto, haga clic <a href=\"{1}\">aquí</a> ."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:875
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:930
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
msgid "Host"
msgstr "Host"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:876
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:931
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
msgid "Destination"
msgstr "Destino"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:881
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:936
#, java-format
msgid "Continue to {0} without saving"
msgstr "Acceder a {0} sin guardar"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:886
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:941
#, java-format
msgid "Save {0} to router address book and continue to eepsite"
msgstr ""
"Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
#. only blockfile supports multiple books
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:889
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:944
#, java-format
msgid "Save {0} to master address book and continue to eepsite"
msgstr ""
"Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:890
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:945
#, java-format
msgid "Save {0} to private address book and continue to eepsite"
msgstr ""
"Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1101
msgid ""
"Click a link below to look for an address helper by using a \"jump\" "
"service:"
"Click a link below to look for an address helper by using a \"jump\" service:"
msgstr ""
"Haga clic en un enlace de debajo para buscar un ayudante de direcciones "
"mediante el uso de un servicio de \"salto\":"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1262
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1319
msgid "Added via address helper"
msgstr "Agregado por la ayuda a las direcciones."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1286
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1343
#, java-format
msgid "Redirecting to {0}"
msgstr "Accediendo a {0}"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1292
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1349
msgid "Router Console"
msgstr "Consola del Router"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Addressbook"
msgstr "Libreta de direcciones"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Configuration"
msgstr "Ajustes"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Help"
msgstr "Ayuda"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1298
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1355
#, java-format
msgid "Saved {0} to the {1} addressbook, redirecting now."
msgstr "{0} ha sido guardada en la {1}, accediendo ahora."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1299
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1356
#, java-format
msgid "Failed to save {0} to the {1} addressbook, redirecting now."
msgstr "No se ha podido guardar {0} en la {1}, accediendo ahora."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1301
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1358
msgid "Click here if you are not redirected automatically."
msgstr "Haz click aquí si no estás siendo enviado automáticamente."
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:326
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:336
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:332
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:342
msgid "internal"
msgstr "interno"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:171
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:174
msgid ""
"Invalid form submission, probably because you used the 'back' or 'reload' "
"button on your browser. Please resubmit."
@@ -127,86 +137,86 @@ msgstr ""
"El formulario presentado es inválido, probablemente porque ha utilizado el "
"botón 'atrás' o 'recargar' de su navegador. Por favor, vuelva a enviarlo."
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:218
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:221
msgid "Configuration reloaded for all tunnels"
msgstr "Configuración recargada para todos los túneles"
#. and give them something to look at in any case
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:230
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:233
msgid "Starting tunnel"
msgstr "Inicializando el túnel"
#. and give them something to look at in any case
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:243
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:246
msgid "Stopping tunnel"
msgstr "Deteniendo el túnel"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:311
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:314
msgid "Configuration changes saved"
msgstr "Cambios en la configuración guardados"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:314
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:317
msgid "Failed to save configuration"
msgstr "No se pudo guardar la configuración"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:435
msgid "New Tunnel"
msgstr "Nuevo túnel"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:418
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:455
msgid "Standard client"
msgstr "Cliente estándar"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:419
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:456
msgid "HTTP client"
msgstr "Cliente HTTP"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:420
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:457
msgid "IRC client"
msgstr "Cliente IRC"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:421
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:458
msgid "Standard server"
msgstr "Servidor estándar"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:422
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459
msgid "HTTP server"
msgstr "Servidor HTTP"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:423
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:460
msgid "SOCKS 4/4a/5 proxy"
msgstr "Proxy SOCKS 4/4a/5"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:424
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
msgid "SOCKS IRC proxy"
msgstr "Proxy IRC SOCKS"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:425
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:462
msgid "CONNECT/SSL/HTTPS proxy"
msgstr "Proxy CONNECT/SSL/HTTPS"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:426
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:463
msgid "IRC server"
msgstr "Servidor de IRC"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:427
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:464
msgid "Streamr client"
msgstr "Cliente Streamr"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:428
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:465
msgid "Streamr server"
msgstr "Servidor Streamr"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:429
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:466
msgid "HTTP bidir"
msgstr "HTTP bidir"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:293
msgid "Host not set"
msgstr "Host no establecido"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:521
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
msgid "Port not set"
msgstr "Puerto no establecido"
@@ -305,16 +315,21 @@ msgid "Auto Start"
msgstr "Autoarranque"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
msgid "(Check the Box for 'YES')"
msgstr "(Marque la casilla para \"SI\")"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
msgid "Enable DCC"
msgstr "Habilitar DCC"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
msgid "Advanced networking options"
msgstr "Opciones avanzadas de red"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:234
msgid ""
"(NOTE: when this client proxy is configured to share tunnels, then these "
"options are for all the shared proxy clients!)"
@@ -322,52 +337,52 @@ msgstr ""
"(NOTA: cuando este proxy de cliente está configurado para compartir túneles, "
"entonces estas opciones son para todos los clientes de proxy compartidos!)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
msgid "Tunnel Options"
msgstr "Opciones de Túnel"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:247
msgid "Length"
msgstr "Longitud"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:235
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:254
msgid "0 hop tunnel (low anonymity, low latency)"
msgstr "Túnel de 0 saltos (anonimato bajo, latencia baja)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:249
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
msgid "1 hop tunnel (medium anonymity, medium latency)"
msgstr "Túnel de 1 salto (anonimato medio, latencia media)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
msgid "2 hop tunnel (high anonymity, high latency)"
msgstr "Túnel de 2 saltos (anonimato alto, latencia alta)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:257
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
msgid "3 hop tunnel (very high anonymity, poor performance)"
msgstr "Túnel de 3 saltos (anonimato muy alto, rendimiento pobre)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:275
msgid "hop tunnel (very poor performance)"
msgstr "saltos de túnel (rendimiento muy pobre)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:271
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:280
msgid "Variance"
msgstr "Variación"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
msgid "0 hop variance (no randomisation, consistant performance)"
msgstr "Variación de 0 saltos (sin aleatoriedad, rendimiento constante)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:282
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
msgid ""
"+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
@@ -375,7 +390,7 @@ msgstr ""
"Variación de + 0-1 saltos (aleatoriedad media aditiva, rendimiento "
"substractivo)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
msgid ""
"+ 0-2 hop variance (high additive randomisation, subtractive performance)"
@@ -383,34 +398,34 @@ msgstr ""
"Variación de + 0-2 saltos (aleatoriedad alta aditiva, rendimiento "
"substractivo)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:290
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
msgstr ""
"Variación de +/- 0-1 saltos (aleatoriedad estándar, rendimiento estándar)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:294
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
msgid "+/- 0-2 hop variance (not recommended)"
msgstr "Variación de +/- 0-2 saltos (no recomendado)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:306
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
msgid "hop variance"
msgstr "Variación de saltos"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
msgid "Count"
msgstr "Número"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
msgid "1 inbound, 1 outbound tunnel (low bandwidth usage, less reliability)"
msgstr ""
"1 entrante, 1 túnel de salida (bajo uso de ancho de banda, menos fiabilidad)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
msgid ""
"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
@@ -419,7 +434,7 @@ msgstr ""
"2 entrantes, 2 túneles de salida (uso de ancho de banda estándar, fiabilidad "
"estándar)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:335
msgid ""
"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
@@ -427,29 +442,29 @@ msgstr ""
"3 entrantes, 3 túneles de salida (mayor uso de ancho de banda, mayor "
"fiabilidad)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:344
msgid "tunnels"
msgstr "túneles"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
msgid "Backup Count"
msgstr "Número de respaldo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:337
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
msgid "0 backup tunnels (0 redundancy, no added resource usage)"
msgstr "0 túneles de respaldo (redundancia 0, no aumenta el uso de recursos)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:341
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
msgstr ""
"1 túnel de respaldo en cada dirección (redundancia baja, uso bajo de "
"recursos)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:345
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
msgid ""
"2 backup tunnels each direction (medium redundancy, medium resource usage)"
@@ -457,47 +472,47 @@ msgstr ""
"2 túneles de respaldo en cada dirección (redundancia media, uso de recursos "
"medio)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:368
msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
msgstr ""
"3 túneles de respaldo en cada dirección (alta redundancia, uso de recursos "
"alto)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:377
msgid "backup tunnels"
msgstr "túneles de respaldo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:365
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
msgid "Profile"
msgstr "Perfil"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
msgid "interactive connection"
msgstr "conexión interactiva"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
msgid "bulk connection (downloads/websites/BT)"
msgstr "conexión en masa (descargas/web/BT)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
msgid "Delay Connect"
msgstr "Retrasar Conexión"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:392
msgid "for request/response connections"
msgstr "para las conexiones de solicitud/respuesta"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
msgid "Router I2CP Address"
msgstr "Dirección I2CP del router"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:148
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:247
@@ -505,96 +520,96 @@ msgstr "Dirección I2CP del router"
msgid "Port"
msgstr "Puerto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
msgid "Reduce tunnel quantity when idle"
msgstr "Reducir la cantidad de túneles cuando se está inactivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:496
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
msgid "Enable"
msgstr "Habilitar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
msgid "Reduced tunnel count"
msgstr "Número de túneles reducido"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
msgid "Idle minutes"
msgstr "Minutos de inactividad"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
msgid "Close tunnels when idle"
msgstr "Cerrar los túneles cuando se está inactivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
msgid "New Keys on Reopen"
msgstr "Nuevas claves al reabrir"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
msgid "Disable"
msgstr "Desactivar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
msgid "Delay tunnel open until required"
msgstr "Retrasar apertura del túnel hasta que sea necesario"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
msgid "Persistent private key"
msgstr "Clave privada persistente"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
msgid "File"
msgstr "Archivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:470
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:220
msgid "Local destination"
msgstr "destino local"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
msgid "(if known)"
msgstr "(Si se conoce)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:470
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
msgid "Local Authorization"
msgstr "Autorización local"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
msgid "Username"
msgstr "Nombre de usuario"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:504
msgid "Password"
msgstr "Contraseña"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:484
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494
msgid "Outproxy Authorization"
msgstr "Autorización outproxy"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
msgid "Jump URL List"
msgstr "Lista de URL de salto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
msgid "Custom options"
msgstr "Opciones personalizadas"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:522
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:529
msgid ""
"NOTE: If tunnel is currently running, most changes will not take effect "
@@ -603,17 +618,17 @@ msgstr ""
"NOTA: Si el túnel se está ejecutando actualmente, la mayoría de los cambios "
"no tendrán efecto hasta que se detenga y reinicie el túnel."
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:531
msgid "Cancel"
msgstr "Cancelar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:535
msgid "Delete"
msgstr "Eliminar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:530
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:537
msgid "Save"
msgstr "Guardar"
@@ -875,5 +890,3 @@ msgstr "ninguno"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
msgid "New client tunnel"
msgstr "Nuevo túnel de cliente"

621
apps/i2ptunnel/locale/messages_it.po
View File

File diff suppressed because it is too large Load Diff

248
apps/i2ptunnel/locale/messages_sv.po
View File

@@ -6,114 +6,122 @@
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-06-11 08:23+0000\n"
"PO-Revision-Date: 2011-06-29 08:53+0000\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-23 19:52+0000\n"
"PO-Revision-Date: 2011-08-26 09:28+0000\n"
"Last-Translator: digitalmannen <digitalmannen@gmail.com>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/team/sv_SE/)\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/"
"team/sv_SE/)\n"
"Language: sv_SE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv_SE\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:514
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:485
msgid "This seems to be a bad destination:"
msgstr "Detta verkar vara ett felaktigt mål"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:485
msgid "i2paddresshelper cannot help you with a destination like that!"
msgstr "i2padresshjälp kan inte hjälpa dig med ett sådant mål!"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:554
#, java-format
msgid ""
"To visit the destination in your host database, click <a "
"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
"click <a href=\"{1}\">here</a>."
"To visit the destination in your host database, click <a href=\"{0}\">here</"
"a>. To visit the conflicting addresshelper destination, click <a href="
"\"{1}\">here</a>."
msgstr ""
"För att besöka målet i din värd databas href=\"{0}\"> klicka <a här </ a>. "
"För att besöka de motstridiga hjälpaddresserna,<a href=\"{1}\"> klicka <a "
"här </ a>."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:875
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:930
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401
msgid "Host"
msgstr "Värd"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:876
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:931
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
msgid "Destination"
msgstr "Mål"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:881
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:936
#, java-format
msgid "Continue to {0} without saving"
msgstr "Fortsätt till {0} utan att spara"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:886
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:941
#, java-format
msgid "Save {0} to router address book and continue to eepsite"
msgstr "Spara {0} till routeradressboken och fortsätt till eepsite "
#. only blockfile supports multiple books
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:889
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:944
#, java-format
msgid "Save {0} to master address book and continue to eepsite"
msgstr "Spara {0} till huvudadressboken och fortsätt till eepsite "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:890
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:945
#, java-format
msgid "Save {0} to private address book and continue to eepsite"
msgstr "Spara {0} till privatadressbok och fortsätt till eepsite "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1101
msgid ""
"Click a link below to look for an address helper by using a \"jump\" "
"service:"
"Click a link below to look for an address helper by using a \"jump\" service:"
msgstr ""
"Klicka på en länk nedan för att söka efter en hjälpaddress genom att använda "
"en \"hopp\" tjänst"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1262
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1319
msgid "Added via address helper"
msgstr "Tillagd via adresshjälpen "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1286
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1343
#, java-format
msgid "Redirecting to {0}"
msgstr "Om dirigerar till {0}"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1292
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1349
msgid "Router Console"
msgstr "Router konsol "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Addressbook"
msgstr "Adressbok"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Configuration"
msgstr "Konfiguration"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
msgid "Help"
msgstr "Hjälp"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1298
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1355
#, java-format
msgid "Saved {0} to the {1} addressbook, redirecting now."
msgstr "Spara {0} till {1}adressboken, omdirigerar nu "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1299
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1356
#, java-format
msgid "Failed to save {0} to the {1} addressbook, redirecting now."
msgstr "Misslyckades med att spara {0} till {1}adressboken, omdirigerar nu "
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1301
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1358
msgid "Click here if you are not redirected automatically."
msgstr "Klicka här om du inte omdirigeras automatiskt "
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:326
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:336
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:332
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:342
msgid "internal"
msgstr "Intern "
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:171
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:174
msgid ""
"Invalid form submission, probably because you used the 'back' or 'reload' "
"button on your browser. Please resubmit."
@@ -121,86 +129,86 @@ msgstr ""
"Ogiltigt formulärbegäran, beror troligtvis på attt du använde 'tillbaka' "
"eller 'uppdatera' knappen. Försök att skicka igen"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:218
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:221
msgid "Configuration reloaded for all tunnels"
msgstr "Konfigurationen uppdateras för alla tunnlar"
#. and give them something to look at in any case
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:230
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:233
msgid "Starting tunnel"
msgstr "Startar tunnel"
#. and give them something to look at in any case
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:243
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:246
msgid "Stopping tunnel"
msgstr "Stannar tunnel"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:311
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:314
msgid "Configuration changes saved"
msgstr "Konfigurationsändringar sparas"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:314
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:317
msgid "Failed to save configuration"
msgstr "Det gick inte att spara konfigurationen"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:435
msgid "New Tunnel"
msgstr "Ny tunnel"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:418
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:455
msgid "Standard client"
msgstr "Standard klient"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:419
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:456
msgid "HTTP client"
msgstr "HTTP-klient"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:420
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:457
msgid "IRC client"
msgstr "IRC-klient"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:421
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:458
msgid "Standard server"
msgstr "Standard server"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:422
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459
msgid "HTTP server"
msgstr "HTTP server"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:423
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:460
msgid "SOCKS 4/4a/5 proxy"
msgstr "SOCKS 4/4a/5 proxy"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:424
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461
msgid "SOCKS IRC proxy"
msgstr "SOCKS IRC proxy"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:425
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:462
msgid "CONNECT/SSL/HTTPS proxy"
msgstr "CONNECT/SSL/HTTPS proxy"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:426
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:463
msgid "IRC server"
msgstr "IRC-server"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:427
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:464
msgid "Streamr client"
msgstr "Klient för Streamr "
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:428
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:465
msgid "Streamr server"
msgstr "Server för Streamr"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:429
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:466
msgid "HTTP bidir"
msgstr "HTTP bidir"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:554
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:293
msgid "Host not set"
msgstr "Ingen värd angiven"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:521
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:558
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275
msgid "Port not set"
msgstr "Ingen port angiven"
@@ -299,16 +307,21 @@ msgid "Auto Start"
msgstr "Starta automatiskt"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:128
msgid "(Check the Box for 'YES')"
msgstr "(Markera i boxen för 'Ja')"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:222
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
msgid "Enable DCC"
msgstr "Aktivera DCC"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243
msgid "Advanced networking options"
msgstr "Avancerade nätverks instälningar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:234
msgid ""
"(NOTE: when this client proxy is configured to share tunnels, then these "
"options are for all the shared proxy clients!)"
@@ -316,91 +329,91 @@ msgstr ""
"(OBS: när denna klientproxyn är konfigurerad för att dela tunnlar, då gäller "
"dessa alternativ för alla delade proxyklienter!)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:245
msgid "Tunnel Options"
msgstr "Tunnel alternativ"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:247
msgid "Length"
msgstr "Längd"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:235
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:254
msgid "0 hop tunnel (low anonymity, low latency)"
msgstr " 0 tunnel hopp (låg anonymitet, ingen fördröjning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:249
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258
msgid "1 hop tunnel (medium anonymity, medium latency)"
msgstr "1 tunnel hopp (medel anonymitet, medel fördröjning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262
msgid "2 hop tunnel (high anonymity, high latency)"
msgstr "2 tunnel hopp (hög anonymitet, hög fördröjning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:257
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266
msgid "3 hop tunnel (very high anonymity, poor performance)"
msgstr "3 tunnel hopp (mycket hög anonymitet, dålig prestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:256
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:275
msgid "hop tunnel (very poor performance)"
msgstr "Tunnel hopp (mycket låg prestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:271
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:280
msgid "Variance"
msgstr "Variation"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:268
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287
msgid "0 hop variance (no randomisation, consistant performance)"
msgstr "0 hopp variation (ingen slumpmässighet, konstant prestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:282
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291
msgid ""
"+ 0-1 hop variance (medium additive randomisation, subtractive performance)"
msgstr "+ 0-1 hopp variation (medel slumpmässighet, minskad prestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295
msgid ""
"+ 0-2 hop variance (high additive randomisation, subtractive performance)"
msgstr "+ 0-2 hopp variation (ökad slumpmässighet, minskad prestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:290
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299
msgid "+/- 0-1 hop variance (standard randomisation, standard performance)"
msgstr "+/- 0-1 hopp variation (standard slumpmässighet, standardprestanda)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:294
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303
msgid "+/- 0-2 hop variance (not recommended)"
msgstr "+/- 0-2 hopp variation (inte rekommenderat)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:306
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315
msgid "hop variance"
msgstr "hopp variation"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320
msgid "Count"
msgstr "Antal"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327
msgid "1 inbound, 1 outbound tunnel (low bandwidth usage, less reliability)"
msgstr ""
"1 inkommande, 1 utgående tunnlar (låg bandbreddsanvändning, låg "
"tillförlitlighet)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331
msgid ""
"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
@@ -409,7 +422,7 @@ msgstr ""
"2 inkommande, 2 utgående tunnlar (normal bandbreddsanvändning, normal "
"tillförlitlighet)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:335
msgid ""
"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
@@ -417,29 +430,28 @@ msgstr ""
"3 inkommande, 3 utgående tunnlar (Högre bandbreddsanvändning, högre "
"tillförlitlighet)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:344
msgid "tunnels"
msgstr "tunnlar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
msgid "Backup Count"
msgstr "Antal reserver"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:337
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356
msgid "0 backup tunnels (0 redundancy, no added resource usage)"
msgstr ""
"0 reserv tunnlar i varje riktning (ingen redundans, ingen resursanvändning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:341
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360
msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
msgstr ""
"1 reserv tunnel i varje riktning (låg redundans, låg resursanvändning)"
msgstr "1 reserv tunnel i varje riktning (låg redundans, låg resursanvändning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:345
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364
msgid ""
"2 backup tunnels each direction (medium redundancy, medium resource usage)"
@@ -447,46 +459,46 @@ msgstr ""
"2 reserv tunnlar i varje riktning (medel hög redundans, medel hög "
"resursanvändning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:368
msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
msgstr ""
"3 reserv tunnlar i varje riktning (hög redundans, hög resursanvändning)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:358
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:377
msgid "backup tunnels"
msgstr "reserv tunnlar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:365
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384
msgid "Profile"
msgstr "Profil"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391
msgid "interactive connection"
msgstr "interaktiv anslutning"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395
msgid "bulk connection (downloads/websites/BT)"
msgstr "bulk-anslutning (hämtningar/webbplatser/BT)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388
msgid "Delay Connect"
msgstr "Fördröj anslutning"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:382
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:392
msgid "for request/response connections"
msgstr "för förfrågan/svar-anslutningar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399
msgid "Router I2CP Address"
msgstr "I2CP Routeradress"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:148
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:247
@@ -494,96 +506,96 @@ msgstr "I2CP Routeradress"
msgid "Port"
msgstr "Port"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479
msgid "Reduce tunnel quantity when idle"
msgstr "Minska kvantitetn på tunnel vid inaktivitet"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:496
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
msgid "Enable"
msgstr "Aktivera"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:422
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485
msgid "Reduced tunnel count"
msgstr "Minska antal tunnlar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:446
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489
msgid "Idle minutes"
msgstr "Inaktiv i minuter"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430
msgid "Close tunnels when idle"
msgstr "Stäng tunnlar vid inaktivitet"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:426
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436
msgid "New Keys on Reopen"
msgstr "Nya nycklar vid återöppnade"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
msgid "Disable"
msgstr "Inaktivera"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
msgid "Delay tunnel open until required"
msgstr "Avvakta med att öppna tunnlar tills de behövs"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
msgid "Persistent private key"
msgstr "Beständig privat nyckel"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
msgid "File"
msgstr "Fil"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:470
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:220
msgid "Local destination"
msgstr "Lokalt mål"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
msgid "(if known)"
msgstr "(om känd)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:470
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
msgid "Local Authorization"
msgstr "Lokala tillstånd"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500
msgid "Username"
msgstr "Användarnamn"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:504
msgid "Password"
msgstr "Lösenord"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:484
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494
msgid "Outproxy Authorization"
msgstr "Tillstånd för utproxy"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:502
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
msgid "Jump URL List"
msgstr "Hopp lista för URLer"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:525
msgid "Custom options"
msgstr "Anpassade alternativ"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:512
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:522
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:529
msgid ""
"NOTE: If tunnel is currently running, most changes will not take effect "
@@ -592,17 +604,17 @@ msgstr ""
"OBS: Om tunneln är igång, kommer de flesta ändringarna inte att träda i "
"kraft förrän tunneln stoppats och startats om."
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:514
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:531
msgid "Cancel"
msgstr "Avbryt"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:535
msgid "Delete"
msgstr "Radera"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:530
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:537
msgid "Save"
msgstr "Spara"
@@ -864,5 +876,3 @@ msgstr "Ingen"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:397
msgid "New client tunnel"
msgstr "Ny klienttunnel"

660
apps/routerconsole/locale/messages_en.po
View File

File diff suppressed because it is too large Load Diff

2198
apps/routerconsole/locale/messages_es.po
View File

File diff suppressed because it is too large Load Diff

2197
apps/routerconsole/locale/messages_it.po
View File

File diff suppressed because it is too large Load Diff

2180
apps/routerconsole/locale/messages_sv.po
View File

File diff suppressed because it is too large Load Diff

6
apps/streaming/java/src/net/i2p/client/streaming/Connection.java
View File

@@ -311,7 +311,7 @@ class Connection {
int windowSize;
int remaining;
synchronized (_outboundPackets) {
_outboundPackets.put(new Long(packet.getSequenceNum()), packet);
_outboundPackets.put(Long.valueOf(packet.getSequenceNum()), packet);
windowSize = _options.getWindowSize();
remaining = windowSize - _outboundPackets.size() ;
_outboundPackets.notifyAll();
@@ -441,7 +441,7 @@ class Connection {
if (acked != null) {
for (int i = 0; i < acked.size(); i++) {
PacketLocal p = acked.get(i);
_outboundPackets.remove(new Long(p.getSequenceNum()));
_outboundPackets.remove(Long.valueOf(p.getSequenceNum()));
_ackedPackets++;
if (p.getNumSends() > 1) {
_activeResends--;
@@ -1129,7 +1129,7 @@ class Connection {
synchronized (_outboundPackets) {
if (_packet.getSequenceNum() == _highestAckedThrough + 1)
isLowest = true;
if (_outboundPackets.containsKey(new Long(_packet.getSequenceNum())))
if (_outboundPackets.containsKey(Long.valueOf(_packet.getSequenceNum())))
resend = true;
}
if ( (resend) && (_packet.getAckTime() <= 0) ) {

8
apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
View File

@@ -229,8 +229,8 @@ class MessageInputStream extends InputStream {
_highestReadyBlockId = messageId;
long cur = _highestReadyBlockId + 1;
// now pull in any previously pending blocks
while (_notYetReadyBlocks.containsKey(new Long(cur))) {
ByteArray ba = _notYetReadyBlocks.remove(new Long(cur));
while (_notYetReadyBlocks.containsKey(Long.valueOf(cur))) {
ByteArray ba = _notYetReadyBlocks.remove(Long.valueOf(cur));
if ( (ba != null) && (ba.getData() != null) && (ba.getValid() > 0) ) {
_readyDataBlocks.add(ba);
}
@@ -245,9 +245,9 @@ class MessageInputStream extends InputStream {
if (_log.shouldLog(Log.DEBUG))
_log.debug("message is out of order: " + messageId);
if (_locallyClosed) // dont need the payload, just the msgId in order
_notYetReadyBlocks.put(new Long(messageId), new ByteArray(null));
_notYetReadyBlocks.put(Long.valueOf(messageId), new ByteArray(null));
else
_notYetReadyBlocks.put(new Long(messageId), payload);
_notYetReadyBlocks.put(Long.valueOf(messageId), payload);
_dataLock.notifyAll();
}
}

171
apps/susimail/locale/messages_es.po
View File

@@ -9,15 +9,16 @@
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-06-11 08:24+0000\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-16 21:54+0000\n"
"PO-Revision-Date: 2011-07-20 00:53+0000\n"
"Last-Translator: blabla <blabla@trash-mail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/team/es/)\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/"
"team/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: src/src/i2p/susi/webmail/WebMail.java:454
@@ -126,7 +127,7 @@ msgid "end forwarded mail"
msgstr "terminar correo reenviado"
#: src/src/i2p/susi/webmail/WebMail.java:847
#: src/src/i2p/susi/webmail/WebMail.java:1701
#: src/src/i2p/susi/webmail/WebMail.java:1708
msgid "Could not fetch mail body."
msgstr "No se pudo obtener el cuerpo del correo."
@@ -174,275 +175,273 @@ msgid_plural "{0} messages deleted."
msgstr[0] "1 mensaje eliminado."
msgstr[1] "{0} mensajes eliminados."
#: src/src/i2p/susi/webmail/WebMail.java:1264
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Login"
msgstr "Iniciar sesión"
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1268
#, java-format
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] "1 Mensaje"
msgstr[1] "{0} Mensajes"
#: src/src/i2p/susi/webmail/WebMail.java:1268
#: src/src/i2p/susi/webmail/WebMail.java:1270
msgid "Show Message"
msgstr "Mostrar mensaje"
#: src/src/i2p/susi/webmail/WebMail.java:1325
#: src/src/i2p/susi/webmail/WebMail.java:1332
#, java-format
msgid "Error decoding content: {0}"
msgstr "Error al descifrar el contenido: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1330
#: src/src/i2p/susi/webmail/WebMail.java:1337
msgid "Error decoding content: No encoder found."
msgstr "Error al descifrar el contenido: No se ha encontrado codificador."
#: src/src/i2p/susi/webmail/WebMail.java:1377
#: src/src/i2p/susi/webmail/WebMail.java:1384
msgid "no subject"
msgstr "sin asunto"
#: src/src/i2p/susi/webmail/WebMail.java:1394
#: src/src/i2p/susi/webmail/WebMail.java:1401
msgid "Found no valid sender address."
msgstr "No se ha encontrado una dirección de remitente válida."
#: src/src/i2p/susi/webmail/WebMail.java:1400
#: src/src/i2p/susi/webmail/WebMail.java:1407
#, java-format
msgid "Found no valid address in \\''{0}\\''."
msgstr "No se ha encontrado ninguna dirección válida en \\''{0}\\''."
#: src/src/i2p/susi/webmail/WebMail.java:1419
#: src/src/i2p/susi/webmail/WebMail.java:1426
msgid "No recipients found."
msgstr "No se han encontrado destinatarios."
#: src/src/i2p/susi/webmail/WebMail.java:1426
#: src/src/i2p/susi/webmail/WebMail.java:1433
msgid "Quoted printable encoder not available."
msgstr "El codificador imprimible citado no se encuentra disponible."
#: src/src/i2p/susi/webmail/WebMail.java:1431
#: src/src/i2p/susi/webmail/WebMail.java:1438
msgid "Header line encoder not available."
msgstr "El codificador de línea de encabezado no está disponible."
#: src/src/i2p/susi/webmail/WebMail.java:1482
#: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Mail sent."
msgstr "Correo enviado."
#: src/src/i2p/susi/webmail/WebMail.java:1519
#: src/src/i2p/susi/webmail/WebMail.java:1526
msgid "Send"
msgstr "Enviar"
#: src/src/i2p/susi/webmail/WebMail.java:1520
#: src/src/i2p/susi/webmail/WebMail.java:1527
msgid "Cancel"
msgstr "Cancelar"
#: src/src/i2p/susi/webmail/WebMail.java:1521
#: src/src/i2p/susi/webmail/WebMail.java:1528
msgid "Delete Attachment"
msgstr "Eliminar datos adjuntos"
#: src/src/i2p/susi/webmail/WebMail.java:1522
#: src/src/i2p/susi/webmail/WebMail.java:1607
#: src/src/i2p/susi/webmail/WebMail.java:1688
#: src/src/i2p/susi/webmail/WebMail.java:1529
#: src/src/i2p/susi/webmail/WebMail.java:1614
#: src/src/i2p/susi/webmail/WebMail.java:1695
msgid "Reload Config"
msgstr "Actualizar configuración"
#: src/src/i2p/susi/webmail/WebMail.java:1523
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1689
#: src/src/i2p/susi/webmail/WebMail.java:1530
#: src/src/i2p/susi/webmail/WebMail.java:1615
#: src/src/i2p/susi/webmail/WebMail.java:1696
msgid "Logout"
msgstr "Desconectarse"
#: src/src/i2p/susi/webmail/WebMail.java:1546
#: src/src/i2p/susi/webmail/WebMail.java:1693
#: src/src/i2p/susi/webmail/WebMail.java:1553
#: src/src/i2p/susi/webmail/WebMail.java:1700
msgid "From:"
msgstr "De:"
#: src/src/i2p/susi/webmail/WebMail.java:1547
#: src/src/i2p/susi/webmail/WebMail.java:1554
msgid "To:"
msgstr "Para:"
#: src/src/i2p/susi/webmail/WebMail.java:1548
#: src/src/i2p/susi/webmail/WebMail.java:1555
msgid "Cc:"
msgstr "Cc:"
#: src/src/i2p/susi/webmail/WebMail.java:1549
#: src/src/i2p/susi/webmail/WebMail.java:1556
msgid "Bcc:"
msgstr "CCO:"
#: src/src/i2p/susi/webmail/WebMail.java:1550
#: src/src/i2p/susi/webmail/WebMail.java:1695
#: src/src/i2p/susi/webmail/WebMail.java:1557
#: src/src/i2p/susi/webmail/WebMail.java:1702
msgid "Subject:"
msgstr "Asunto:"
#: src/src/i2p/susi/webmail/WebMail.java:1551
#: src/src/i2p/susi/webmail/WebMail.java:1558
msgid "Bcc to self"
msgstr "CCO a mí mismo"
#: src/src/i2p/susi/webmail/WebMail.java:1554
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "New Attachment:"
msgstr "Nuevo Archivo adjunto:"
#: src/src/i2p/susi/webmail/WebMail.java:1554
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "Upload File"
msgstr "Subir Archivo"
#: src/src/i2p/susi/webmail/WebMail.java:1560
#: src/src/i2p/susi/webmail/WebMail.java:1567
msgid "Attachments:"
msgstr "Archivos adjuntos:"
#: src/src/i2p/susi/webmail/WebMail.java:1582
#: src/src/i2p/susi/webmail/WebMail.java:1589
msgid "User"
msgstr "Usuario"
#: src/src/i2p/susi/webmail/WebMail.java:1583
#: src/src/i2p/susi/webmail/WebMail.java:1590
msgid "Pass"
msgstr "Contraseña"
#: src/src/i2p/susi/webmail/WebMail.java:1584
#: src/src/i2p/susi/webmail/WebMail.java:1591
msgid "Host"
msgstr "Host"
#: src/src/i2p/susi/webmail/WebMail.java:1585
#: src/src/i2p/susi/webmail/WebMail.java:1592
msgid "POP3-Port"
msgstr "Puerto-POP3"
#: src/src/i2p/susi/webmail/WebMail.java:1586
#: src/src/i2p/susi/webmail/WebMail.java:1593
msgid "SMTP-Port"
msgstr "Puerto-SMTP"
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Create Account"
msgstr "Crear una cuenta"
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Reset"
msgstr "Cancelar"
#: src/src/i2p/susi/webmail/WebMail.java:1599
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Really delete the marked messages?"
msgstr "¿Realmente deseas borrar los mensajes marcados?"
#: src/src/i2p/susi/webmail/WebMail.java:1599
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Yes, really delete them!"
msgstr "Sí, realmente eliminarlos!"
#: src/src/i2p/susi/webmail/WebMail.java:1601
#: src/src/i2p/susi/webmail/WebMail.java:1680
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1687
msgid "New"
msgstr "Nuevo"
#: src/src/i2p/susi/webmail/WebMail.java:1602
#: src/src/i2p/susi/webmail/WebMail.java:1681
#: src/src/i2p/susi/webmail/WebMail.java:1609
#: src/src/i2p/susi/webmail/WebMail.java:1688
msgid "Reply"
msgstr "Responder"
#: src/src/i2p/susi/webmail/WebMail.java:1603
#: src/src/i2p/susi/webmail/WebMail.java:1682
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1689
msgid "Reply All"
msgstr "Responder a todos"
#: src/src/i2p/susi/webmail/WebMail.java:1604
#: src/src/i2p/susi/webmail/WebMail.java:1683
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1690
msgid "Forward"
msgstr "Reenviar"
#: src/src/i2p/susi/webmail/WebMail.java:1605
#: src/src/i2p/susi/webmail/WebMail.java:1684
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1691
msgid "Delete"
msgstr "Eliminar"
#: src/src/i2p/susi/webmail/WebMail.java:1606
#: src/src/i2p/susi/webmail/WebMail.java:1613
msgid "Check Mail"
msgstr "Comprobar correo"
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1617
msgid "Sender"
msgstr "Remitente"
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1618
msgid "Subject"
msgstr "Asunto"
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1619
msgid "Date"
msgstr "Fecha"
#: src/src/i2p/susi/webmail/WebMail.java:1613
#: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Size"
msgstr "Tamaño"
#: src/src/i2p/susi/webmail/WebMail.java:1639
#: src/src/i2p/susi/webmail/WebMail.java:1646
#, java-format
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] "1 Byte"
msgstr[1] "{0} Bytes"
#: src/src/i2p/susi/webmail/WebMail.java:1644
#: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "Mark All"
msgstr "Marcar todos"
#: src/src/i2p/susi/webmail/WebMail.java:1645
#: src/src/i2p/susi/webmail/WebMail.java:1652
msgid "Invert Selection"
msgstr "Invertir selección"
#: src/src/i2p/susi/webmail/WebMail.java:1646
#: src/src/i2p/susi/webmail/WebMail.java:1653
msgid "Clear"
msgstr "Despejar"
#: src/src/i2p/susi/webmail/WebMail.java:1649
#: src/src/i2p/susi/webmail/WebMail.java:1650
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
msgid "First"
msgstr "Primero"
#: src/src/i2p/susi/webmail/WebMail.java:1649
#: src/src/i2p/susi/webmail/WebMail.java:1650
#: src/src/i2p/susi/webmail/WebMail.java:1685
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1692
msgid "Previous"
msgstr "Anterior"
#: src/src/i2p/susi/webmail/WebMail.java:1651
#: src/src/i2p/susi/webmail/WebMail.java:1658
#, java-format
msgid "Page {0} of {1}"
msgstr "Página {0} de {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1653
#: src/src/i2p/susi/webmail/WebMail.java:1654
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
msgid "Last"
msgstr "Última"
#: src/src/i2p/susi/webmail/WebMail.java:1653
#: src/src/i2p/susi/webmail/WebMail.java:1654
#: src/src/i2p/susi/webmail/WebMail.java:1686
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
#: src/src/i2p/susi/webmail/WebMail.java:1693
msgid "Next"
msgstr "Siguiente"
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1664
msgid "Pagesize:"
msgstr "Tamaño de página:"
#: src/src/i2p/susi/webmail/WebMail.java:1658
#: src/src/i2p/susi/webmail/WebMail.java:1665
msgid "Set"
msgstr "Set"
#: src/src/i2p/susi/webmail/WebMail.java:1668
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Really delete this message?"
msgstr "¿Realmente deseas borrar este mensaje?"
#: src/src/i2p/susi/webmail/WebMail.java:1668
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Yes, really delete it!"
msgstr "Sí, realmente eliminarlo!"
#: src/src/i2p/susi/webmail/WebMail.java:1687
#: src/src/i2p/susi/webmail/WebMail.java:1694
msgid "Back to Folder"
msgstr "Volver a carpeta"
#: src/src/i2p/susi/webmail/WebMail.java:1694
#: src/src/i2p/susi/webmail/WebMail.java:1701
msgid "Date:"
msgstr "Fecha:"
#: src/src/i2p/susi/webmail/WebMail.java:1705
#: src/src/i2p/susi/webmail/WebMail.java:1712
msgid "Could not fetch mail."
msgstr "No se pudo descargar el correo."

442
apps/susimail/locale/messages_it.po Normal file
View File

@@ -0,0 +1,442 @@
# I2P
# Copyright (C) 2009 The I2P Project
# This file is distributed under the same license as the susimail package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# <jokjok@hotmail.it>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-23 19:48+0000\n"
"PO-Revision-Date: 2011-08-29 19:35+0000\n"
"Last-Translator: mkkid <jokjok@hotmail.it>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/team/it/)\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: src/src/i2p/susi/webmail/WebMail.java:454
msgid "unknown"
msgstr "sconosciuto"
#: src/src/i2p/susi/webmail/WebMail.java:473
msgid "Warning: no transfer encoding found, fallback to 7bit."
msgstr "Attenzione: nessuna codifica di trasferimento trovata, ritorno a 7bit."
#: src/src/i2p/susi/webmail/WebMail.java:478
#, java-format
msgid "No encoder found for encoding \\''{0}\\''."
msgstr "Nessun codificatore trovato per la codifica \\\"{0}\\\"."
#: src/src/i2p/susi/webmail/WebMail.java:484
msgid "Warning: no charset found, fallback to US-ASCII."
msgstr "Attenzione: nessun charset trovato, ritorno a US-ASCII."
#: src/src/i2p/susi/webmail/WebMail.java:498
#, java-format
msgid "Charset \\''{0}\\'' not supported."
msgstr "Charset \\\"{0}\\\" non supportato."
#: src/src/i2p/susi/webmail/WebMail.java:502
#, java-format
msgid "Part ({0}) not shown, because of {1}"
msgstr "Parte ({0}) non mostrata, a causa di {1}"
#: src/src/i2p/susi/webmail/WebMail.java:525
msgid "Download"
msgstr "Download"
#: src/src/i2p/susi/webmail/WebMail.java:525
msgid "File is packed into a zipfile for security reasons."
msgstr "Il file è compresso in formato zip per ragioni di sicurezza."
#: src/src/i2p/susi/webmail/WebMail.java:525
#, java-format
msgid "attachment ({0})."
msgstr "allegato ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:529
#, java-format
msgid "Attachment ({0})."
msgstr "Allegato ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:579
msgid "Need username for authentication."
msgstr "Serve l'username per l'autenticazione."
#: src/src/i2p/susi/webmail/WebMail.java:583
msgid "Need password for authentication."
msgstr "Serve la password per l'autenticazione."
#: src/src/i2p/susi/webmail/WebMail.java:587
msgid "Need hostname for connect."
msgstr "Serve l'hostname per connettersi"
#: src/src/i2p/susi/webmail/WebMail.java:592
msgid "Need port number for pop3 connect."
msgstr "Serve il numero di porta per connettersi con pop3."
#: src/src/i2p/susi/webmail/WebMail.java:599
msgid "POP3 port number is not in range 0..65535."
msgstr "Il numero di porta POP3 non è nel range 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:605
msgid "POP3 port number is invalid."
msgstr "Il numero di porta POP3 non è valido."
#: src/src/i2p/susi/webmail/WebMail.java:611
msgid "Need port number for smtp connect."
msgstr "Serve il numero di porta per connettersi con smtp."
#: src/src/i2p/susi/webmail/WebMail.java:618
msgid "SMTP port number is not in range 0..65535."
msgstr "Il numero di porta SMTP non è nel range 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:624
msgid "SMTP port number is invalid."
msgstr "Il numero di porta SMTP non è valido."
#: src/src/i2p/susi/webmail/WebMail.java:671
msgid "User logged out."
msgstr "Utente disconnesso."
#: src/src/i2p/susi/webmail/WebMail.java:675
msgid "Internal error, lost connection."
msgstr "Errore interno, connessione persa."
#: src/src/i2p/susi/webmail/WebMail.java:771
#, java-format
msgid "On {0} {1} wrote:"
msgstr "Su {0} {1} scritto:"
#: src/src/i2p/susi/webmail/WebMail.java:818
msgid "begin forwarded mail"
msgstr "inizia mail inoltrata"
#: src/src/i2p/susi/webmail/WebMail.java:840
msgid "end forwarded mail"
msgstr "concludi mail inoltrata"
#: src/src/i2p/susi/webmail/WebMail.java:847
#: src/src/i2p/susi/webmail/WebMail.java:1708
msgid "Could not fetch mail body."
msgstr "Non è stato possibile prendere il cordpo della mail."
#: src/src/i2p/susi/webmail/WebMail.java:875
msgid "Message id not valid."
msgstr "L'id del messaggio non è valido."
#: src/src/i2p/susi/webmail/WebMail.java:958
#, java-format
msgid "No Encoding found for {0}"
msgstr "Nessuna codifica trovata per {0}"
#: src/src/i2p/susi/webmail/WebMail.java:962
#, java-format
msgid "Could not encode data: {0}"
msgstr "Non è stato possibile codificare i dati: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:967
#, java-format
msgid "Error reading uploaded file: {0}"
msgstr "Errore nella lettura del file mandato: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1045
msgid "Error parsing download parameter."
msgstr "Errore durante l'analisi del parametro di download."
#: src/src/i2p/susi/webmail/WebMail.java:1089
msgid "Invalid pagesize number, resetting to default value."
msgstr ""
"Numero di dimensione di pagina invalido, sta avvenendo il reset al valore di "
"default."
#: src/src/i2p/susi/webmail/WebMail.java:1113
msgid "No messages marked for deletion."
msgstr "Nerssun messaggio segnato per l'eliminazione."
#: src/src/i2p/susi/webmail/WebMail.java:1133
#, java-format
msgid "Error deleting message: {0}"
msgstr "Errore durante la rimozione del messaggio: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1144
#, java-format
msgid "1 message deleted."
msgid_plural "{0} messages deleted."
msgstr[0] "1 messaggio cancellato."
msgstr[1] "{0} messaggi cancellati."
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Login"
msgstr "Login"
#: src/src/i2p/susi/webmail/WebMail.java:1268
#, java-format
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] "1 Messaggio"
msgstr[1] "{0} Messaggi"
#: src/src/i2p/susi/webmail/WebMail.java:1270
msgid "Show Message"
msgstr "Mostra Messaggio"
#: src/src/i2p/susi/webmail/WebMail.java:1332
#, java-format
msgid "Error decoding content: {0}"
msgstr "Errore nella decodifica del contenuto: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1337
msgid "Error decoding content: No encoder found."
msgstr "Errore nella decodifica del contenuto: Nessun codificatore trovato"
#: src/src/i2p/susi/webmail/WebMail.java:1384
msgid "no subject"
msgstr "nessun soggetto"
#: src/src/i2p/susi/webmail/WebMail.java:1401
msgid "Found no valid sender address."
msgstr "Non è stato trovato nessun indirizzo mittente valido."
#: src/src/i2p/susi/webmail/WebMail.java:1407
#, java-format
msgid "Found no valid address in \\''{0}\\''."
msgstr "Non è stato trovato nessun indirizzo valido in \\\"{0}\\\"."
#: src/src/i2p/susi/webmail/WebMail.java:1426
msgid "No recipients found."
msgstr "Nessun destinatario trovato."
#: src/src/i2p/susi/webmail/WebMail.java:1433
msgid "Quoted printable encoder not available."
msgstr "Codificatore stampabile citato non disponibile."
#: src/src/i2p/susi/webmail/WebMail.java:1438
msgid "Header line encoder not available."
msgstr "Codificatore linea di testa non disponibile."
#: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Mail sent."
msgstr "Mail mandata."
#: src/src/i2p/susi/webmail/WebMail.java:1526
msgid "Send"
msgstr "Manda"
#: src/src/i2p/susi/webmail/WebMail.java:1527
msgid "Cancel"
msgstr "Annulla"
#: src/src/i2p/susi/webmail/WebMail.java:1528
msgid "Delete Attachment"
msgstr "Elimina Allegato"
#: src/src/i2p/susi/webmail/WebMail.java:1529
#: src/src/i2p/susi/webmail/WebMail.java:1614
#: src/src/i2p/susi/webmail/WebMail.java:1695
msgid "Reload Config"
msgstr "Ricarica Configurazione"
#: src/src/i2p/susi/webmail/WebMail.java:1530
#: src/src/i2p/susi/webmail/WebMail.java:1615
#: src/src/i2p/susi/webmail/WebMail.java:1696
msgid "Logout"
msgstr "Disconnettiti"
#: src/src/i2p/susi/webmail/WebMail.java:1553
#: src/src/i2p/susi/webmail/WebMail.java:1700
msgid "From:"
msgstr "Da:"
#: src/src/i2p/susi/webmail/WebMail.java:1554
msgid "To:"
msgstr "A:"
#: src/src/i2p/susi/webmail/WebMail.java:1555
msgid "Cc:"
msgstr "Cc:"
#: src/src/i2p/susi/webmail/WebMail.java:1556
msgid "Bcc:"
msgstr "Bcc:"
#: src/src/i2p/susi/webmail/WebMail.java:1557
#: src/src/i2p/susi/webmail/WebMail.java:1702
msgid "Subject:"
msgstr "Soggetto:"
#: src/src/i2p/susi/webmail/WebMail.java:1558
msgid "Bcc to self"
msgstr "Bcc a se stessi"
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "New Attachment:"
msgstr "Nuovo Allegato"
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "Upload File"
msgstr "Manda File"
#: src/src/i2p/susi/webmail/WebMail.java:1567
msgid "Attachments:"
msgstr "Allegati:"
#: src/src/i2p/susi/webmail/WebMail.java:1589
msgid "User"
msgstr "User"
#: src/src/i2p/susi/webmail/WebMail.java:1590
msgid "Pass"
msgstr "Password"
#: src/src/i2p/susi/webmail/WebMail.java:1591
msgid "Host"
msgstr "Host"
#: src/src/i2p/susi/webmail/WebMail.java:1592
msgid "POP3-Port"
msgstr "Porta POP3"
#: src/src/i2p/susi/webmail/WebMail.java:1593
msgid "SMTP-Port"
msgstr "Porta SMTP"
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Create Account"
msgstr "Crea Account"
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Reset"
msgstr "Reset"
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Really delete the marked messages?"
msgstr "Cancellare davvero i messaggi segnati?"
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Yes, really delete them!"
msgstr "Sì, cancellali per davvero!"
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1687
msgid "New"
msgstr "Nuovo"
#: src/src/i2p/susi/webmail/WebMail.java:1609
#: src/src/i2p/susi/webmail/WebMail.java:1688
msgid "Reply"
msgstr "Rispondi"
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1689
msgid "Reply All"
msgstr "Rispondi A Tutti"
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1690
msgid "Forward"
msgstr "Inoltra"
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1691
msgid "Delete"
msgstr "Elimina"
#: src/src/i2p/susi/webmail/WebMail.java:1613
msgid "Check Mail"
msgstr "Controlla Mail"
#: src/src/i2p/susi/webmail/WebMail.java:1617
msgid "Sender"
msgstr "Mittente"
#: src/src/i2p/susi/webmail/WebMail.java:1618
msgid "Subject"
msgstr "Soggetto"
#: src/src/i2p/susi/webmail/WebMail.java:1619
msgid "Date"
msgstr "Data"
#: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Size"
msgstr "Dimensione"
#: src/src/i2p/susi/webmail/WebMail.java:1646
#, java-format
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] "1 Byte"
msgstr[1] "{0} Bytes"
#: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "Mark All"
msgstr "Segna Tutti"
#: src/src/i2p/susi/webmail/WebMail.java:1652
msgid "Invert Selection"
msgstr "Inverti Selezione"
#: src/src/i2p/susi/webmail/WebMail.java:1653
msgid "Clear"
msgstr "Sgombra"
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
msgid "First"
msgstr "Primo"
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1692
msgid "Previous"
msgstr "Precedente"
#: src/src/i2p/susi/webmail/WebMail.java:1658
#, java-format
msgid "Page {0} of {1}"
msgstr "Pagina {0} di {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
msgid "Last"
msgstr "Ultimo"
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
#: src/src/i2p/susi/webmail/WebMail.java:1693
msgid "Next"
msgstr "Prossimo"
#: src/src/i2p/susi/webmail/WebMail.java:1664
msgid "Pagesize:"
msgstr "Dimensione di Pagina:"
#: src/src/i2p/susi/webmail/WebMail.java:1665
msgid "Set"
msgstr "Imposta"
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Really delete this message?"
msgstr "Cancellare per davvero questo messaggio?"
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Yes, really delete it!"
msgstr "Sì, cancellalo per davvero!"
#: src/src/i2p/susi/webmail/WebMail.java:1694
msgid "Back to Folder"
msgstr "Torna alla Cartella"
#: src/src/i2p/susi/webmail/WebMail.java:1701
msgid "Date:"
msgstr "Data:"
#: src/src/i2p/susi/webmail/WebMail.java:1712
msgid "Could not fetch mail."
msgstr "Non è stato possibile prendere la mail"

444
apps/susimail/locale/messages_ru.po Normal file
View File

@@ -0,0 +1,444 @@
# I2P
# Copyright (C) 2009 The I2P Project
# This file is distributed under the same license as the susimail package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
# foo <foo@bar>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: I2P susimail\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-26 17:16+0000\n"
"PO-Revision-Date: 2011-09-26 23:59+0500\n"
"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
"Language-Team: duck <duck@mail.i2p>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: src/src/i2p/susi/webmail/WebMail.java:454
msgid "unknown"
msgstr "неизвестно"
#: src/src/i2p/susi/webmail/WebMail.java:473
msgid "Warning: no transfer encoding found, fallback to 7bit."
msgstr "Предупреждение: кодировка передачи не найдена, откатывамся на использование 7bit."
#: src/src/i2p/susi/webmail/WebMail.java:478
#, java-format
msgid "No encoder found for encoding \\''{0}\\''."
msgstr "Для кодировки \\''{0}\\'' не найден кодек."
#: src/src/i2p/susi/webmail/WebMail.java:484
msgid "Warning: no charset found, fallback to US-ASCII."
msgstr "Предупреждение: кодировка непонятна, переключаемся в US-ASCII."
#: src/src/i2p/susi/webmail/WebMail.java:498
#, java-format
msgid "Charset \\''{0}\\'' not supported."
msgstr "Кодировка \\''{0}\\'' не поддерживается."
#: src/src/i2p/susi/webmail/WebMail.java:502
#, java-format
msgid "Part ({0}) not shown, because of {1}"
msgstr "Часть ({0}) не отображена из-за {1}"
#: src/src/i2p/susi/webmail/WebMail.java:525
msgid "Download"
msgstr "Скачать"
#: src/src/i2p/susi/webmail/WebMail.java:525
msgid "File is packed into a zipfile for security reasons."
msgstr "Файл запакован в zip-архив из соображений безопасности."
#: src/src/i2p/susi/webmail/WebMail.java:525
#, java-format
msgid "attachment ({0})."
msgstr "вложение ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:529
#, java-format
msgid "Attachment ({0})."
msgstr "Вложение ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:579
msgid "Need username for authentication."
msgstr "Требуется имя пользователя для аутентификации."
#: src/src/i2p/susi/webmail/WebMail.java:583
msgid "Need password for authentication."
msgstr "Требуется пароль для аутентификации."
#: src/src/i2p/susi/webmail/WebMail.java:587
msgid "Need hostname for connect."
msgstr "Требуется имя хоста для соединений."
#: src/src/i2p/susi/webmail/WebMail.java:592
msgid "Need port number for pop3 connect."
msgstr "Требуется номер порта для pop3 соединений."
#: src/src/i2p/susi/webmail/WebMail.java:599
msgid "POP3 port number is not in range 0..65535."
msgstr "Номер POP3-порта не в диапазоне 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:605
msgid "POP3 port number is invalid."
msgstr "Номер POP3-порта некорректный."
#: src/src/i2p/susi/webmail/WebMail.java:611
msgid "Need port number for smtp connect."
msgstr "Требуется номер порта для smtp соединений."
#: src/src/i2p/susi/webmail/WebMail.java:618
msgid "SMTP port number is not in range 0..65535."
msgstr "Номер SMTP-порта не в диапазоне 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:624
msgid "SMTP port number is invalid."
msgstr "Номер SMTP-порта некорректный."
#: src/src/i2p/susi/webmail/WebMail.java:671
msgid "User logged out."
msgstr "Пользователь отключился."
#: src/src/i2p/susi/webmail/WebMail.java:675
msgid "Internal error, lost connection."
msgstr "Внутренняя ошибка, соединение потеряно."
#: src/src/i2p/susi/webmail/WebMail.java:771
#, java-format
msgid "On {0} {1} wrote:"
msgstr "В сообщении от {0} {1} написал(a):"
#: src/src/i2p/susi/webmail/WebMail.java:818
msgid "begin forwarded mail"
msgstr "начало пересланного сообщения"
#: src/src/i2p/susi/webmail/WebMail.java:840
msgid "end forwarded mail"
msgstr "конец пересланного сообщения"
#: src/src/i2p/susi/webmail/WebMail.java:847
#: src/src/i2p/susi/webmail/WebMail.java:1708
msgid "Could not fetch mail body."
msgstr "Не удалось скачать тело сообщения."
#: src/src/i2p/susi/webmail/WebMail.java:875
msgid "Message id not valid."
msgstr "Message id некорректен."
#: src/src/i2p/susi/webmail/WebMail.java:958
#, java-format
msgid "No Encoding found for {0}"
msgstr "Не найдена кодировка для {0}"
#: src/src/i2p/susi/webmail/WebMail.java:962
#, java-format
msgid "Could not encode data: {0}"
msgstr "Не удаётся закодировать данные: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:967
#, java-format
msgid "Error reading uploaded file: {0}"
msgstr "Ошибка при чтении загруженного файла: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1045
msgid "Error parsing download parameter."
msgstr "Ошибка при разборе параметра скачивания."
#: src/src/i2p/susi/webmail/WebMail.java:1089
msgid "Invalid pagesize number, resetting to default value."
msgstr "Некорректный размер страницы, устанавливается значение по умолчанию."
#: src/src/i2p/susi/webmail/WebMail.java:1113
msgid "No messages marked for deletion."
msgstr "Не отмечено сообщений для удаления."
#: src/src/i2p/susi/webmail/WebMail.java:1133
#, java-format
msgid "Error deleting message: {0}"
msgstr "Ошибка при удалении сообщения: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1144
#, java-format
msgid "1 message deleted."
msgid_plural "{0} messages deleted."
msgstr[0] "{0} сообщение удалено."
msgstr[1] "{0} сообщения удалено."
msgstr[2] "{0} сообщений удалены."
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Login"
msgstr "Логин"
#: src/src/i2p/susi/webmail/WebMail.java:1268
#, java-format
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] "{0} сообщение"
msgstr[1] "{0} сообщения"
msgstr[2] "{0} сообщений"
#: src/src/i2p/susi/webmail/WebMail.java:1270
msgid "Show Message"
msgstr "Покзать сообщение"
#: src/src/i2p/susi/webmail/WebMail.java:1332
#, java-format
msgid "Error decoding content: {0}"
msgstr "Ошибка при декодировании контента: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1337
msgid "Error decoding content: No encoder found."
msgstr "Ошибка при декодировании контента: кодек не найден."
#: src/src/i2p/susi/webmail/WebMail.java:1384
msgid "no subject"
msgstr "без темы"
#: src/src/i2p/susi/webmail/WebMail.java:1401
msgid "Found no valid sender address."
msgstr "Не найдено корректного адреса отправителя."
#: src/src/i2p/susi/webmail/WebMail.java:1407
#, java-format
msgid "Found no valid address in \\''{0}\\''."
msgstr "Не найдено корректного адреса в \\''{0}\\''."
#: src/src/i2p/susi/webmail/WebMail.java:1426
msgid "No recipients found."
msgstr "Не найдено получателей."
#: src/src/i2p/susi/webmail/WebMail.java:1433
msgid "Quoted printable encoder not available."
msgstr "Кодек quoted printable недоступен."
#: src/src/i2p/susi/webmail/WebMail.java:1438
msgid "Header line encoder not available."
msgstr "Кодек для заголовка недоступен."
#: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Mail sent."
msgstr "Сообщение отправлено."
#: src/src/i2p/susi/webmail/WebMail.java:1526
msgid "Send"
msgstr "Отправить"
#: src/src/i2p/susi/webmail/WebMail.java:1527
msgid "Cancel"
msgstr "Отмена"
#: src/src/i2p/susi/webmail/WebMail.java:1528
msgid "Delete Attachment"
msgstr "Удалить вложение"
#: src/src/i2p/susi/webmail/WebMail.java:1529
#: src/src/i2p/susi/webmail/WebMail.java:1614
#: src/src/i2p/susi/webmail/WebMail.java:1695
msgid "Reload Config"
msgstr "Перечитать конфиг"
#: src/src/i2p/susi/webmail/WebMail.java:1530
#: src/src/i2p/susi/webmail/WebMail.java:1615
#: src/src/i2p/susi/webmail/WebMail.java:1696
msgid "Logout"
msgstr "Выйти"
#: src/src/i2p/susi/webmail/WebMail.java:1553
#: src/src/i2p/susi/webmail/WebMail.java:1700
msgid "From:"
msgstr "От:"
#: src/src/i2p/susi/webmail/WebMail.java:1554
msgid "To:"
msgstr "Кому:"
#: src/src/i2p/susi/webmail/WebMail.java:1555
msgid "Cc:"
msgstr "Копия:"
#: src/src/i2p/susi/webmail/WebMail.java:1556
msgid "Bcc:"
msgstr "Скрытая копия:"
#: src/src/i2p/susi/webmail/WebMail.java:1557
#: src/src/i2p/susi/webmail/WebMail.java:1702
msgid "Subject:"
msgstr "Тема:"
#: src/src/i2p/susi/webmail/WebMail.java:1558
msgid "Bcc to self"
msgstr "Послать скрытую копию самому себе"
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "New Attachment:"
msgstr "Новое вложение:"
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "Upload File"
msgstr "Прикрепить"
#: src/src/i2p/susi/webmail/WebMail.java:1567
msgid "Attachments:"
msgstr "Вложения:"
#: src/src/i2p/susi/webmail/WebMail.java:1589
msgid "User"
msgstr "Пользователь"
#: src/src/i2p/susi/webmail/WebMail.java:1590
msgid "Pass"
msgstr "Пароль"
#: src/src/i2p/susi/webmail/WebMail.java:1591
msgid "Host"
msgstr "Хост"
#: src/src/i2p/susi/webmail/WebMail.java:1592
msgid "POP3-Port"
msgstr "POP3-порт"
#: src/src/i2p/susi/webmail/WebMail.java:1593
msgid "SMTP-Port"
msgstr "SMTP-порт"
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Create Account"
msgstr "Создать учётную запись"
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Reset"
msgstr "Сброс"
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Really delete the marked messages?"
msgstr "Действительно удалить отмеченые сообщения?"
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Yes, really delete them!"
msgstr "Да, действительно удалить!"
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1687
msgid "New"
msgstr "Новое"
#: src/src/i2p/susi/webmail/WebMail.java:1609
#: src/src/i2p/susi/webmail/WebMail.java:1688
msgid "Reply"
msgstr "Ответить"
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1689
msgid "Reply All"
msgstr "Ответить всем"
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1690
msgid "Forward"
msgstr "Переслать"
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1691
msgid "Delete"
msgstr "Удалить"
#: src/src/i2p/susi/webmail/WebMail.java:1613
msgid "Check Mail"
msgstr "Проверить почту"
#: src/src/i2p/susi/webmail/WebMail.java:1617
msgid "Sender"
msgstr "Отправитель"
#: src/src/i2p/susi/webmail/WebMail.java:1618
msgid "Subject"
msgstr "Тема"
#: src/src/i2p/susi/webmail/WebMail.java:1619
msgid "Date"
msgstr "Дата"
#: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Size"
msgstr "Размер"
#: src/src/i2p/susi/webmail/WebMail.java:1646
#, java-format
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] "{0} байт"
msgstr[1] "{0} байта"
msgstr[2] "{0} байт"
#: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "Mark All"
msgstr "Отметить всё"
#: src/src/i2p/susi/webmail/WebMail.java:1652
msgid "Invert Selection"
msgstr "Инвертировать выделение"
#: src/src/i2p/susi/webmail/WebMail.java:1653
msgid "Clear"
msgstr "Очистить"
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
msgid "First"
msgstr "Первое"
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1692
msgid "Previous"
msgstr "Предыдущее"
#: src/src/i2p/susi/webmail/WebMail.java:1658
#, java-format
msgid "Page {0} of {1}"
msgstr "Страница {0} из {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
msgid "Last"
msgstr "Последнее"
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
#: src/src/i2p/susi/webmail/WebMail.java:1693
msgid "Next"
msgstr "Следующее"
#: src/src/i2p/susi/webmail/WebMail.java:1664
msgid "Pagesize:"
msgstr "Сообщений на странице:"
#: src/src/i2p/susi/webmail/WebMail.java:1665
msgid "Set"
msgstr "Установить"
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Really delete this message?"
msgstr "Действительно удалить это сообщение?"
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Yes, really delete it!"
msgstr "Да, удалить это!"
#: src/src/i2p/susi/webmail/WebMail.java:1694
msgid "Back to Folder"
msgstr "Вернуться к папке"
#: src/src/i2p/susi/webmail/WebMail.java:1701
msgid "Date:"
msgstr "Дата:"
#: src/src/i2p/susi/webmail/WebMail.java:1712
msgid "Could not fetch mail."
msgstr "Не удалось скачать почту."

171
apps/susimail/locale/messages_sv.po
View File

@@ -6,15 +6,16 @@
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-05-24 06:01+0000\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-23 19:52+0000\n"
"PO-Revision-Date: 2011-06-04 20:38+0000\n"
"Last-Translator: digitalmannen <digitalmannen@gmail.com>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/team/sv_SE/)\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/"
"team/sv_SE/)\n"
"Language: sv_SE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv_SE\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: src/src/i2p/susi/webmail/WebMail.java:454
@@ -121,7 +122,7 @@ msgid "end forwarded mail"
msgstr "slutar vidarebefordra e-post"
#: src/src/i2p/susi/webmail/WebMail.java:847
#: src/src/i2p/susi/webmail/WebMail.java:1701
#: src/src/i2p/susi/webmail/WebMail.java:1708
msgid "Could not fetch mail body."
msgstr "Kunde inte hämta e-postets brödtext."
@@ -168,275 +169,273 @@ msgid_plural "{0} messages deleted."
msgstr[0] "1 meddelande raderart."
msgstr[1] "{0} meddelanden raderade"
#: src/src/i2p/susi/webmail/WebMail.java:1264
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Login"
msgstr "Logga in"
#: src/src/i2p/susi/webmail/WebMail.java:1266
#: src/src/i2p/susi/webmail/WebMail.java:1268
#, java-format
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] "1 meddelande"
msgstr[1] "{0} meddelanden"
#: src/src/i2p/susi/webmail/WebMail.java:1268
#: src/src/i2p/susi/webmail/WebMail.java:1270
msgid "Show Message"
msgstr "Visa meddelande"
#: src/src/i2p/susi/webmail/WebMail.java:1325
#: src/src/i2p/susi/webmail/WebMail.java:1332
#, java-format
msgid "Error decoding content: {0}"
msgstr "Fel vid avkodning av innehåll: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1330
#: src/src/i2p/susi/webmail/WebMail.java:1337
msgid "Error decoding content: No encoder found."
msgstr "Fel vid avkodning av innehåll: Ingen encoder hittades."
#: src/src/i2p/susi/webmail/WebMail.java:1377
#: src/src/i2p/susi/webmail/WebMail.java:1384
msgid "no subject"
msgstr "inget ämne"
#: src/src/i2p/susi/webmail/WebMail.java:1394
#: src/src/i2p/susi/webmail/WebMail.java:1401
msgid "Found no valid sender address."
msgstr "Hittade ingen giltig avsändaradress."
#: src/src/i2p/susi/webmail/WebMail.java:1400
#: src/src/i2p/susi/webmail/WebMail.java:1407
#, java-format
msgid "Found no valid address in \\''{0}\\''."
msgstr "Hittade ingen giltig adress i \\''{0}\\''."
#: src/src/i2p/susi/webmail/WebMail.java:1419
#: src/src/i2p/susi/webmail/WebMail.java:1426
msgid "No recipients found."
msgstr "Inga mottagare funna"
#: src/src/i2p/susi/webmail/WebMail.java:1426
#: src/src/i2p/susi/webmail/WebMail.java:1433
msgid "Quoted printable encoder not available."
msgstr "Citerad utskrivbar encoder inte tillgänglig."
#: src/src/i2p/susi/webmail/WebMail.java:1431
#: src/src/i2p/susi/webmail/WebMail.java:1438
msgid "Header line encoder not available."
msgstr "Header radens encoder är inte tillgänglig."
#: src/src/i2p/susi/webmail/WebMail.java:1482
#: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Mail sent."
msgstr "E-post skickat"
#: src/src/i2p/susi/webmail/WebMail.java:1519
#: src/src/i2p/susi/webmail/WebMail.java:1526
msgid "Send"
msgstr "Skicka"
#: src/src/i2p/susi/webmail/WebMail.java:1520
#: src/src/i2p/susi/webmail/WebMail.java:1527
msgid "Cancel"
msgstr "Avbryt"
#: src/src/i2p/susi/webmail/WebMail.java:1521
#: src/src/i2p/susi/webmail/WebMail.java:1528
msgid "Delete Attachment"
msgstr "Radera bilaga"
#: src/src/i2p/susi/webmail/WebMail.java:1522
#: src/src/i2p/susi/webmail/WebMail.java:1607
#: src/src/i2p/susi/webmail/WebMail.java:1688
#: src/src/i2p/susi/webmail/WebMail.java:1529
#: src/src/i2p/susi/webmail/WebMail.java:1614
#: src/src/i2p/susi/webmail/WebMail.java:1695
msgid "Reload Config"
msgstr "Ladda om konfiguration"
#: src/src/i2p/susi/webmail/WebMail.java:1523
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1689
#: src/src/i2p/susi/webmail/WebMail.java:1530
#: src/src/i2p/susi/webmail/WebMail.java:1615
#: src/src/i2p/susi/webmail/WebMail.java:1696
msgid "Logout"
msgstr "Logga ut"
#: src/src/i2p/susi/webmail/WebMail.java:1546
#: src/src/i2p/susi/webmail/WebMail.java:1693
#: src/src/i2p/susi/webmail/WebMail.java:1553
#: src/src/i2p/susi/webmail/WebMail.java:1700
msgid "From:"
msgstr "Från:"
#: src/src/i2p/susi/webmail/WebMail.java:1547
#: src/src/i2p/susi/webmail/WebMail.java:1554
msgid "To:"
msgstr "Till:"
#: src/src/i2p/susi/webmail/WebMail.java:1548
#: src/src/i2p/susi/webmail/WebMail.java:1555
msgid "Cc:"
msgstr "Cc:"
#: src/src/i2p/susi/webmail/WebMail.java:1549
#: src/src/i2p/susi/webmail/WebMail.java:1556
msgid "Bcc:"
msgstr "Bcc:"
#: src/src/i2p/susi/webmail/WebMail.java:1550
#: src/src/i2p/susi/webmail/WebMail.java:1695
#: src/src/i2p/susi/webmail/WebMail.java:1557
#: src/src/i2p/susi/webmail/WebMail.java:1702
msgid "Subject:"
msgstr "Ärende:"
#: src/src/i2p/susi/webmail/WebMail.java:1551
#: src/src/i2p/susi/webmail/WebMail.java:1558
msgid "Bcc to self"
msgstr "Bcc till själv"
#: src/src/i2p/susi/webmail/WebMail.java:1554
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "New Attachment:"
msgstr "Ny bilaga:"
#: src/src/i2p/susi/webmail/WebMail.java:1554
#: src/src/i2p/susi/webmail/WebMail.java:1561
msgid "Upload File"
msgstr "Ladda upp fil"
#: src/src/i2p/susi/webmail/WebMail.java:1560
#: src/src/i2p/susi/webmail/WebMail.java:1567
msgid "Attachments:"
msgstr "Bilagor:"
#: src/src/i2p/susi/webmail/WebMail.java:1582
#: src/src/i2p/susi/webmail/WebMail.java:1589
msgid "User"
msgstr "Användare"
#: src/src/i2p/susi/webmail/WebMail.java:1583
#: src/src/i2p/susi/webmail/WebMail.java:1590
msgid "Pass"
msgstr "Lösen"
#: src/src/i2p/susi/webmail/WebMail.java:1584
#: src/src/i2p/susi/webmail/WebMail.java:1591
msgid "Host"
msgstr "Värd"
#: src/src/i2p/susi/webmail/WebMail.java:1585
#: src/src/i2p/susi/webmail/WebMail.java:1592
msgid "POP3-Port"
msgstr "POP3-port"
#: src/src/i2p/susi/webmail/WebMail.java:1586
#: src/src/i2p/susi/webmail/WebMail.java:1593
msgid "SMTP-Port"
msgstr "SMTP-port"
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Create Account"
msgstr "Skapa konto"
#: src/src/i2p/susi/webmail/WebMail.java:1587
#: src/src/i2p/susi/webmail/WebMail.java:1594
msgid "Reset"
msgstr "Återställ"
#: src/src/i2p/susi/webmail/WebMail.java:1599
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Really delete the marked messages?"
msgstr "Vill du verkligen radera valda meddelanden?"
#: src/src/i2p/susi/webmail/WebMail.java:1599
#: src/src/i2p/susi/webmail/WebMail.java:1606
msgid "Yes, really delete them!"
msgstr "Ja, radera dem!"
#: src/src/i2p/susi/webmail/WebMail.java:1601
#: src/src/i2p/susi/webmail/WebMail.java:1680
#: src/src/i2p/susi/webmail/WebMail.java:1608
#: src/src/i2p/susi/webmail/WebMail.java:1687
msgid "New"
msgstr "Ny"
#: src/src/i2p/susi/webmail/WebMail.java:1602
#: src/src/i2p/susi/webmail/WebMail.java:1681
#: src/src/i2p/susi/webmail/WebMail.java:1609
#: src/src/i2p/susi/webmail/WebMail.java:1688
msgid "Reply"
msgstr "Svara"
#: src/src/i2p/susi/webmail/WebMail.java:1603
#: src/src/i2p/susi/webmail/WebMail.java:1682
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1689
msgid "Reply All"
msgstr "Svara alla"
#: src/src/i2p/susi/webmail/WebMail.java:1604
#: src/src/i2p/susi/webmail/WebMail.java:1683
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1690
msgid "Forward"
msgstr "Vidarebefodera"
#: src/src/i2p/susi/webmail/WebMail.java:1605
#: src/src/i2p/susi/webmail/WebMail.java:1684
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1691
msgid "Delete"
msgstr "Radera"
#: src/src/i2p/susi/webmail/WebMail.java:1606
#: src/src/i2p/susi/webmail/WebMail.java:1613
msgid "Check Mail"
msgstr "Kolla e-post"
#: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1617
msgid "Sender"
msgstr "Avsändare"
#: src/src/i2p/susi/webmail/WebMail.java:1611
#: src/src/i2p/susi/webmail/WebMail.java:1618
msgid "Subject"
msgstr "Ärende"
#: src/src/i2p/susi/webmail/WebMail.java:1612
#: src/src/i2p/susi/webmail/WebMail.java:1619
msgid "Date"
msgstr "Datum"
#: src/src/i2p/susi/webmail/WebMail.java:1613
#: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Size"
msgstr "Storlek"
#: src/src/i2p/susi/webmail/WebMail.java:1639
#: src/src/i2p/susi/webmail/WebMail.java:1646
#, java-format
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] "1 Byte"
msgstr[1] "{0} Bytes"
#: src/src/i2p/susi/webmail/WebMail.java:1644
#: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "Mark All"
msgstr "Markera alla"
#: src/src/i2p/susi/webmail/WebMail.java:1645
#: src/src/i2p/susi/webmail/WebMail.java:1652
msgid "Invert Selection"
msgstr "Invertera urvalet"
#: src/src/i2p/susi/webmail/WebMail.java:1646
#: src/src/i2p/susi/webmail/WebMail.java:1653
msgid "Clear"
msgstr "Rensa "
#: src/src/i2p/susi/webmail/WebMail.java:1649
#: src/src/i2p/susi/webmail/WebMail.java:1650
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
msgid "First"
msgstr "Första"
#: src/src/i2p/susi/webmail/WebMail.java:1649
#: src/src/i2p/susi/webmail/WebMail.java:1650
#: src/src/i2p/susi/webmail/WebMail.java:1685
#: src/src/i2p/susi/webmail/WebMail.java:1656
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1692
msgid "Previous"
msgstr "Föregående"
#: src/src/i2p/susi/webmail/WebMail.java:1651
#: src/src/i2p/susi/webmail/WebMail.java:1658
#, java-format
msgid "Page {0} of {1}"
msgstr "Sida {0} av {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1653
#: src/src/i2p/susi/webmail/WebMail.java:1654
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
msgid "Last"
msgstr "Sista"
#: src/src/i2p/susi/webmail/WebMail.java:1653
#: src/src/i2p/susi/webmail/WebMail.java:1654
#: src/src/i2p/susi/webmail/WebMail.java:1686
#: src/src/i2p/susi/webmail/WebMail.java:1660
#: src/src/i2p/susi/webmail/WebMail.java:1661
#: src/src/i2p/susi/webmail/WebMail.java:1693
msgid "Next"
msgstr "Nästa"
#: src/src/i2p/susi/webmail/WebMail.java:1657
#: src/src/i2p/susi/webmail/WebMail.java:1664
msgid "Pagesize:"
msgstr "Pagesize:"
#: src/src/i2p/susi/webmail/WebMail.java:1658
#: src/src/i2p/susi/webmail/WebMail.java:1665
msgid "Set"
msgstr "Ställ"
#: src/src/i2p/susi/webmail/WebMail.java:1668
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Really delete this message?"
msgstr "Vill du verkligen radera detta meddelande?"
#: src/src/i2p/susi/webmail/WebMail.java:1668
#: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Yes, really delete it!"
msgstr "Ja, radera det verkligen!"
#: src/src/i2p/susi/webmail/WebMail.java:1687
#: src/src/i2p/susi/webmail/WebMail.java:1694
msgid "Back to Folder"
msgstr "Tillbaka till mapp"
#: src/src/i2p/susi/webmail/WebMail.java:1694
#: src/src/i2p/susi/webmail/WebMail.java:1701
msgid "Date:"
msgstr "Datum:"
#: src/src/i2p/susi/webmail/WebMail.java:1705
#: src/src/i2p/susi/webmail/WebMail.java:1712
msgid "Could not fetch mail."
msgstr "Kunde inte hämta e-post."

2
core/c/jbigi/build.sh
View File

@@ -1,4 +1,4 @@
#/bin/sh
#!/bin/sh
#
# Build the jbigi library for i2p
#

119
core/c/jcpuid/build.sh
View File

@@ -1,61 +1,96 @@
#/bin/sh
#!/bin/sh
case `uname -sr` in
MINGW*)
echo "Building windows .dll's";;
cd `dirname $0`
case `uname -s` in
MINGW*|CYGWIN*)
echo "Building windows .dlls";;
SunOS*)
echo "Building solaris .so's";;
CYGWIN*)
echo "Building windows .dll's";;
Linux*)
echo "Building linux .so's";;
FreeBSD*)
echo "Building freebsd .so's";;
*kFreeBSD*)
echo "Building kFreebsd .so's";;
echo "Building solaris .sos";;
Darwin*)
echo "Building Darwin jnilibs";;
Linux*|NetBSD*|OpenBSD*|*FreeBSD*)
echo "Building `uname -s |tr [A-Z] [a-z]` .sos";;
*)
echo "Unsupported build environment"
exit;;
esac
rm -rf lib
mkdir lib
mkdir lib/freenet
mkdir lib/freenet/support
mkdir lib/freenet/support/CPUInformation
mkdir -p lib/freenet/support/CPUInformation
CC="gcc"
case `uname -sr` in
MINGW*)
case `uname -s` in
MINGW*|CYGWIN*)
JAVA_HOME="/c/software/j2sdk1.4.2_05"
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/win32/"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include/ -I${JAVA_HOME}/include/win32/"
LINKFLAGS="-shared -static -static-libgcc -Wl,--kill-at"
LIBFILE="lib/freenet/support/CPUInformation/jcpuid-x86-windows.dll";;
SunOS*)
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
FreeBSD*)
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-freebsd.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-freebsd.so";;
*kFreeBSD*|Linux*)
Darwin*)
JAVA_HOME=$(/usr/libexec/java_home)
COMPILEFLAGS="-fPIC -Wall -arch x86_64 -arch i386"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include/"
LINKFLAGS="-dynamiclib -framework JavaVM"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-darwin.jnilib";;
Linux*|OpenBSD*|NetBSD*|*FreeBSD*|SunOS*)
UNIXTYPE="`uname -s | tr [A-Z] [a-z]`"
if [ ${UNIXTYPE} = "sunos" ]; then
UNIXTYPE="solaris"
elif [ ${UNIXTYPE} = "kfreebsd" ]; then
UNIXTYPE="linux"
fi
# If JAVA_HOME is set elsewhere, obey it. Otherwise we'll try to
# deduce its location ourselves.
if [ -z "${JAVA_HOME}" ]; then
if [ ${UNIXTYPE} = "freebsd" ]; then
if [ -d /usr/local/openjdk6 ]; then
JAVA_HOME="/usr/local/openjdk6"
elif [ -d /usr/local/openjdk7 ]; then
JAVA_HOME="/usr/local/openjdk7"
fi
elif [ ${UNIXTYPE} = "openbsd" ]; then # The default in 4.9
if [ -d /usr/local/jdk-1.7.0 ]; then
JAVA_HOME="/usr/local/jdk-1.7.0"
fi
elif [ ${UNIXTYPE} = "netbsd" ]; then
if [ -d /usr/pkg/java/openjdk7 ]; then
JAVA_HOME="/usr/pkg/java/openjdk7"
fi
elif [ ${UNIXTYPE} = "linux" -a -e /etc/debian_version ]; then
if [ -d /usr/lib/jvm/default-java ]; then
JAVA_HOME="/usr/lib/jvm/default-java"
fi
fi
fi
case `uname -m` in
x86_64*|amd64)
ARCH="x86_64";;
ia64*)
ARCH="ia64";;
i?86*)
ARCH="x86";;
*)
echo "Unsupported build environment. jcpuid is only used on x86 systems."
exit 1;;
esac
# JAVA_HOME being set doesn't guarantee that it's usable
if [ ! -r ${JAVA_HOME}/include/jni.h ]; then
echo "Please ensure you have a Java SDK installed"
echo "and/or set JAVA_HOME then re-run this script."
exit 1
fi
LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
esac
echo "Compiling C code..."
rm -f $LIBFILE
$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
strip $LIBFILE
echo Built $LIBFILE
#g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
# -I$JAVA_HOME/include/linux src/*.cpp \
# -o lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so
rm -f ${LIBFILE}
${CC} ${COMPILEFLAGS} ${LINKFLAGS} ${INCLUDES} src/*.c -o ${LIBFILE} || (echo "Failed to compile ${LIBFILE}"; exit 1)
strip ${LIBFILE} || (echo "Failed to strip ${LIBFILE}" ; exit 1)
echo Built `dirname $0`/${LIBFILE}

90
core/c/jcpuid/mbuild.sh
View File

@@ -1,90 +0,0 @@
#/bin/sh
case `uname -sr` in
MINGW*)
echo "Building windows .dlls";;
CYGWIN*)
echo "Building windows .dlls";;
Linux*)
echo "Building linux .sos";;
NetBSD*|OpenBSD*|FreeBSD*)
echo "Building `uname -s |tr [A-Z] [a-z]` .sos";;
Darwin*)
echo "Building OSX jnilibs";;
*)
echo "Unsupported build environment"
exit;;
esac
rm -rf lib
#mkdir lib
#mkdir lib/freenet
#mkdir lib/freenet/support
mkdir -p lib/freenet/support/CPUInformation
CC="gcc"
case `uname -sr` in
MINGW*)
JAVA_HOME="/c/software/j2sdk1.4.2_05"
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/win32/"
LINKFLAGS="-shared -static -static-libgcc -Wl,--kill-at"
LIBFILE="lib/freenet/support/CPUInformation/jcpuid-x86-windows.dll";;
Darwin*)
JAVA_HOME=$(/usr/libexec/java_home)
COMPILEFLAGS="-fPIC -Wall -arch x86_64 -arch i386"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/"
LINKFLAGS="-dynamiclib -framework JavaVM"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-darwin.jnilib";;
Linux*|OpenBSD*|NetBSD*|FreeBSD*|SunOS*)
UNIXTYPE="`uname -s | tr [A-Z] [a-z]`"
if [ $UNIXTYPE = "sunos" ]; then
UNIXTYPE="solaris"
elif [ $UNIXTYPE = "freebsd" ]; then
if [ -d /usr/local/openjdk6 ]; then
JAVA_HOME="/usr/local/openjdk6"
elif [ -d /usr/local/openjdk7 ]; then
JAVA_HOME="/usr/local/openjdk7"
fi
elif [ $UNIXTYPE = "openbsd" ]; then
if [ -d /usr/local/jdk-1.7.0 ]; then
JAVA_HOME="/usr/local/jdk-1.7.0"
fi
elif [ $UNIXTYPE = "netbsd" ]; then
if [ -d /usr/pkg/java/openjdk7 ]; then
JAVA_HOME="/usr/pkg/java/openjdk7"
fi
elif [ $UNIXTYPE = "linux" -a -e /etc/debian_version ]; then
if [ -d /usr/lib/jvm/default-java ]; then
JAVA_HOME="/usr/lib/jvm/default-java"
fi
fi
case `uname -m` in
x86_64*|amd64)
LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86_64-${UNIXTYPE}.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86_64-${UNIXTYPE}.so";;
ia64*)
LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-${UNIXTYPE}.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-ia64-${UNIXTYPE}.so";;
i?86*)
LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-${UNIXTYPE}.so"
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-${UNIXTYPE}.so";;
*)
echo "Unsupported build environment"
exit;;
esac
COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}";;
esac
echo "Compiling C code..."
rm -f $LIBFILE
$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
strip $LIBFILE
echo Built $LIBFILE
#g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
# -I$JAVA_HOME/include/linux src/*.cpp \
# -o lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so

12
core/c/mbuild.sh
View File

@@ -1,7 +1,15 @@
#/usr/bin/env bash
#!/usr/bin/env bash
# Automatic build of so files, ignores failed builds.
# Place latest gmp tarball in the jbigi dir, and exec this script.
if [ -z "$BASH_VERSION" ]; then
echo "This script needs to be run with Bash."
echo
echo "Please install bash and then run this script with"
echo "bash $0"
exit 1
fi
#JBIGI=../../../installer/lib/jbigi/jbigi.jar
#if [ -f jbigi.jarx ] ; then
@@ -10,7 +18,7 @@
rm -f t/* jcpuid/lib/freenet/support/CPUInformation/* jbigi/lib/net/i2p/util/*
( cd jcpuid ; ./mbuild.sh )
( cd jcpuid ; ./build.sh )
( cd jbigi ; ./mbuild-all.sh )
rm -Rf t

26
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@@ -218,7 +218,7 @@ public class CPUID {
System.out.println("CPU Flags: 0x" + Integer.toHexString(getEDXCPUFlags()));
CPUInfo c = getInfo();
System.out.println(" **More CPUInfo**");
System.out.println("\n **More CPUInfo**");
System.out.println("CPU model string: " + c.getCPUModelString());
System.out.println("CPU has MMX: " + c.hasMMX());
System.out.println("CPU has SSE: " + c.hasSSE());
@@ -228,19 +228,25 @@ public class CPUID {
System.out.println("CPU has SSE4.2: " + c.hasSSE42());
System.out.println("CPU has SSE4A: " + c.hasSSE4A());
if(c instanceof IntelCPUInfo){
System.out.println(" **Intel-info**");
System.out.println(" Is pII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible());
System.out.println(" Is pIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible());
System.out.println(" Is pIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible());
System.out.println(" Is atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible());
System.out.println(" Is core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible());
System.out.println(" Is corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible());
System.out.println("\n **Intel-info**");
System.out.println("Is PII-compatible: "+((IntelCPUInfo)c).IsPentium2Compatible());
System.out.println("Is PIII-compatible: "+((IntelCPUInfo)c).IsPentium3Compatible());
System.out.println("Is PIV-compatible: "+((IntelCPUInfo)c).IsPentium4Compatible());
System.out.println("Is Atom-compatible: "+((IntelCPUInfo)c).IsAtomCompatible());
System.out.println("Is Pentium M compatible: "+((IntelCPUInfo)c).IsPentiumMCompatible());
System.out.println("Is Core2-compatible: "+((IntelCPUInfo)c).IsCore2Compatible());
System.out.println("Is Corei-compatible: "+((IntelCPUInfo)c).IsCoreiCompatible());
}
if(c instanceof AMDCPUInfo){
System.out.println(" **AMD-info**");
System.out.println("\n **AMD-info**");
System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsK6Compatible());
System.out.println("Is K6_2-compatible: "+((AMDCPUInfo)c).IsK6_2_Compatible());
System.out.println("Is K6_3-compatible: "+((AMDCPUInfo)c).IsK6_3_Compatible());
System.out.println("Is K6-compatible: "+((AMDCPUInfo)c).IsGeodeCompatible());
System.out.println("Is Athlon-compatible: "+((AMDCPUInfo)c).IsAthlonCompatible());
System.out.println("Is Athlon64-compatible: "+((AMDCPUInfo)c).IsAthlon64Compatible());
System.out.println("Is Bobcat-compatible: "+((AMDCPUInfo)c).IsBobcatCompatible());
}
}
/**

1
core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
View File

@@ -162,7 +162,6 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
case 11:
isPentium2Compatible = true;
isPentium3Compatible = true;
isPentiumMCompatible = true;
modelString = "Pentium III (130 nm)";
break;
case 13:

14
core/java/src/net/i2p/I2PAppContext.java
View File

@@ -198,20 +198,6 @@ public class I2PAppContext {
_overrideProps = new I2PProperties();
if (envProps != null)
_overrideProps.putAll(envProps);
_statManager = null;
_sessionKeyManager = null;
_namingService = null;
_elGamalEngine = null;
_elGamalAESEngine = null;
_logManager = null;
_keyRing = null;
_statManagerInitialized = false;
_sessionKeyManagerInitialized = false;
_namingServiceInitialized = false;
_elGamalEngineInitialized = false;
_elGamalAESEngineInitialized = false;
_logManagerInitialized = false;
_keyRingInitialized = false;
_shutdownTasks = new ConcurrentHashSet(32);
initializeDirs();
}

2
core/java/src/net/i2p/client/I2PSessionImpl.java
View File

@@ -355,10 +355,8 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
_socket = new Socket(_hostname, _portNum);
// _socket.setSoTimeout(1000000); // Uhmmm we could really-really use a real timeout, and handle it.
_out = _socket.getOutputStream();
synchronized (_out) {
_out.write(I2PClient.PROTOCOL_BYTE);
_out.flush();
}
_writer = new ClientWriterRunner(_out, this);
InputStream in = _socket.getInputStream();
_reader = new I2CPMessageReader(in, this);

2
core/java/src/net/i2p/client/I2PSimpleSession.java
View File

@@ -78,10 +78,8 @@ class I2PSimpleSession extends I2PSessionImpl2 {
else
_socket = new Socket(_hostname, _portNum);
_out = _socket.getOutputStream();
synchronized (_out) {
_out.write(I2PClient.PROTOCOL_BYTE);
_out.flush();
}
_writer = new ClientWriterRunner(_out, this);
InputStream in = _socket.getInputStream();
_reader = new I2CPMessageReader(in, this);

4
core/java/src/net/i2p/client/naming/BlockfileNamingService.java
View File

@@ -432,6 +432,7 @@ public class BlockfileNamingService extends DummyNamingService {
* @param source may be null
* @throws RuntimeException
*/
/****
private void addEntry(SkipList sl, String key, Destination dest, String source) {
Properties props = new Properties();
props.setProperty(PROP_ADDED, Long.toString(_context.clock().now()));
@@ -439,6 +440,7 @@ public class BlockfileNamingService extends DummyNamingService {
props.setProperty(PROP_SOURCE, source);
addEntry(sl, key, dest, props);
}
****/
/**
* Caller must synchronize
@@ -476,9 +478,11 @@ public class BlockfileNamingService extends DummyNamingService {
* @return null without exception on error (logs only)
* @since 0.8.9
*/
/****
private String getReverseEntry(Destination dest) {
return getReverseEntry(dest.calculateHash());
}
****/
/**
* Caller must synchronize.

1
core/java/src/net/i2p/client/naming/SingleFileNamingService.java
View File

@@ -126,6 +126,7 @@ public class SingleFileNamingService extends NamingService {
_log.warn("Error loading hosts file " + _file, ioe);
return null;
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}
releaseReadLock();
}
}

6
core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java
View File

@@ -519,9 +519,11 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
}
/** A basic symmetric encryption/decryption test. */
/****
public static boolean self_test() {
return self_test(_BLOCK_SIZE);
}
****/
// Rijndael own methods
//...........................................................................
@@ -745,6 +747,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
}
/** A basic symmetric encryption/decryption test for a given key size. */
/****
private static boolean self_test(int keysize) {
if (_RDEBUG) trace(_IN, "self_test(" + keysize + ")");
boolean ok = false;
@@ -795,6 +798,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
if (_RDEBUG) trace(_OUT, "self_test()");
return ok;
}
****/
/**
* Return The number of rounds for a given Rijndael's key and block sizes.
@@ -894,9 +898,11 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor
// main(): use to generate the Intermediate Values KAT
//...........................................................................
/****
public static void main(String[] args) {
self_test(16);
self_test(24);
self_test(32);
}
****/
}

2
core/java/src/net/i2p/crypto/ElGamalAESEngine.java
View File

@@ -298,10 +298,12 @@ public class ElGamalAESEngine {
* @param foundKey out parameter. Data must be unset when called; may be filled with a new sessionKey found during decryption
* @return decrypted data or null on failure
*/
/****
private byte[] decryptAESBlock(byte encrypted[], SessionKey key, byte iv[],
byte sentTag[], Set foundTags, SessionKey foundKey) throws DataFormatException {
return decryptAESBlock(encrypted, 0, encrypted.length, key, iv, sentTag, foundTags, foundKey);
}
****/
/*
* Note: package private for ElGamalTest.testAES()

2
core/java/src/net/i2p/crypto/HMAC256Generator.java
View File

@@ -34,7 +34,7 @@ public class HMAC256Generator extends HMACGenerator {
return new I2PHMac(new Sha256ForMAC());
}
private class Sha256ForMAC extends Sha256Standalone implements Digest {
private static class Sha256ForMAC extends Sha256Standalone implements Digest {
public String getAlgorithmName() { return "sha256 for hmac"; }
public int getDigestSize() { return 32; }
public int doFinal(byte[] out, int outOff) {

12
core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
View File

@@ -596,10 +596,10 @@ public class TransientSessionKeyManager extends SessionKeyManager {
}
int total = 0;
long now = _context.clock().now();
for (Iterator<SessionKey> iter = inboundSets.keySet().iterator(); iter.hasNext();) {
SessionKey skey = iter.next();
for (Map.Entry<SessionKey, Set<TagSet>> e : inboundSets.entrySet()) {
SessionKey skey = e.getKey();
Set<TagSet> sets = new TreeSet(new TagSetComparator());
sets.addAll(inboundSets.get(skey));
sets.addAll(e.getValue());
buf.append("<tr><td><b>Session key</b>: ").append(skey.toBase64()).append("</td>" +
"<td><b># Sets:</b> ").append(sets.size()).append("</td></tr>" +
"<tr><td colspan=\"2\"><ul>");
@@ -653,9 +653,9 @@ public class TransientSessionKeyManager extends SessionKeyManager {
* Just for the HTML method above so we can see what's going on easier
* Earliest first
*/
private static class TagSetComparator implements Comparator {
public int compare(Object l, Object r) {
return (int) (((TagSet)l).getDate() - ((TagSet)r).getDate());
private static class TagSetComparator implements Comparator<TagSet> {
public int compare(TagSet l, TagSet r) {
return (int) (l.getDate() - r.getDate());
}
}

12
core/java/src/net/i2p/data/DataHelper.java
View File

@@ -55,16 +55,8 @@ import net.i2p.util.Translate;
* @author jrandom
*/
public class DataHelper {
private static final byte EQUAL_BYTES[];
private static final byte SEMICOLON_BYTES[];
static {
try {
EQUAL_BYTES = "=".getBytes("UTF-8");
SEMICOLON_BYTES = ";".getBytes("UTF-8");
} catch (UnsupportedEncodingException uee) {
throw new RuntimeException("no utf8!?");
}
}
private static final byte[] EQUAL_BYTES = getUTF8("=");
private static final byte[] SEMICOLON_BYTES = getUTF8(";");
/** Read a mapping from the stream, as defined by the I2P data structure spec,
* and store it into a Properties object.

5
core/java/src/net/i2p/data/RoutingKeyGenerator.java
View File

@@ -40,13 +40,14 @@ import net.i2p.util.RandomSource;
*
*/
public class RoutingKeyGenerator {
private Log _log;
private I2PAppContext _context;
private final Log _log;
private final I2PAppContext _context;
public RoutingKeyGenerator(I2PAppContext context) {
_log = context.logManager().getLog(RoutingKeyGenerator.class);
_context = context;
}
public static RoutingKeyGenerator getInstance() {
return I2PAppContext.getGlobalContext().routingKeyGenerator();
}

3
core/java/src/net/i2p/time/NtpMessage.java
View File

@@ -33,6 +33,7 @@ import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import net.i2p.util.RandomSource;
/**
* This class represents a NTP message, as specified in RFC 2030. The message
@@ -399,7 +400,7 @@ public class NtpMessage {
// low order bits of the timestamp with a random, unbiased
// bitstring, both to avoid systematic roundoff errors and as
// a means of loop detection and replay detection.
array[7+pointer] = (byte) (Math.random()*255.0);
array[7+pointer] = (byte) (RandomSource.getInstance().nextInt());
}

4
core/java/src/net/i2p/time/Timestamper.java
View File

@@ -321,14 +321,16 @@ public class Timestamper implements Runnable {
_context.getProperty(PROP_CONCURRING_SERVERS, DEFAULT_CONCURRING_SERVERS)));
}
/****
public static void main(String args[]) {
System.setProperty(PROP_DISABLED, "false");
System.setProperty(PROP_QUERY_FREQUENCY, "30000");
I2PAppContext ctx = I2PAppContext.getGlobalContext();
I2PAppContext.getGlobalContext();
for (int i = 0; i < 5*60*1000; i += 61*1000) {
try { Thread.sleep(61*1000); } catch (InterruptedException ie) {}
}
}
****/
/**
* Interface to receive update notifications for when we query the time

2
core/java/src/net/metanotion/io/block/BlockFile.java
View File

@@ -443,7 +443,7 @@ public class BlockFile {
public BSkipList makeIndex(String name, Serializer key, Serializer val) throws IOException {
if(metaIndex.get(name) != null) { throw new IOException("Index already exists"); }
int page = allocPage();
metaIndex.put(name, new Integer(page));
metaIndex.put(name, Integer.valueOf(page));
BSkipList.init(this, page, spanSize);
BSkipList bsl = new BSkipList(spanSize, this, page, key, val, true);
openIndices.put(name, bsl);

4
debian/patches/0002-jbigi-soname.patch vendored
View File

@@ -12,7 +12,7 @@ a soname to shut lintian up.
--- a/core/c/jbigi/mbuild_jbigi.sh
+++ b/core/c/jbigi/mbuild_jbigi.sh
@@ -47,7 +47,7 @@
@@ -48,7 +48,7 @@
fi
fi
COMPILEFLAGS="-fPIC -Wall"
@@ -21,7 +21,7 @@ a soname to shut lintian up.
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";;
*)
@@ -66,7 +66,7 @@
@@ -67,7 +67,7 @@
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE

27
debian/patches/0003-renaming-jcpuid.patch vendored
View File

@@ -8,23 +8,14 @@ Subject: rename jcpuid
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
@@ -37,7 +37,7 @@
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
+ LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
FreeBSD*)
COMPILEFLAGS="-Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
@@ -46,8 +46,8 @@
*kFreeBSD*|Linux*)
COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
@@ -83,8 +83,8 @@
echo "and/or set JAVA_HOME then re-run this script."
exit 1
fi
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
+ LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
+ LIBFILE="../jbigi/libjcpuid.so";;
+ LIBFILE="../jbigi/libjcpuid.so"
COMPILEFLAGS="-fPIC -Wall"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
esac
echo "Compiling C code..."

26
history.txt
View File

@@ -1,3 +1,29 @@
2011-09-30 kytv
* fix umask bug by upgrading to wrapper v3.5.12. Binaries are from Tanuki's
delta pack for the community edition, except:
- Win64: not available from Tanuki--compiled with VS2010
- FreeBSD: Tanuki's binaries are compiled in FBSD v6. I compiled the
wrapper in FreeBSD 7.4 to eliminate the dependency on the compat6x port.
- Linux ARM: not available from Tanuki
- OSX: Tanuki offers separate binaries for 32bit VS 64bit. Our
wrapper is quad-fat supporting PPC32/PPC64 and x86/x86_64.
2011-09-29 zzz
* Bandwidth refiller: Reinitialize at restart, avoid
issues from clock skews
2011-09-27 kytv
* Remove exotrack.i2p from i2psnark
2011-09-24 zzz
* HTTPClient: Fix error page not appearing, broken by
StreamForwarder change
* HTTPServer: More mime types not to compress
2011-09-23 kytv
* Update Italian, Spanish, and Swedish translations
from Transifex
2011-09-20 zzz
* Crypto: Comment out some main()
* ClientMessage: Remove unused MessageReceptionInfo

BIN
installer/lib/wrapper/all/wrapper.jar
View File

Binary file not shown.

BIN
installer/lib/wrapper/freebsd/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/freebsd/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/freebsd64/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/freebsd64/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux-armv5/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux-armv5/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux-ppc/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux-ppc/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux64/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/linux64/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/macosx/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/macosx/libwrapper.jnilib
View File

Binary file not shown.

BIN
installer/lib/wrapper/solaris/i2psvc
View File

Binary file not shown.

BIN
installer/lib/wrapper/solaris/libwrapper.so
View File

Binary file not shown.

BIN
installer/lib/wrapper/win32/I2Psvc.exe
View File

Binary file not shown.

BIN
installer/lib/wrapper/win32/wrapper.dll
View File

Binary file not shown.

BIN
installer/lib/wrapper/win64/I2Psvc.exe
View File

Binary file not shown.

2
installer/lib/wrapper/win64/README-x64-win.txt
View File

@@ -1,4 +1,4 @@
Changes will probably be needed for newer versions than 3.5.9.
Changes will probably be needed for newer versions than 3.5.12.
To use the patch in this directory, copy Makefile-windows-x86-32.nmake to
Makefile-windows-x86-64.nmake then "patch < x64-win.patch". Compiles cleanly

BIN
installer/lib/wrapper/win64/wrapper.dll
View File

Binary file not shown.

6
installer/lib/wrapper/win64/x64-win.patch
View File

@@ -1,5 +1,5 @@
--- Makefile-windows-x86-64.nmake 2011-05-28 21:12:05.383721860 +0000
+++ Makefile-windows-x86-64.nmake 2011-06-09 19:43:59.349132461 +0000
--- Makefile-windows-x86-32.nmake 2011-09-29 20:34:25.447939000 +0000
+++ Makefile-windows-x86-64.nmake 2011-09-29 20:51:57.297170000 +0000
@@ -9,19 +9,19 @@
PROJ = wrapper
@@ -14,7 +14,7 @@
-EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release
+EXE_OUTDIR = $(PROJ)32_VC8__Win64_Release
EXE_OBJS = $(EXE_OUTDIR)\wrapper_i18n.obj $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapper_file.obj $(EXE_OUTDIR)\wrapperinfo.obj
EXE_LIBS = mpr.lib shell32.lib wsock32.lib shlwapi.lib advapi32.lib user32.lib Crypt32.lib Wintrust.lib pdh.lib
EXE_LIBS = mpr.lib shell32.lib netapi32.lib wsock32.lib shlwapi.lib advapi32.lib user32.lib Crypt32.lib Wintrust.lib pdh.lib
EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE"
EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /LTCG

14
installer/resources/i2prouter
View File

@@ -149,21 +149,9 @@ failed() {
case `uname -s` in
FreeBSD)
echo
echo "In an attempt to ensure that I2P will run on as many systems"
echo "as possible, included in the installation package is a"
echo "version of the wrapper that was compiled for FreeBSD 6."
echo "Necessary compatibility libraries may not be on your"
echo "system. These libraries are included in the misc/compat6x port."
echo
echo "Additionally, the wrapper requires libiconv to be on your system."
echo "The wrapper requires libiconv to be on your system."
echo "It can be installed with pkg_add -r libiconv"
echo
echo "If you cannot (or choose not to) install these libraries,"
echo "I2P may be started with the 'runplain.sh' script. Another"
echo "option would be to compile the java wrapper for your system."
echo "Hints to accomplish this can be found at"
echo "${WRAPPER_URL}."
echo
exit 1
;;
*)

20
installer/resources/initialNews/initialNews_sv.xml Normal file
View File

@@ -0,0 +1,20 @@
<div lang="en">
<h3>Congratulations on getting I2P installed!</h3>
<p>
<b>Välkommen till I2P!</b>
<b>Ha tålamod</b> medan I2P startar upp och letar upp peers.
</p>
<p>
Medan du väntar, var god <b>ställ in dina bandbreddd och port inställningar</b> på
<a href="config.jsp">konfigurations-sidan</a>.
</p>
<p>
När du har en "delade klienter" distination listad på vänster sida,
<b>kika på</b> vår
<a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
</p>
<p>
Rikta din IRC-klient till <b>localhost:6668</b> och säg hej till oss på
<a href="irc://127.0.0.1:6668/i2p-help">#i2p-help</a> eller <a href="irc://127.0.0.1:6668/i2p">#i2p</a>.
</p>
</div>

2
installer/resources/readme/readme_ru.html
View File

@@ -26,7 +26,7 @@
<h3>Анонимный шифрованный веб-хостинг в I2P</h3>
<ul class="links">
<li class="tidylist"><b>Готовы к действию!</b><br>I2P идёт со встроенным готовым к работе веб-сервром для хостинга вашего собственного анонимного веб-сайта (eepsite) в сети I2P: <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> развёрнут и слушает на <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. Для размещения собственного контента,
<li class="tidylist"><b>Готовы к действию!</b><br>I2P идёт со встроенным готовым к работе веб-сервером для хостинга вашего собственного анонимного веб-сайта (eepsite) в сети I2P: <a href="http://jetty.mortbay.org/" target="_blank">Jetty</a> развёрнут и слушает на <a href="http://127.0.0.1:7658/" target="_blank">http://127.0.0.1:7658/</a>. Для размещения собственного контента,
просто положите ваши файлы в каталог <code>eepsite/docroot/</code> (или положите любой
обычный JSP/Servlet .war файл в <code>eepsite/webapps</code>,
или обычный CGI-скрипт внутрь <code>eepsite/cgi-bin</code>) и они будут показы вам.

4
router/java/src/net/i2p/router/JobImpl.java
View File

@@ -62,6 +62,10 @@ public abstract class JobImpl implements Job {
public void madeReady() { _madeReadyOn = _context.clock().now(); }
public void dropped() {}
/**
* Warning - only call this from runJob() or if Job is not already queued,
* or else it gets the job queue out of order.
*/
protected void requeue(long delayMs) {
getTiming().setStartAfter(_context.clock().now() + delayMs);
_context.jobQueue().addJob(this);

1
router/java/src/net/i2p/router/Router.java
View File

@@ -1311,6 +1311,7 @@ public class Router implements RouterClock.ClockShiftListener {
// NOTE: DisconnectMessageHandler keys off "restart"
try { _context.clientManager().shutdown("Router restart"); } catch (Throwable t) { _log.log(Log.CRIT, "Error stopping the client manager", t); }
_log.logAlways(Log.WARN, "Stopping the comm system");
_context.bandwidthLimiter().reinitialize();
try { _context.messageRegistry().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the message registry", t); }
try { _context.commSystem().restart(); } catch (Throwable t) { _log.log(Log.CRIT, "Error restarting the comm system", t); }
_log.logAlways(Log.WARN, "Stopping the tunnel manager");

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 20;
public final static long BUILD = 23;
/** for example "-test" */
public final static String EXTRA = "";
public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

21
router/java/src/net/i2p/router/TunnelInfo.java
View File

@@ -34,6 +34,27 @@ public interface TunnelInfo {
/** retrieve the peer at the given hop. the gateway is hop 0 */
public Hash getPeer(int hop);
/**
* For convenience
* @return getPeer(0)
* @since 0.8.9
*/
public Hash getGateway();
/**
* For convenience
* @return getPeer(getLength() - 1)
* @since 0.8.9
*/
public Hash getEndpoint();
/**
* For convenience
* @return isInbound() ? getGateway() : getEndpoint()
* @since 0.8.9
*/
public Hash getFarEnd();
/** is this an inbound tunnel? */
public boolean isInbound();

2
router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
View File

@@ -103,7 +103,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
protected final static long DONT_FAIL_PERIOD = 10*60*1000;
/** don't probe or broadcast data, just respond and search when explicitly needed */
private final boolean QUIET = false;
private static final boolean QUIET = false;
public static final String PROP_ENFORCE_NETID = "router.networkDatabase.enforceNetId";
private static final boolean DEFAULT_ENFORCE_NETID = false;

10
router/java/src/net/i2p/router/networkdb/kademlia/XORComparator.java
View File

@@ -10,20 +10,18 @@ import net.i2p.data.Hash;
*
*/
class XORComparator implements Comparator<Hash> {
private final Hash _base;
private final byte[] _base;
/**
* @param target key to compare distances with
*/
public XORComparator(Hash target) {
_base = target;
_base = target.getData();
}
public int compare(Hash lhs, Hash rhs) {
if (lhs == null) throw new NullPointerException("LHS is null");
if (rhs == null) throw new NullPointerException("RHS is null");
byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base.getData());
byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base.getData());
byte lhsDelta[] = DataHelper.xor(lhs.getData(), _base);
byte rhsDelta[] = DataHelper.xor(rhs.getData(), _base);
return DataHelper.compareTo(lhsDelta, rhsDelta);
}
}

1
router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
View File

@@ -253,6 +253,7 @@ public class FIFOBandwidthLimiter {
// it changes out from under us
// This never had locks before concurrent, anyway
// FIXME wrap - change to AtomicLong or detect
int avi = _availableInbound.addAndGet((int) bytesInbound);
if (avi > _maxInbound) {
if (_log.shouldLog(Log.DEBUG))

3
router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
View File

@@ -110,6 +110,9 @@ public class FIFOBandwidthRefiller implements Runnable {
+ " rate in="
+ _inboundKBytesPerSecond + ", out="
+ _outboundKBytesPerSecond +")");
// clock skew
if (numMs >= REPLENISH_FREQUENCY * 50 || numMs <= 0)
numMs = REPLENISH_FREQUENCY;
if (numMs >= REPLENISH_FREQUENCY) {
long inboundToAdd = (1024*_inboundKBytesPerSecond * numMs)/1000;
long outboundToAdd = (1024*_outboundKBytesPerSecond * numMs)/1000;

27
router/java/src/net/i2p/router/tunnel/HopConfig.java
View File

@@ -26,10 +26,12 @@ public class HopConfig {
private long _creation;
private long _expiration;
private Map _options;
private long _messagesProcessed;
private long _oldMessagesProcessed;
private long _messagesSent;
private long _oldMessagesSent;
// these 4 were longs, let's save some space
// 2 billion * 1KB / 10 minutes = 3 GBps in a single tunnel
private int _messagesProcessed;
private int _oldMessagesProcessed;
private int _messagesSent;
private int _oldMessagesSent;
/** IV length for {@link #getReplyIV} */
public static final int REPLY_IV_LENGTH = 16;
@@ -110,16 +112,21 @@ public class HopConfig {
/** take note of a message being pumped through this tunnel */
/** "processed" is for incoming and "sent" is for outgoing (could be dropped in between) */
public void incrementProcessedMessages() { _messagesProcessed++; }
public long getProcessedMessagesCount() { return _messagesProcessed; }
public long getRecentMessagesCount() {
long rv = _messagesProcessed - _oldMessagesProcessed;
public int getProcessedMessagesCount() { return _messagesProcessed; }
public int getRecentMessagesCount() {
int rv = _messagesProcessed - _oldMessagesProcessed;
_oldMessagesProcessed = _messagesProcessed;
return rv;
}
public void incrementSentMessages() { _messagesSent++; }
public long getSentMessagesCount() { return _messagesSent; }
public long getRecentSentMessagesCount() {
long rv = _messagesSent - _oldMessagesSent;
public int getSentMessagesCount() { return _messagesSent; }
public int getRecentSentMessagesCount() {
int rv = _messagesSent - _oldMessagesSent;
_oldMessagesSent = _messagesSent;
return rv;
}

27
router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java
View File

@@ -81,6 +81,33 @@ public class TunnelCreatorConfig implements TunnelInfo {
public Hash getPeer(int hop) { return _peers[hop]; }
public void setPeer(int hop, Hash peer) { _peers[hop] = peer; }
/**
* For convenience
* @return getPeer(0)
* @since 0.8.9
*/
public Hash getGateway() {
return _peers[0];
}
/**
* For convenience
* @return getPeer(getLength() - 1)
* @since 0.8.9
*/
public Hash getEndpoint() {
return _peers[_peers.length - 1];
}
/**
* For convenience
* @return isInbound() ? getGateway() : getEndpoint()
* @since 0.8.9
*/
public Hash getFarEnd() {
return _peers[_isInbound ? 0 : _peers.length - 1];
}
/** is this an inbound tunnel? */
public boolean isInbound() { return _isInbound; }