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

propagate from branch 'i2p.i2p.zzz.test2' (head d80f8632ef0a2aa350eee9a38ba6a4c56471f5bc)

Browse Source 
to branch 'i2p.i2p' (head e8b712c826e44211217f06eb3a4da2703323a42f)
This commit is contained in:
zzz
2013-07-20 11:53:41 +00:00
parent 3b46acc285 554a3a6b0e
commit 90cc71d14d
37 changed files with 14820 additions and 101278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.mtn-ignore
View File

@@ -1,5 +1,7 @@
# Just to try and prevent some noob disasters. # Just to try and prevent some noob disasters.
# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list # Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
# Temporary/build files
_jsp\.java$ _jsp\.java$
\.bz2$ \.bz2$
\.tar$ \.tar$
@@ -19,13 +21,27 @@ _jsp\.java$
.\deb$ .\deb$
\.zip$ \.zip$
^\. ^\.
^build
^pkg-temp/
~$ ~$
web-fragment.xml
web-out.xml
# Temporary/build dirs
^build
^pkg-temp
/build /build
/classes/ /classes
/dist
/mo
/tmp
^apps/jetty/jettylib
# Debian-related
^debian/copyright ^debian/copyright
^debian/changelog ^debian/changelog
# Build property overrides
override.properties override.properties
# Reporting
sloccount.sc sloccount.sc
^reports/ ^reports/

3
.tx/config
View File

@@ -171,6 +171,7 @@ trans.ru_RU = debian/po/ru.po
trans.sv_SE = debian/po/sv.po trans.sv_SE = debian/po/sv.po
trans.uk_UA = debian/po/uk.po trans.uk_UA = debian/po/uk.po
trans.tr_TR = debian/po/tr.po trans.tr_TR = debian/po/tr.po
trans.zh_CN = debian/po/zh.po
[I2P.i2prouter-script] [I2P.i2prouter-script]
source_file = installer/resources/locale/po/messages_en.po source_file = installer/resources/locale/po/messages_en.po
@@ -180,6 +181,8 @@ trans.fr = installer/resources/locale/po/messages_fr.po
trans.it = installer/resources/locale/po/messages_it.po trans.it = installer/resources/locale/po/messages_it.po
trans.sv_SE = installer/resources/locale/po/messages_sv.po trans.sv_SE = installer/resources/locale/po/messages_sv.po
trans.ru_RU = installer/resources/locale/po/messages_ru.po trans.ru_RU = installer/resources/locale/po/messages_ru.po
trans.tr_TR = installer/resources/locale/po/messages_tr.po
trans.zh_CN = installer/resources/locale/po/messages_zh.po
[main] [main]
host = http://www.transifex.net host = http://www.transifex.net

30
apps/desktopgui/locale/messages_ru.po
View File

@@ -2,21 +2,24 @@
# Copyright (C) 2009 The I2P Project # Copyright (C) 2009 The I2P Project
# This file is distributed under the same license as the desktopgui package. # This file is distributed under the same license as the desktopgui package.
# To contribute translations, see http://www.i2p2.de/newdevelopers # To contribute translations, see http://www.i2p2.de/newdevelopers
# foo <foo@bar>, 2009. #
# # Translators:
# ducki2p <ducki2p@gmail.com>, 2011
# foo <foo@bar>, 2009
# Roman Azarenko <x12ozmouse@ya.ru>, 2013
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P desktopgui\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-02-19 17:26+0000\n" "POT-Creation-Date: 2011-03-03 18:29+0000\n"
"PO-Revision-Date: 2011-02-23 10:23+0500\n" "PO-Revision-Date: 2013-07-07 11:44+0000\n"
"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n" "Last-Translator: Roman Azarenko <x12ozmouse@ya.ru>\n"
"Language-Team: duck <duck@mail.i2p>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: src/net/i2p/desktopgui/ExternalTrayManager.java:23 #: src/net/i2p/desktopgui/ExternalTrayManager.java:23
msgid "Start I2P" msgid "Start I2P"
@@ -32,7 +35,7 @@ msgstr "Запускается"
#: src/net/i2p/desktopgui/InternalTrayManager.java:26 #: src/net/i2p/desktopgui/InternalTrayManager.java:26
msgid "Launch I2P Browser" msgid "Launch I2P Browser"
msgstr "Запустить I2P браузер" msgstr "Запустить браузер I2P"
#: src/net/i2p/desktopgui/InternalTrayManager.java:50 #: src/net/i2p/desktopgui/InternalTrayManager.java:50
msgid "Configure desktopgui" msgid "Configure desktopgui"
@@ -48,9 +51,8 @@ msgstr "Остановить I2P"
#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
msgid "Tray icon configuration" msgid "Tray icon configuration"
msgstr "Настройка иконки в трее" msgstr "Конфигурация значка в области уведомлений"
#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47 #: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
msgid "Should tray icon be enabled?" msgid "Should tray icon be enabled?"
msgstr "Отображать ли иконку в трее?" msgstr "Отображать ли значок в области уведомлений?"

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

File diff suppressed because it is too large Load Diff

1090
apps/i2psnark/locale/messages_zh.po
View File

File diff suppressed because it is too large Load Diff

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

@@ -11,14 +11,14 @@
# foo <foo@bar>, 2009 # foo <foo@bar>, 2009
# punkibastardo <punkibastardo@gmail.com>, 2011, 2012 # punkibastardo <punkibastardo@gmail.com>, 2011, 2012
# punkibastardo <punkibastardo@gmail.com>, 2011 # punkibastardo <punkibastardo@gmail.com>, 2011
# trolly <trolly@fastmail.fm>, 2013 # trolly, 2013
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-25 14:49+0000\n" "POT-Creation-Date: 2013-07-11 21:40+0000\n"
"PO-Revision-Date: 2013-04-15 10:42+0000\n" "PO-Revision-Date: 2013-07-10 11:37+0000\n"
"Last-Translator: trolly <trolly@fastmail.fm>\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/"
"es/)\n" "es/)\n"
"Language: es\n" "Language: es\n"
@@ -27,15 +27,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
msgid "This seems to be a bad destination:" msgid "This seems to be a bad destination:"
msgstr "Éste parece ser un destino falso:" msgstr "Éste parece ser un destino falso:"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:571 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:572
msgid "i2paddresshelper cannot help you with a destination like that!" msgid "i2paddresshelper cannot help you with a destination like that!"
msgstr "El ayudante de direcciones no te puede ayudar con un destino así." msgstr "El ayudante de direcciones no te puede ayudar con un destino así."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:638 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:639
#, java-format #, java-format
msgid "" msgid ""
"To visit the destination in your host database, click <a href=\"{0}\">here</" "To visit the destination in your host database, click <a href=\"{0}\">here</"
@@ -46,52 +46,52 @@ msgstr ""
"\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en " "\"{0}\">aquí</a>! Para visitar el destino del ayudante de direcciones en "
"conflicto, ¡pincha <a href=\"{1}\">aquí</a>!" "conflicto, ¡pincha <a href=\"{1}\">aquí</a>!"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1042 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1043
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:410
msgid "Host" msgid "Host"
msgstr "Host" msgstr "Host"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1046 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1047
msgid "Base 32" msgid "Base 32"
msgstr "Base 32" msgstr "Base 32"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1050 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1051
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
msgid "Destination" msgid "Destination"
msgstr "Destino" msgstr "Destino"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1056 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1057
#, java-format #, java-format
msgid "Continue to {0} without saving" msgid "Continue to {0} without saving"
msgstr "Acceder a {0} sin guardar" msgstr "Acceder a {0} sin guardar"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1061 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1062
#, java-format #, java-format
msgid "Save {0} to router address book and continue to eepsite" msgid "Save {0} to router address book and continue to eepsite"
msgstr "" msgstr ""
"Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p." "Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
#. only blockfile supports multiple books #. only blockfile supports multiple books
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1064 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065
#, java-format #, java-format
msgid "Save {0} to master address book and continue to eepsite" msgid "Save {0} to master address book and continue to eepsite"
msgstr "" msgstr ""
"Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p." "Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1065 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1066
#, java-format #, java-format
msgid "Save {0} to private address book and continue to eepsite" msgid "Save {0} to private address book and continue to eepsite"
msgstr "" msgstr ""
"Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p." "Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1179 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1180
msgid "HTTP Outproxy" msgid "HTTP Outproxy"
msgstr "Puerta de salida HTTP" msgstr "Puerta de salida HTTP"
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
msgid "" 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 "" msgstr ""
@@ -99,7 +99,7 @@ msgstr ""
"mediante el uso de un servicio de \"salto\":" "mediante el uso de un servicio de \"salto\":"
#. Translators: parameter is a host name #. Translators: parameter is a host name
#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1220 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1221
#, java-format #, java-format
msgid "{0} jump service" msgid "{0} jump service"
msgstr "servicio saltador {0}" msgstr "servicio saltador {0}"
@@ -153,6 +153,25 @@ msgstr "¡Haz click aquí si no estás siendo enviado automáticamente!"
msgid "internal" msgid "internal"
msgstr "interno" msgstr "interno"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:404
#, java-format
msgid "{0} inbound, {0} outbound tunnel"
msgid_plural "{0} inbound, {0} outbound tunnels"
msgstr[0] "{0} túnel de entrada {0} túnel de salida"
msgstr[1] "{0} túneles de entrada {0} túneles de salida"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
msgid "lower bandwidth and reliability"
msgstr "ancho de banda bajo y seguridad"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
msgid "standard bandwidth and reliability"
msgstr "ancho de banda estándar y seguridad"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
msgid "higher bandwidth and reliability"
msgstr "alto ancho de banda y seguridad"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
msgid "Tunnels are not initialized yet, please reload in two minutes." msgid "Tunnels are not initialized yet, please reload in two minutes."
msgstr "Todavía no se han inicializado los túneles, recargue en dos minutos." msgstr "Todavía no se han inicializado los túneles, recargue en dos minutos."
@@ -478,210 +497,182 @@ msgstr "Variación de saltos"
msgid "Count" msgid "Count"
msgstr "Cantidad" msgstr "Cantidad"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:331 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:328
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338
msgid "1 inbound, 1 outbound tunnel (low bandwidth usage, less reliability)"
msgstr ""
"1 túnel entrante, 1 de salida (bajo uso de ancho de banda, menos fiabilidad)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
msgid ""
"2 inbound, 2 outbound tunnels (standard bandwidth usage, standard "
"reliability)"
msgstr ""
"2 túneles entrantes, 2 de salida (uso de ancho de banda estándar, fiabilidad "
"estándar)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
msgid ""
"3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)"
msgstr ""
"3 túneles entrantes, 3 de salida (mayor uso de ancho de banda, mayor "
"fiabilidad)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370
msgid "tunnels"
msgstr "túneles"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:353
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375
msgid "Backup Count" msgid "Backup Count"
msgstr "Cantidad de respaldo" msgstr "Cantidad de respaldo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:360 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345
msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgid "0 backup tunnels (0 redundancy, no added resource usage)"
msgstr "0 túneles de respaldo (redundancia 0, no aumenta el uso de recursos)" 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:364 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349
msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgid "1 backup tunnel each direction (low redundancy, low resource usage)"
msgstr "" msgstr ""
"1 túnel de respaldo en cada dirección (redundancia baja, uso bajo de " "1 túnel de respaldo en cada dirección (redundancia baja, uso bajo de "
"recursos)" "recursos)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353
msgid "" msgid ""
"2 backup tunnels each direction (medium redundancy, medium resource usage)" "2 backup tunnels each direction (medium redundancy, medium resource usage)"
msgstr "" msgstr ""
"2 túneles de respaldo en cada dirección (redundancia media, uso de recursos " "2 túneles de respaldo en cada dirección (redundancia media, uso de recursos "
"medio)" "medio)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgid "3 backup tunnels each direction (high redundancy, high resource usage)"
msgstr "" msgstr ""
"3 túneles de respaldo en cada dirección (alta redundancia, uso de recursos " "3 túneles de respaldo en cada dirección (alta redundancia, uso de recursos "
"alto)" "alto)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:365
msgid "backup tunnels" msgid "backup tunnels"
msgstr "túneles de respaldo" msgstr "túneles de respaldo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:387 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:362
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372
msgid "Profile" msgid "Profile"
msgstr "Perfil" msgstr "Perfil"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:416 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379
msgid "interactive connection" msgid "interactive connection"
msgstr "conexión interactiva" msgstr "conexión interactiva"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:398 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383
msgid "bulk connection (downloads/websites/BT)" msgid "bulk connection (downloads/websites/BT)"
msgstr "conexión en masa (descargas/web/BT)" msgstr "conexión en masa (descargas/web/BT)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:375
msgid "Delay Connect" msgid "Delay Connect"
msgstr "Retrasar Conexión" msgstr "Retrasar Conexión"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:379
msgid "for request/response connections" msgid "for request/response connections"
msgstr "para las conexiones de solicitud/respuesta" msgstr "para las conexiones de solicitud/respuesta"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:383
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387
msgid "Router I2CP Address" msgid "Router I2CP Address"
msgstr "Dirección I2CP del router" msgstr "Dirección I2CP del router"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:397
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:262
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:284
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:431
msgid "Port" msgid "Port"
msgstr "Puerto" msgstr "Puerto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:403
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:467
msgid "Reduce tunnel quantity when idle" msgid "Reduce tunnel quantity when idle"
msgstr "Reducir la cantidad de túneles cuando está inactivo" msgstr "Reducir la cantidad de túneles cuando está inactivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:444 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:427
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:464 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:469
msgid "Enable" msgid "Enable"
msgstr "Habilitar" msgstr "Habilitar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473
msgid "Reduced tunnel count" msgid "Reduced tunnel count"
msgstr "Número de túneles reducido" msgstr "Número de túneles reducido"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477
msgid "Idle minutes" msgid "Idle minutes"
msgstr "Minutos de inactividad" msgstr "Minutos de inactividad"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:417
msgid "Close tunnels when idle" msgid "Close tunnels when idle"
msgstr "Cerrar los túneles cuando se está inactivo" msgstr "Cerrar los túneles cuando se está inactivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:423
msgid "New Keys on Reopen" msgid "New Keys on Reopen"
msgstr "Nuevas claves al reabrir" msgstr "Nuevas claves al reabrir"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:456 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:460 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:423
msgid "Disable" msgid "Disable"
msgstr "Desactivar" msgstr "Desactivar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:437
msgid "Delay tunnel open until required" msgid "Delay tunnel open until required"
msgstr "Retrasar apertura del túnel hasta que sea necesario" msgstr "Retrasar apertura del túnel hasta que sea necesario"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447
msgid "Persistent private key" msgid "Persistent private key"
msgstr "Clave privada persistente" msgstr "Clave privada persistente"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453
msgid "File" msgid "File"
msgstr "Archivo" msgstr "Archivo"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:457
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236
msgid "Local destination" msgid "Local destination"
msgstr "destino local" msgstr "destino local"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:461
msgid "(if known)" msgid "(if known)"
msgstr "(si se conoce)" msgstr "(si se conoce)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:466
msgid "Local Authorization" msgid "Local Authorization"
msgstr "Autorización local" msgstr "Autorización local"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482
msgid "Username" msgid "Username"
msgstr "Nombre de usuario" msgstr "Nombre de usuario"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486
msgid "Password" msgid "Password"
msgstr "Contraseña" msgstr "Contraseña"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476
msgid "Outproxy Authorization" msgid "Outproxy Authorization"
msgstr "Autorización outproxy" msgstr "Autorización outproxy"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493
msgid "Jump URL List" msgid "Jump URL List"
msgstr "Lista de URL de salto" msgstr "Lista de URL de salto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:550 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513
msgid "Custom options" msgid "Custom options"
msgstr "Opciones personalizadas" msgstr "Opciones personalizadas"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:554 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:517
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:699
msgid "Cancel" msgid "Cancel"
msgstr "Cancelar" msgstr "Cancelar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:521
msgid "Delete" msgid "Delete"
msgstr "Eliminar" msgstr "Eliminar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:560 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:523
msgid "Save" msgid "Save"
msgstr "Guardar" msgstr "Guardar"
@@ -717,116 +708,104 @@ msgstr "Agregar a la libreta de direcciones local"
msgid "Hostname Signature" msgid "Hostname Signature"
msgstr "Firma del Hostname" msgstr "Firma del Hostname"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405
msgid "4 in, 4 out (high traffic server)"
msgstr "4 de entrada, 4 de salida (servidor con mucho tráfico)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:357
msgid "5 in, 5 out (high traffic server)"
msgstr "5 de entrada, 5 de salida (servidor con mucho tráfico)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:361
msgid "6 in, 6 out (high traffic server)"
msgstr "6 de entrada, 6 de salida (servidor con mucho tráfico)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442
msgid "Encrypt Leaseset" msgid "Encrypt Leaseset"
msgstr "Cifrar Leaseset" msgstr "Cifrar Leaseset"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411
msgid "Encryption Key" msgid "Encryption Key"
msgstr "Clave de cifrado" msgstr "Clave de cifrado"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415
msgid "Generate New Key" msgid "Generate New Key"
msgstr "Generar nueva clave" msgstr "Generar nueva clave"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417
msgid "Generate" msgid "Generate"
msgstr "Generar" msgstr "Generar"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:419
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:511
msgid "(Tunnel must be stopped first)" msgid "(Tunnel must be stopped first)"
msgstr "(El túnel debe detenerse primero)" msgstr "(El túnel debe detenerse primero)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421
msgid "Restricted Access List" msgid "Restricted Access List"
msgstr "Lista de acceso restringido" msgstr "Lista de acceso restringido"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427
msgid "Whitelist" msgid "Whitelist"
msgstr "Lista blanca" msgstr "Lista blanca"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431
msgid "Blacklist" msgid "Blacklist"
msgstr "Lista negra" msgstr "Lista negra"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435
msgid "Access List" msgid "Access List"
msgstr "Lista de acceso" msgstr "Lista de acceso"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439
msgid "Inbound connection limits (0=unlimited)" msgid "Inbound connection limits (0=unlimited)"
msgstr "Límites de conexiones entrantes (0 = sin límite)" msgstr "Límites de conexiones entrantes (0 = sin límite)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:441
msgid "Per client" msgid "Per client"
msgstr "Por cliente" msgstr "Por cliente"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443
msgid "Per minute" msgid "Per minute"
msgstr "por minuto" msgstr "por minuto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447
msgid "Per hour" msgid "Per hour"
msgstr "Por hora" msgstr "Por hora"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
msgid "Per day" msgid "Per day"
msgstr "Por día" msgstr "Por día"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455
msgid "Total" msgid "Total"
msgstr "Total" msgstr "Total"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:500 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:463
msgid "Max concurrent connections (0=unlimited)" msgid "Max concurrent connections (0=unlimited)"
msgstr "Número máximo de conexiones simultáneas (0 = sin límite)" msgstr "Número máximo de conexiones simultáneas (0 = sin límite)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481
msgid "New Certificate type" msgid "New Certificate type"
msgstr "Nuevo tipo de certificado" msgstr "Nuevo tipo de certificado"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:483
msgid "None" msgid "None"
msgstr "Ninguno" msgstr "Ninguno"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487
msgid "Hashcash (effort)" msgid "Hashcash (effort)"
msgstr "Hashcash (esfuerzo)" msgstr "Hashcash (esfuerzo)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
msgid "Hashcash Calc Time" msgid "Hashcash Calc Time"
msgstr "Tiempo de Calc Hashcash " msgstr "Tiempo de Calc Hashcash "
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495
msgid "Estimate" msgid "Estimate"
msgstr "Estimación" msgstr "Estimación"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497
msgid "Hidden" msgid "Hidden"
msgstr "Oculto" msgstr "Oculto"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:538 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501
msgid "Signed (signed by)" msgid "Signed (signed by)"
msgstr "Firmado (firmado por)" msgstr "Firmado (firmado por)"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:507
msgid "Modify Certificate" msgid "Modify Certificate"
msgstr "Modificar Certificado" msgstr "Modificar Certificado"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509
msgid "Modify" msgid "Modify"
msgstr "Modificar" msgstr "Modificar"

23
apps/i2ptunnel/locale/messages_ru.po
View File

@@ -4,20 +4,21 @@
# To contribute translations, see http://www.i2p2.de/newdevelopers # To contribute translations, see http://www.i2p2.de/newdevelopers
# #
# Translators: # Translators:
# tengo <akin@rbcmail.ru>, 2013
# sfix <anon-9b36b2e@lycos.com>, 2013 # sfix <anon-9b36b2e@lycos.com>, 2013
# ducki2p <ducki2p@gmail.com>, 2011 # ducki2p <ducki2p@gmail.com>, 2011
# foo <foo@bar>, 2009 # foo <foo@bar>, 2009
# gmind <grvmind@gmail.com>, 2012-2013 # gmind, 2012-2013
# gmind <grvmind@gmail.com>, 2013 # gmind, 2013
# gmind <grvmind@gmail.com>, 2012 # gmind, 2012
# sfix <anon-9b36b2e@lycos.com>, 2013 # sfix <anon-9b36b2e@lycos.com>, 2013
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-05 22:28+0000\n" "POT-Creation-Date: 2013-07-11 21:40+0000\n"
"PO-Revision-Date: 2013-07-05 08:09+0000\n" "PO-Revision-Date: 2013-07-09 18:45+0000\n"
"Last-Translator: Roman Azarenko <x12ozmouse@ya.ru>\n" "Last-Translator: tengo <akin@rbcmail.ru>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/"
"language/ru_RU/)\n" "language/ru_RU/)\n"
"Language: ru_RU\n" "Language: ru_RU\n"
@@ -164,15 +165,15 @@ msgstr[2] ""
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:408
msgid "lower bandwidth and reliability" msgid "lower bandwidth and reliability"
msgstr "" msgstr "меньшая пропускная способность и надёжность"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:410
msgid "standard bandwidth and reliability" msgid "standard bandwidth and reliability"
msgstr "" msgstr "обычная пропускная способность и надёжность"
#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:412
msgid "higher bandwidth and reliability" msgid "higher bandwidth and reliability"
msgstr "" msgstr "более высокая пропускная способность и надёжность"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:119
msgid "Tunnels are not initialized yet, please reload in two minutes." msgid "Tunnels are not initialized yet, please reload in two minutes."
@@ -1075,6 +1076,8 @@ msgid ""
"This enables both TCP and UDP connections to be made through a SOCKS " "This enables both TCP and UDP connections to be made through a SOCKS "
"outproxy within I2P." "outproxy within I2P."
msgstr "" msgstr ""
"Это позволяет устанавливать как TCP так и UDP соединения через SOCKS "
"outproxy в I2P."
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245
msgid "" msgid ""
@@ -1107,6 +1110,8 @@ msgid ""
"is known, though it depends on whether or not the outproxy has been blocked " "is known, though it depends on whether or not the outproxy has been blocked "
"by the IRC network." "by the IRC network."
msgstr "" msgstr ""
"IRC-сети вне I2P также могут быть доступны, если известен SOCKS outproxy в "
"I2P, но это зависит от того, заблокирован или нет outproxy IRC-сетью."
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253
msgid "A client tunnel that implements the HTTP CONNECT command." msgid "A client tunnel that implements the HTTP CONNECT command."

454
apps/i2ptunnel/locale/messages_zh.po
View File

File diff suppressed because it is too large Load Diff

14
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java
View File

@@ -93,6 +93,20 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
} }
} }
protected static double getDouble(Properties opts, String name, double defaultVal) {
if (opts == null) return defaultVal;
String val = opts.getProperty(name);
if (val == null) {
return defaultVal;
} else {
try {
return Double.parseDouble(val);
} catch (NumberFormatException nfe) {
return defaultVal;
}
}
}
/** /**
* How long we will wait for the ACK from a SYN, in milliseconds. * How long we will wait for the ACK from a SYN, in milliseconds.
* *

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

File diff suppressed because it is too large Load Diff

617
apps/routerconsole/locale/messages_ru.po
View File

File diff suppressed because it is too large Load Diff

3211
apps/routerconsole/locale/messages_zh.po
View File

File diff suppressed because it is too large Load Diff

119
apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
View File

@@ -27,7 +27,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
private int _profile; private int _profile;
private int _rtt; private int _rtt;
private int _rttDev; private int _rttDev;
private int _rto; private int _rto = INITIAL_RTO;
private int _resendDelay; private int _resendDelay;
private int _sendAckDelay; private int _sendAckDelay;
private int _maxMessageSize; private int _maxMessageSize;
@@ -51,7 +51,17 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
private int _maxTotalConnsPerDay; private int _maxTotalConnsPerDay;
private int _maxConns; private int _maxConns;
private boolean _disableRejectLog; private boolean _disableRejectLog;
/** state of a connection */
private enum AckInit {
INIT, // just created
FIRST, // first received ack
STEADY
}
/** LOCKING: this */
private AckInit _initState = AckInit.INIT;
// NOTE - almost all the options are below, but see // NOTE - almost all the options are below, but see
// I2PSocketOptions in ministreaming for a few more // I2PSocketOptions in ministreaming for a few more
@@ -65,11 +75,21 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
/** on inactivity timeout, send a payload message */ /** on inactivity timeout, send a payload message */
public static final int INACTIVITY_ACTION_SEND = 2; public static final int INACTIVITY_ACTION_SEND = 2;
/*
* These values are specified in RFC 6298
* Do not change unless you know what you're doing
*/
private static final double TCP_ALPHA = 1.0/8;
private static final double TCP_BETA = 1.0/4;
private static final double TCP_KAPPA = 4;
private static final String PROP_INITIAL_RTO = "i2p.streaming.initialRTO";
private static final int INITIAL_RTO = 12000;
public static final String PROP_CONNECT_DELAY = "i2p.streaming.connectDelay"; public static final String PROP_CONNECT_DELAY = "i2p.streaming.connectDelay";
public static final String PROP_PROFILE = "i2p.streaming.profile"; public static final String PROP_PROFILE = "i2p.streaming.profile";
public static final String PROP_MAX_MESSAGE_SIZE = "i2p.streaming.maxMessageSize"; public static final String PROP_MAX_MESSAGE_SIZE = "i2p.streaming.maxMessageSize";
public static final String PROP_MAX_RESENDS = "i2p.streaming.maxResends"; public static final String PROP_MAX_RESENDS = "i2p.streaming.maxResends";
public static final String PROP_INITIAL_RTT = "i2p.streaming.initialRTT";
public static final String PROP_INITIAL_RESEND_DELAY = "i2p.streaming.initialResendDelay"; public static final String PROP_INITIAL_RESEND_DELAY = "i2p.streaming.initialResendDelay";
public static final String PROP_INITIAL_ACK_DELAY = "i2p.streaming.initialAckDelay"; public static final String PROP_INITIAL_ACK_DELAY = "i2p.streaming.initialAckDelay";
public static final String PROP_INITIAL_WINDOW_SIZE = "i2p.streaming.initialWindowSize"; public static final String PROP_INITIAL_WINDOW_SIZE = "i2p.streaming.initialWindowSize";
@@ -295,6 +315,7 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
setMaxWindowSize(opts.getMaxWindowSize()); setMaxWindowSize(opts.getMaxWindowSize());
setConnectDelay(opts.getConnectDelay()); setConnectDelay(opts.getConnectDelay());
setProfile(opts.getProfile()); setProfile(opts.getProfile());
setRTTDev(opts.getRTTDev());
setRTT(opts.getRTT()); setRTT(opts.getRTT());
setRequireFullySigned(opts.getRequireFullySigned()); setRequireFullySigned(opts.getRequireFullySigned());
setWindowSize(opts.getWindowSize()); setWindowSize(opts.getWindowSize());
@@ -332,7 +353,6 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1)); setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK)); setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, DEFAULT_MAX_MESSAGE_SIZE)); setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, DEFAULT_MAX_MESSAGE_SIZE));
setRTT(getInt(opts, PROP_INITIAL_RTT, DEFAULT_INITIAL_RTT));
setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1)); setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000)); setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000));
setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, DEFAULT_INITIAL_ACK_DELAY)); setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, DEFAULT_INITIAL_ACK_DELAY));
@@ -360,6 +380,8 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
_maxTotalConnsPerHour = getInt(opts, PROP_MAX_TOTAL_CONNS_HOUR, 0); _maxTotalConnsPerHour = getInt(opts, PROP_MAX_TOTAL_CONNS_HOUR, 0);
_maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0); _maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0);
_maxConns = getInt(opts, PROP_MAX_STREAMS, 0); _maxConns = getInt(opts, PROP_MAX_STREAMS, 0);
_rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO);
} }
/** /**
@@ -377,8 +399,6 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK)); setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
if (opts.containsKey(PROP_MAX_MESSAGE_SIZE)) if (opts.containsKey(PROP_MAX_MESSAGE_SIZE))
setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, Packet.MAX_PAYLOAD_SIZE)); setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, Packet.MAX_PAYLOAD_SIZE));
if (opts.containsKey(PROP_INITIAL_RTT))
setRTT(getInt(opts, PROP_INITIAL_RTT, DEFAULT_INITIAL_RTT));
if (opts.containsKey(PROP_INITIAL_RECEIVE_WINDOW)) if (opts.containsKey(PROP_INITIAL_RECEIVE_WINDOW))
setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1)); setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
if (opts.containsKey(PROP_INITIAL_RESEND_DELAY)) if (opts.containsKey(PROP_INITIAL_RESEND_DELAY))
@@ -427,6 +447,8 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
_maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0); _maxTotalConnsPerDay = getInt(opts, PROP_MAX_TOTAL_CONNS_DAY, 0);
if (opts.containsKey(PROP_MAX_STREAMS)) if (opts.containsKey(PROP_MAX_STREAMS))
_maxConns = getInt(opts, PROP_MAX_STREAMS, 0); _maxConns = getInt(opts, PROP_MAX_STREAMS, 0);
_rto = getInt(opts, PROP_INITIAL_RTO, INITIAL_RTO);
} }
/** /**
@@ -515,12 +537,8 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
* What to set the round trip time estimate to (in milliseconds) * What to set the round trip time estimate to (in milliseconds)
* @return round trip time estimate in ms * @return round trip time estimate in ms
*/ */
public int getRTT() { return _rtt; } public synchronized int getRTT() { return _rtt; }
public void setRTT(int ms) { public void setRTT(int ms) {
if (_rto == 0) {
_rttDev = ms / 2;
_rto = ms + ms / 2;
}
synchronized (_trend) { synchronized (_trend) {
_trend[0] = _trend[1]; _trend[0] = _trend[1];
_trend[1] = _trend[2]; _trend[1] = _trend[2];
@@ -532,15 +550,50 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
_trend[2] = 0; _trend[2] = 0;
} }
_rtt = ms; synchronized(this) {
if (_rtt > 60*1000) _rtt = ms;
_rtt = 60*1000; if (_rtt > 60*1000)
_rtt = 60*1000;
}
} }
public int getRTO() { return _rto; } public synchronized int getRTO() { return _rto; }
/** for debugging @since 0.7.13 */ /** used in TCB @since 0.9.8 */
int getRTTDev() { return _rttDev; } synchronized int getRTTDev() { return _rttDev; }
private synchronized void setRTTDev(int rttDev) { _rttDev = rttDev; }
/**
* Loads options from TCB cache.
*/
synchronized void loadFromCache(int rtt, int rttDev, int wdw) {
_initState = AckInit.STEADY;
setRTT(rtt);
setRTTDev(rttDev);
setWindowSize(wdw);
computeRTO();
}
/**
* computes RTO based on formula in RFC
*/
private synchronized void computeRTO() {
switch(_initState) {
case INIT :
throw new IllegalStateException();
case FIRST :
_rto = _rtt + _rtt / 2;
break;
case STEADY :
_rto = _rtt + (int) (_rttDev * TCP_KAPPA);
break;
}
if (_rto < Connection.MIN_RESEND_DELAY)
_rto = (int)Connection.MIN_RESEND_DELAY;
else if (_rto > Connection.MAX_RESEND_DELAY)
_rto = (int)Connection.MAX_RESEND_DELAY;
}
/** /**
* If we have 3 consecutive rtt increases, we are trending upwards (1), or if we have * If we have 3 consecutive rtt increases, we are trending upwards (1), or if we have
@@ -558,22 +611,22 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
} }
} }
/** rtt = rtt*RTT_DAMPENING + (1-RTT_DAMPENING)*currentPacketRTT */ public synchronized void updateRTT(int measuredValue) {
/** This is the value specified in RFC 2988, let's try it */ switch(_initState) {
private static final double RTT_DAMPENING = 0.875; case INIT:
_initState = AckInit.FIRST;
public void updateRTT(int measuredValue) { setRTT(measuredValue); // no smoothing first sample
// the rttDev calculation matches that recommended in RFC 2988 (beta = 1/4) _rttDev = _rtt / 2;
_rttDev = _rttDev + (int)(0.25d*(Math.abs(measuredValue-_rtt)-_rttDev)); break;
int smoothed = (int)(RTT_DAMPENING*_rtt + (1-RTT_DAMPENING)*measuredValue); case FIRST:
// K = 4 _initState = AckInit.STEADY; // fall through
_rto = smoothed + (_rttDev<<2); case STEADY:
if (_rto < Connection.MIN_RESEND_DELAY) // calculation matches that recommended in RFC 6298
_rto = (int)Connection.MIN_RESEND_DELAY; _rttDev = (int) ((1-TCP_BETA) *_rttDev + TCP_BETA * Math.abs(measuredValue-_rtt));
else if (_rto > Connection.MAX_RESEND_DELAY) int smoothed = (int)((1-TCP_ALPHA)*_rtt + TCP_ALPHA*measuredValue);
_rto = (int)Connection.MAX_RESEND_DELAY; setRTT(smoothed);
}
setRTT(smoothed); computeRTO();
} }
/** How long after sending a packet will we wait before resending? /** How long after sending a packet will we wait before resending?

66
apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
View File

@@ -2,6 +2,7 @@ package net.i2p.client.streaming;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
@@ -9,6 +10,8 @@ import net.i2p.data.Destination;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.SimpleTimer2; import net.i2p.util.SimpleTimer2;
import static net.i2p.client.streaming.I2PSocketOptionsImpl.getDouble;
/** /**
* Share important TCP Control Block parameters across Connections * Share important TCP Control Block parameters across Connections
* to the same remote peer. * to the same remote peer.
@@ -25,20 +28,43 @@ class TCBShare {
private final Log _log; private final Log _log;
private final Map<Destination, Entry> _cache; private final Map<Destination, Entry> _cache;
private final CleanEvent _cleaner; private final CleanEvent _cleaner;
private final double _rttDampening, _wdwDampening, _rttDevDampening;
private static final long EXPIRE_TIME = 30*60*1000; private static final long EXPIRE_TIME = 30*60*1000;
private static final long CLEAN_TIME = 10*60*1000; private static final long CLEAN_TIME = 10*60*1000;
///// constants defined in rfc 2140
///// do not change unless you know what you're doing
private static final double RTT_DAMPENING = 0.75; private static final double RTT_DAMPENING = 0.75;
private static final double RTTDEV_DAMPENING = 0.75;
private static final double WDW_DAMPENING = 0.75; private static final double WDW_DAMPENING = 0.75;
private static final String RTT_DAMP_PROP="i2p.streaming.tcbcache.rttDampening";
private static final String WDW_DAMP_PROP="i2p.streaming.tcbcache.wdwDampening";
private static final String RTTDEV_DAMP_PROP="i2p.streaming.tcbcache.rttdevDampening";
/////
private static final int MAX_RTT = ((int) Connection.MAX_RESEND_DELAY) / 2; private static final int MAX_RTT = ((int) Connection.MAX_RESEND_DELAY) / 2;
private static final int MAX_RTT_DEV = (int) (MAX_RTT * 1.5);
private static final int MAX_WINDOW_SIZE = ConnectionPacketHandler.MAX_SLOW_START_WINDOW; private static final int MAX_WINDOW_SIZE = ConnectionPacketHandler.MAX_SLOW_START_WINDOW;
public TCBShare(I2PAppContext ctx, SimpleTimer2 timer) { public TCBShare(I2PAppContext ctx, SimpleTimer2 timer) {
_context = ctx; _context = ctx;
_log = ctx.logManager().getLog(TCBShare.class); _log = ctx.logManager().getLog(TCBShare.class);
final Properties props = ctx.getProperties();
_rttDampening = getDouble(props, RTT_DAMP_PROP, RTT_DAMPENING);
_wdwDampening = getDouble(props, WDW_DAMP_PROP, WDW_DAMPENING);
_rttDevDampening = getDouble(props, RTTDEV_DAMP_PROP, RTTDEV_DAMPENING);
_cache = new ConcurrentHashMap<Destination,Entry>(4); _cache = new ConcurrentHashMap<Destination,Entry>(4);
_cleaner = new CleanEvent(timer); _cleaner = new CleanEvent(timer);
_cleaner.schedule(CLEAN_TIME); _cleaner.schedule(CLEAN_TIME);
if (_log.shouldLog(Log.DEBUG)) {
String log = "Creating TCBCache with rttDamp=%s, rttDevDamp=%s, wdwDamp=%s, "+
"expire=%d, clean=%d";
log = String.format(log,_rttDampening,_rttDevDampening,_wdwDampening,
EXPIRE_TIME,CLEAN_TIME);
_log.debug(log);
}
} }
/** /**
@@ -60,14 +86,22 @@ class TCBShare {
Entry e = _cache.get(dest); Entry e = _cache.get(dest);
if (e == null || e.isExpired()) if (e == null || e.isExpired())
return; return;
if (_log.shouldLog(Log.DEBUG)) final int rtt, rttDev, wdw;
synchronized(e) {
rtt = e.getRTT();
rttDev = e.getRTTDev();
wdw = e.getWindowSize();
}
if (_log.shouldLog(Log.DEBUG)) {
_log.debug("From cache: " + _log.debug("From cache: " +
con.getSession().getMyDestination().calculateHash().toBase64().substring(0, 4) + con.getSession().getMyDestination().calculateHash().toBase64().substring(0, 4) +
'-' + '-' +
dest.calculateHash().toBase64().substring(0, 4) + dest.calculateHash().toBase64().substring(0, 4) +
" RTT: " + e.getRTT() + " wdw: " + e.getWindowSize()); " RTT: " + rtt +
opts.setRTT(e.getRTT()); " RTTDev: "+ rttDev +
opts.setWindowSize(e.getWindowSize()); " wdw: " + wdw );
}
opts.loadFromCache(rtt,rttDev,wdw);
} }
/** store to cache */ /** store to cache */
@@ -82,47 +116,61 @@ class TCBShare {
return; return;
int old = -1; int old = -1;
int oldw = -1; int oldw = -1;
int oldDev = -1;
Entry e = _cache.get(dest); Entry e = _cache.get(dest);
if (e == null || e.isExpired()) { if (e == null || e.isExpired()) {
e = new Entry(opts.getRTT(), opts.getWindowSize()); e = new Entry(opts.getRTT(), opts.getWindowSize(), opts.getRTTDev());
_cache.put(dest, e); _cache.put(dest, e);
} else { } else {
synchronized(e) { synchronized(e) {
old = e.getRTT(); old = e.getRTT();
oldw = e.getWindowSize(); oldw = e.getWindowSize();
oldDev = e.getRTTDev();
e.setRTT(opts.getRTT()); e.setRTT(opts.getRTT());
e.setWindowSize(opts.getWindowSize()); e.setWindowSize(opts.getWindowSize());
e.setRTTDev(opts.getRTTDev());
} }
} }
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG)) {
_log.debug("To cache: " + _log.debug("To cache: " +
con.getSession().getMyDestination().calculateHash().toBase64().substring(0, 4) + con.getSession().getMyDestination().calculateHash().toBase64().substring(0, 4) +
'-' + '-' +
dest.calculateHash().toBase64().substring(0, 4) + dest.calculateHash().toBase64().substring(0, 4) +
" old: " + old + " con: " + opts.getRTT() + " new: " + e.getRTT() + " old: " + old + " con: " + opts.getRTT() + " new: " + e.getRTT() +
" oldDev: " + oldDev + " conDev: " + opts.getRTTDev() + " newDev: " + e.getRTTDev() +
" oldw: " + oldw + " conw: " + opts.getWindowSize() + " neww: " + e.getWindowSize()); " oldw: " + oldw + " conw: " + opts.getWindowSize() + " neww: " + e.getWindowSize());
}
} }
private class Entry { private class Entry {
int _rtt; int _rtt;
int _wdw; int _wdw;
int _rttDev;
long _updated; long _updated;
public Entry(int ms, int wdw) { public Entry(int ms, int wdw, int rttDev) {
_rtt = ms; _rtt = ms;
_wdw = wdw; _wdw = wdw;
_rttDev = rttDev;
_updated = _context.clock().now(); _updated = _context.clock().now();
} }
public synchronized int getRTT() { return _rtt; } public synchronized int getRTT() { return _rtt; }
public synchronized void setRTT(int ms) { public synchronized void setRTT(int ms) {
_rtt = (int)(RTT_DAMPENING*_rtt + (1-RTT_DAMPENING)*ms); _rtt = (int)(_rttDampening*_rtt + (1-_rttDampening)*ms);
if (_rtt > MAX_RTT) if (_rtt > MAX_RTT)
_rtt = MAX_RTT; _rtt = MAX_RTT;
_updated = _context.clock().now(); _updated = _context.clock().now();
} }
public synchronized int getRTTDev() { return _rttDev; }
public synchronized void setRTTDev(int count) {
_rttDev = (int)(_rttDevDampening*_rttDev + (1-_rttDevDampening)*count);
if (_rttDev > MAX_RTT_DEV)
_rttDev = MAX_RTT_DEV;
_updated = _context.clock().now();
}
public synchronized int getWindowSize() { return _wdw; } public synchronized int getWindowSize() { return _wdw; }
public synchronized void setWindowSize(int wdw) { public synchronized void setWindowSize(int wdw) {
_wdw = (int)(0.5 + WDW_DAMPENING*_wdw + (1-WDW_DAMPENING)*wdw); _wdw = (int)(0.5 + _wdwDampening*_wdw + (1-_wdwDampening)*wdw);
if (_wdw > MAX_WINDOW_SIZE) if (_wdw > MAX_WINDOW_SIZE)
_wdw = MAX_WINDOW_SIZE; _wdw = MAX_WINDOW_SIZE;
_updated = _context.clock().now(); _updated = _context.clock().now();

28
apps/susidns/locale/messages_es.po
View File

@@ -16,7 +16,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-04-25 14:49+0000\n" "POT-Creation-Date: 2013-07-11 21:40+0000\n"
"PO-Revision-Date: 2013-01-20 09:38+0000\n" "PO-Revision-Date: 2013-01-20 09:38+0000\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/"
@@ -227,9 +227,9 @@ msgid "ERROR: Could not write addressbook file."
msgstr "ERROR: No se pudo escribir el archivo de la libreta direcciones." msgstr "ERROR: No se pudo escribir el archivo de la libreta direcciones."
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:340 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:340
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:149 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:140
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:142
msgid "" msgid ""
"Invalid form submission, probably because you used the \"back\" or \"reload" "Invalid form submission, probably because you used the \"back\" or \"reload"
"\" button on your browser. Please resubmit." "\" button on your browser. Please resubmit."
@@ -239,9 +239,9 @@ msgstr ""
"¡vuelve a enviarlo!" "¡vuelve a enviarlo!"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:342 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:342
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:151 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:142
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:130 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144
msgid "" msgid ""
"If the problem persists, verify that you have cookies enabled in your " "If the problem persists, verify that you have cookies enabled in your "
"browser." "browser."
@@ -249,25 +249,25 @@ msgstr ""
"Si el problema persiste, verique que tiene activas las cookies en su " "Si el problema persiste, verique que tiene activas las cookies en su "
"navegador." "navegador."
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:140 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:131
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:103 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:117
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145
msgid "Save" msgid "Save"
msgstr "Guardar" msgstr "Guardar"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:142 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:133
msgid "Configuration saved." msgid "Configuration saved."
msgstr "Configuración guardada." msgstr "Configuración guardada."
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:143 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:134
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:122 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:136
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143
msgid "Reload" msgid "Reload"
msgstr "Recargar" msgstr "Recargar"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:145 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:136
msgid "Configuration reloaded." msgid "Configuration reloaded."
msgstr "Configuración recargada." msgstr "Configuración recargada."
@@ -292,18 +292,18 @@ msgid "Failed to delete Destination for {0} from naming service {1}"
msgstr "" msgstr ""
"Error al borrar la dirección de destino {0} del servicio de nombrado {1}" "Error al borrar la dirección de destino {0} del servicio de nombrado {1}"
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:115 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:129
msgid "" msgid ""
"Subscriptions saved, updating addressbook from subscription sources now." "Subscriptions saved, updating addressbook from subscription sources now."
msgstr "" msgstr ""
"Suscripciones guardadas, actualizando la libreta de direcciones a partir de " "Suscripciones guardadas, actualizando la libreta de direcciones a partir de "
"las fuentes de suscripción ahora." "las fuentes de suscripción ahora."
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:120 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:134
msgid "Subscriptions saved." msgid "Subscriptions saved."
msgstr "Suscripciones guardadas." msgstr "Suscripciones guardadas."
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:124 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138
msgid "Subscriptions reloaded." msgid "Subscriptions reloaded."
msgstr "Suscripciones recargadas." msgstr "Suscripciones recargadas."

118
apps/susidns/locale/messages_zh.po
View File

@@ -3,22 +3,25 @@
# This file is distributed under the same license as the susidns package. # This file is distributed under the same license as the susidns package.
# To contribute translations, see http://www.i2p2.de/newdevelopers # To contribute translations, see http://www.i2p2.de/newdevelopers
# #
# ducki2p <ducki2p@gmail.com>, 2011. # Translators:
# <walking@i2pmail.org>, 2011. # ducki2p <ducki2p@gmail.com>, 2011
# walking <walking@i2pmail.org>, 2011
# walking <waling@mail.i2p>, 2013
# walking <walking@i2pmail.org>, 2011
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-28 22:43+0000\n" "POT-Creation-Date: 2013-07-11 21:39+0000\n"
"PO-Revision-Date: 2011-08-20 05:50+0000\n" "PO-Revision-Date: 2013-07-11 06:19+0000\n"
"Last-Translator: walking <walking@i2pmail.org>\n" "Last-Translator: xtoaster <zhazhenzhong@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/I2P/team/" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/"
"zh_CN/)\n" "language/zh_CN/)\n"
"Language: zh_CN\n" "Language: zh_CN\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n" "Plural-Forms: nplurals=1; plural=0;\n"
#: ../src/java/src/i2p/susi/dns/AddressBean.java:130 #: ../src/java/src/i2p/susi/dns/AddressBean.java:130
#, java-format #, java-format
@@ -102,7 +105,7 @@ msgstr "显示 {0} 个项目共 {1}"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:258 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:258
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:412 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410
msgid "Add" msgid "Add"
msgstr "添加" msgstr "添加"
@@ -110,7 +113,7 @@ msgstr "添加"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408
msgid "Replace" msgid "Replace"
msgstr "替换" msgstr "替换"
@@ -167,13 +170,13 @@ msgstr "请输入主机名称与目标"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:274 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:267
msgid "Delete Entry" msgid "Delete Entry"
msgstr "删除记录" msgstr "删除记录"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:351 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349
msgid "Delete Selected" msgid "Delete Selected"
msgstr "删除选中项" msgstr "删除选中项"
@@ -207,9 +210,9 @@ msgid "ERROR: Could not write addressbook file."
msgstr "错误:无法写入地址簿文件" msgstr "错误:无法写入地址簿文件"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:340 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:340
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:149 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:140
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:142
msgid "" msgid ""
"Invalid form submission, probably because you used the \"back\" or \"reload" "Invalid form submission, probably because you used the \"back\" or \"reload"
"\" button on your browser. Please resubmit." "\" button on your browser. Please resubmit."
@@ -218,33 +221,33 @@ msgstr ""
"请重新提交。" "请重新提交。"
#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:342 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:342
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:151 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:142
#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:130 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144
msgid "" msgid ""
"If the problem persists, verify that you have cookies enabled in your " "If the problem persists, verify that you have cookies enabled in your "
"browser." "browser."
msgstr "" msgstr "如果问题持续出现，请检查您的浏览器是否已启用cookie。"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:140 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:131
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:103 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:117
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145
msgid "Save" msgid "Save"
msgstr "保存" msgstr "保存"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:142 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:133
msgid "Configuration saved." msgid "Configuration saved."
msgstr "配置已保存" msgstr "配置已保存"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:143 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:134
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:122 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:136
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151
#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143
msgid "Reload" msgid "Reload"
msgstr "刷新" msgstr "刷新"
#: ../src/java/src/i2p/susi/dns/ConfigBean.java:145 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:136
msgid "Configuration reloaded." msgid "Configuration reloaded."
msgstr "配置已重新载入" msgstr "配置已重新载入"
@@ -267,16 +270,16 @@ msgstr "域名服务{1}中的目标{0}添加失败。"
msgid "Failed to delete Destination for {0} from naming service {1}" msgid "Failed to delete Destination for {0} from naming service {1}"
msgstr "域名服务{1}中的目标{0}删除失败。" msgstr "域名服务{1}中的目标{0}删除失败。"
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:115 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:129
msgid "" msgid ""
"Subscriptions saved, updating addressbook from subscription sources now." "Subscriptions saved, updating addressbook from subscription sources now."
msgstr "订阅已保存，正在通过订阅地址更新地址簿。" msgstr "订阅已保存，正在通过订阅地址更新地址簿。"
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:120 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:134
msgid "Subscriptions saved." msgid "Subscriptions saved."
msgstr "订阅已保存。" msgstr "订阅已保存。"
#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:124 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138
msgid "Subscriptions reloaded." msgid "Subscriptions reloaded."
msgstr "订阅设置已重新载入。" msgstr "订阅设置已重新载入。"
@@ -396,8 +399,8 @@ msgid "Links"
msgstr "链接" msgstr "链接"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:250 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:250
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:404 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:402
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:266 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:259
msgid "Destination" msgid "Destination"
msgstr "目标" msgstr "目标"
@@ -405,32 +408,32 @@ msgstr "目标"
msgid "Mark for deletion" msgid "Mark for deletion"
msgstr "标记为删除" msgstr "标记为删除"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:307 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:305
msgid "Base 32 address" msgid "Base 32 address"
msgstr "Base32 地址" msgstr "Base32 地址"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:311 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:309
msgid "More information on this entry" msgid "More information on this entry"
msgstr "此记录的更多信息" msgstr "此记录的更多信息"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:314 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:312
msgid "details" msgid "details"
msgstr "详情" msgstr "详情"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:347
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:406
msgid "Cancel" msgid "Cancel"
msgstr "取消" msgstr "取消"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:383 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:381
msgid "This address book is empty." msgid "This address book is empty."
msgstr "此地址簿为空。" msgstr "此地址簿为空。"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:398 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396
msgid "Add new destination" msgid "Add new destination"
msgstr "添加新目标" msgstr "添加新目标"
#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:400 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:398
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:165 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:165
msgid "Host Name" msgid "Host Name"
msgstr "主机名称" msgstr "主机名称"
@@ -539,65 +542,65 @@ msgstr "活动日志文件(关闭可设为/dev/null [Linux])"
#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191
msgid "Name of the theme to use (defaults to 'light')" msgid "Name of the theme to use (defaults to 'light')"
msgstr "" msgstr "使用主题的名称(默认为\"light\")"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:110 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:110
msgid "addressbook" msgid "addressbook"
msgstr "地址簿" msgstr "地址簿"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:181 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:179
msgid "Encoded Name" msgid "Encoded Name"
msgstr "编码后名称" msgstr "编码后名称"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:197 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:193
msgid "Base 32 Address" msgid "Base 32 Address"
msgstr "b32(Base32)地址" msgstr "b32(Base32)地址"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:207 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:201
msgid "Base 64 Hash" msgid "Base 64 Hash"
msgstr "" msgstr "Base64 散列值"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:207
msgid "Address Helper" msgid "Address Helper"
msgstr "地址助手" msgstr "地址助手"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:220 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213
msgid "link" msgid "link"
msgstr "链接" msgstr "链接"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:224 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:217
msgid "Public Key" msgid "Public Key"
msgstr "公钥" msgstr "公钥"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:226 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:219
msgid "ElGamal 2048 bit" msgid "ElGamal 2048 bit"
msgstr "ElGamal 2048位" msgstr "ElGamal 2048位"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:230 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:223
msgid "Signing Key" msgid "Signing Key"
msgstr "签名钥匙" msgstr "签名钥匙"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:232 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:225
msgid "DSA 1024 bit" msgid "DSA 1024 bit"
msgstr "DSA 1024位" msgstr "DSA 1024位"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:236 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229
msgid "Certificate" msgid "Certificate"
msgstr "证书" msgstr "证书"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:242 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:235
msgid "Added Date" msgid "Added Date"
msgstr "加入日期" msgstr "加入日期"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:248 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:241
msgid "Source" msgid "Source"
msgstr "来源" msgstr "来源"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:254 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:247
msgid "Last Modified" msgid "Last Modified"
msgstr "上次修改" msgstr "上次修改"
#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:260 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:253
msgid "Notes" msgid "Notes"
msgstr "注释" msgstr "注释"
@@ -627,21 +630,20 @@ msgid ""
msgstr "默认安装中，地址簿程序只订阅了 www.i2p2.i2p 的地址簿。" msgstr "默认安装中，地址簿程序只订阅了 www.i2p2.i2p 的地址簿。"
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138
#, fuzzy
msgid "" msgid ""
"Subscribing to additional sites is easy, just add them to your <a href=" "Subscribing to additional sites is easy, just add them to your <a href="
"\"subscriptions\">subscriptions</a> file." "\"subscriptions\">subscriptions</a> file."
msgstr "" msgstr ""
"订阅其他网站的地址簿也很简单，只需将它们加入 <a href=\"subscriptions.jsp\">订" "要订阅其他站点很容易，只需将他们加入您的<a href=\"subscriptions\">订阅</a> 文"
"阅</a> 文件即可。" "件。"
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140
msgid "" msgid ""
"For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/" "For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/"
"naming.html\">the overview on www.i2p2.i2p</a>." "naming.html\" target=\"_top\">the overview on www.i2p2.i2p</a>."
msgstr "" msgstr ""
"关于I2P域名解析的详情，参见 <a href=\"http://www.i2p2.i2p/naming.html\">www." "I2P 中域名转换的更多信息，参见 <a href=\"http://www.i2p2.i2p/naming.html\" "
"i2p2.i2p 上的概述</a>." "target=\"_top\"> www.i2p2.i2p 上的概述部分</a>。"
#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142
msgid "How does the addressbook application work?" msgid "How does the addressbook application work?"

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

@@ -14,7 +14,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-06 02:32+0000\n" "POT-Creation-Date: 2013-07-11 21:40+0000\n"
"PO-Revision-Date: 2011-12-18 10:48+0000\n" "PO-Revision-Date: 2011-12-18 10:48+0000\n"
"Last-Translator: punkibastardo <punkibastardo@gmail.com>\n" "Last-Translator: punkibastardo <punkibastardo@gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/I2P/"
@@ -25,432 +25,432 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: src/src/i2p/susi/webmail/WebMail.java:445 #: src/src/i2p/susi/webmail/WebMail.java:447
msgid "unknown" msgid "unknown"
msgstr "desconocido" msgstr "desconocido"
#: src/src/i2p/susi/webmail/WebMail.java:464 #: src/src/i2p/susi/webmail/WebMail.java:466
msgid "Warning: no transfer encoding found, fallback to 7bit." msgid "Warning: no transfer encoding found, fallback to 7bit."
msgstr "" msgstr ""
"Aviso: No se encuentra codificación de transferencia, volviendo a 7 bits." "Aviso: No se encuentra codificación de transferencia, volviendo a 7 bits."
#: src/src/i2p/susi/webmail/WebMail.java:469 #: src/src/i2p/susi/webmail/WebMail.java:471
#, java-format #, java-format
msgid "No encoder found for encoding \\''{0}\\''." msgid "No encoder found for encoding \\''{0}\\''."
msgstr "No se ha encontrado codificador para la codificación \\''{0}''\\." msgstr "No se ha encontrado codificador para la codificación \\''{0}''\\."
#: src/src/i2p/susi/webmail/WebMail.java:475 #: src/src/i2p/susi/webmail/WebMail.java:477
msgid "Warning: no charset found, fallback to US-ASCII." msgid "Warning: no charset found, fallback to US-ASCII."
msgstr "" msgstr ""
"Aviso: no se ha encontrado el juego de caracteres, volviendo a US-ASCII." "Aviso: no se ha encontrado el juego de caracteres, volviendo a US-ASCII."
#: src/src/i2p/susi/webmail/WebMail.java:489 #: src/src/i2p/susi/webmail/WebMail.java:491
#, java-format #, java-format
msgid "Charset \\''{0}\\'' not supported." msgid "Charset \\''{0}\\'' not supported."
msgstr "juego de caracteres \\''{0}\\''no soportado." msgstr "juego de caracteres \\''{0}\\''no soportado."
#: src/src/i2p/susi/webmail/WebMail.java:493 #: src/src/i2p/susi/webmail/WebMail.java:495
#, java-format #, java-format
msgid "Part ({0}) not shown, because of {1}" msgid "Part ({0}) not shown, because of {1}"
msgstr "La parte ({0}) no se muestra, debido a {1}" msgstr "La parte ({0}) no se muestra, debido a {1}"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "Download" msgid "Download"
msgstr "Descarga" msgstr "Descarga"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "File is packed into a zipfile for security reasons." msgid "File is packed into a zipfile for security reasons."
msgstr "" msgstr ""
"El archivo está empaquetado en un archivo zip por razones de seguridad." "El archivo está empaquetado en un archivo zip por razones de seguridad."
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
#, java-format #, java-format
msgid "attachment ({0})." msgid "attachment ({0})."
msgstr "adjunto ({0})." msgstr "adjunto ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:520 #: src/src/i2p/susi/webmail/WebMail.java:522
#, java-format #, java-format
msgid "Attachment ({0})." msgid "Attachment ({0})."
msgstr "Adjunto ({0})." msgstr "Adjunto ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:570 #: src/src/i2p/susi/webmail/WebMail.java:572
msgid "Need username for authentication." msgid "Need username for authentication."
msgstr "Es necesario un nombre de usuario para la autenticación." msgstr "Es necesario un nombre de usuario para la autenticación."
#: src/src/i2p/susi/webmail/WebMail.java:574 #: src/src/i2p/susi/webmail/WebMail.java:576
msgid "Need password for authentication." msgid "Need password for authentication."
msgstr "Es necesaria una contraseña para la autenticación." msgstr "Es necesaria una contraseña para la autenticación."
#: src/src/i2p/susi/webmail/WebMail.java:578 #: src/src/i2p/susi/webmail/WebMail.java:580
msgid "Need hostname for connect." msgid "Need hostname for connect."
msgstr "Es necesario un nombre de host para la conexión." msgstr "Es necesario un nombre de host para la conexión."
#: src/src/i2p/susi/webmail/WebMail.java:583 #: src/src/i2p/susi/webmail/WebMail.java:585
msgid "Need port number for pop3 connect." msgid "Need port number for pop3 connect."
msgstr "Es necesario el número de puerto para conectar pop3." msgstr "Es necesario el número de puerto para conectar pop3."
#: src/src/i2p/susi/webmail/WebMail.java:590 #: src/src/i2p/susi/webmail/WebMail.java:592
msgid "POP3 port number is not in range 0..65535." msgid "POP3 port number is not in range 0..65535."
msgstr "El puerto POP3 no está en el rango 0..65535." msgstr "El puerto POP3 no está en el rango 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:596 #: src/src/i2p/susi/webmail/WebMail.java:598
msgid "POP3 port number is invalid." msgid "POP3 port number is invalid."
msgstr "El puerto POP3 no es válido." msgstr "El puerto POP3 no es válido."
#: src/src/i2p/susi/webmail/WebMail.java:602 #: src/src/i2p/susi/webmail/WebMail.java:604
msgid "Need port number for smtp connect." msgid "Need port number for smtp connect."
msgstr "Es necesario el número de puerto para conectar smtp." msgstr "Es necesario el número de puerto para conectar smtp."
#: src/src/i2p/susi/webmail/WebMail.java:609 #: src/src/i2p/susi/webmail/WebMail.java:611
msgid "SMTP port number is not in range 0..65535." msgid "SMTP port number is not in range 0..65535."
msgstr "El puerto SMTP no está en el rango 0..65535." msgstr "El puerto SMTP no está en el rango 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:615 #: src/src/i2p/susi/webmail/WebMail.java:617
msgid "SMTP port number is invalid." msgid "SMTP port number is invalid."
msgstr "El puerto SMTP no es válido." msgstr "El puerto SMTP no es válido."
#: src/src/i2p/susi/webmail/WebMail.java:662 #: src/src/i2p/susi/webmail/WebMail.java:664
msgid "User logged out." msgid "User logged out."
msgstr "Usuario desconectado." msgstr "Usuario desconectado."
#: src/src/i2p/susi/webmail/WebMail.java:666 #: src/src/i2p/susi/webmail/WebMail.java:668
msgid "Internal error, lost connection." msgid "Internal error, lost connection."
msgstr "Error interno, pérdida de conexión." msgstr "Error interno, pérdida de conexión."
#: src/src/i2p/susi/webmail/WebMail.java:762 #: src/src/i2p/susi/webmail/WebMail.java:764
#, java-format #, java-format
msgid "On {0} {1} wrote:" msgid "On {0} {1} wrote:"
msgstr "En {0} {1} escribió:" msgstr "En {0} {1} escribió:"
#: src/src/i2p/susi/webmail/WebMail.java:809 #: src/src/i2p/susi/webmail/WebMail.java:811
msgid "begin forwarded mail" msgid "begin forwarded mail"
msgstr "comenzar correo reenviado" msgstr "comenzar correo reenviado"
#: src/src/i2p/susi/webmail/WebMail.java:831 #: src/src/i2p/susi/webmail/WebMail.java:833
msgid "end forwarded mail" msgid "end forwarded mail"
msgstr "final del correo reenviado" msgstr "final del correo reenviado"
#: src/src/i2p/susi/webmail/WebMail.java:838 #: src/src/i2p/susi/webmail/WebMail.java:840
#: src/src/i2p/susi/webmail/WebMail.java:1731 #: src/src/i2p/susi/webmail/WebMail.java:1770
msgid "Could not fetch mail body." msgid "Could not fetch mail body."
msgstr "No se pudo obtener el cuerpo del correo." msgstr "No se pudo obtener el cuerpo del correo."
#: src/src/i2p/susi/webmail/WebMail.java:866 #: src/src/i2p/susi/webmail/WebMail.java:868
msgid "Message id not valid." msgid "Message id not valid."
msgstr "ID del mensaje no válida." msgstr "ID del mensaje no válida."
#: src/src/i2p/susi/webmail/WebMail.java:949 #: src/src/i2p/susi/webmail/WebMail.java:951
#, java-format #, java-format
msgid "No Encoding found for {0}" msgid "No Encoding found for {0}"
msgstr "No se ha encontrado codificación para {0}" msgstr "No se ha encontrado codificación para {0}"
#: src/src/i2p/susi/webmail/WebMail.java:953 #: src/src/i2p/susi/webmail/WebMail.java:955
#, java-format #, java-format
msgid "Could not encode data: {0}" msgid "Could not encode data: {0}"
msgstr "No se pudo codificar los datos: {0}" msgstr "No se pudo codificar los datos: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:958 #: src/src/i2p/susi/webmail/WebMail.java:960
#, java-format #, java-format
msgid "Error reading uploaded file: {0}" msgid "Error reading uploaded file: {0}"
msgstr "Error al leer el archivo subido: {0}" msgstr "Error al leer el archivo subido: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1036 #: src/src/i2p/susi/webmail/WebMail.java:1038
msgid "Error parsing download parameter." msgid "Error parsing download parameter."
msgstr "Error al analizar parámetros de descarga." msgstr "Error al analizar parámetros de descarga."
#: src/src/i2p/susi/webmail/WebMail.java:1080 #: src/src/i2p/susi/webmail/WebMail.java:1082
msgid "Invalid pagesize number, resetting to default value." msgid "Invalid pagesize number, resetting to default value."
msgstr "" msgstr ""
"Tamaño de página no válida, restableciendo los valores predeterminados." "Tamaño de página no válida, restableciendo los valores predeterminados."
#: src/src/i2p/susi/webmail/WebMail.java:1104 #: src/src/i2p/susi/webmail/WebMail.java:1106
msgid "No messages marked for deletion." msgid "No messages marked for deletion."
msgstr "No hay mensajes marcados para su eliminación." msgstr "No hay mensajes marcados para su eliminación."
#: src/src/i2p/susi/webmail/WebMail.java:1124 #: src/src/i2p/susi/webmail/WebMail.java:1126
#, java-format #, java-format
msgid "Error deleting message: {0}" msgid "Error deleting message: {0}"
msgstr "Error al eliminar el mensaje: {0}" msgstr "Error al eliminar el mensaje: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1135 #: src/src/i2p/susi/webmail/WebMail.java:1137
#, java-format #, java-format
msgid "1 message deleted." msgid "1 message deleted."
msgid_plural "{0} messages deleted." msgid_plural "{0} messages deleted."
msgstr[0] "1 mensaje eliminado." msgstr[0] "1 mensaje eliminado."
msgstr[1] "{0} mensajes eliminados." msgstr[1] "{0} mensajes eliminados."
#: src/src/i2p/susi/webmail/WebMail.java:1278 #: src/src/i2p/susi/webmail/WebMail.java:1313
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Login" msgid "Login"
msgstr "Iniciar sesión" msgstr "Iniciar sesión"
#: src/src/i2p/susi/webmail/WebMail.java:1280 #: src/src/i2p/susi/webmail/WebMail.java:1315
#, java-format #, java-format
msgid "1 Message" msgid "1 Message"
msgid_plural "{0} Messages" msgid_plural "{0} Messages"
msgstr[0] "1 Mensaje" msgstr[0] "1 Mensaje"
msgstr[1] "{0} Mensajes" msgstr[1] "{0} Mensajes"
#: src/src/i2p/susi/webmail/WebMail.java:1282 #: src/src/i2p/susi/webmail/WebMail.java:1317
msgid "Show Message" msgid "Show Message"
msgstr "Mostrar mensaje" msgstr "Mostrar mensaje"
#: src/src/i2p/susi/webmail/WebMail.java:1344 #: src/src/i2p/susi/webmail/WebMail.java:1383
#, java-format #, java-format
msgid "Error decoding content: {0}" msgid "Error decoding content: {0}"
msgstr "Error al descodificar el contenido: {0}" msgstr "Error al descodificar el contenido: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1349 #: src/src/i2p/susi/webmail/WebMail.java:1388
msgid "Error decoding content: No encoder found." msgid "Error decoding content: No encoder found."
msgstr "Error al descodificar el contenido: No se ha encontrado codificador." msgstr "Error al descodificar el contenido: No se ha encontrado codificador."
#: src/src/i2p/susi/webmail/WebMail.java:1396 #: src/src/i2p/susi/webmail/WebMail.java:1435
msgid "no subject" msgid "no subject"
msgstr "sin asunto" msgstr "sin asunto"
#: src/src/i2p/susi/webmail/WebMail.java:1413 #: src/src/i2p/susi/webmail/WebMail.java:1452
msgid "Found no valid sender address." msgid "Found no valid sender address."
msgstr "No se ha encontrado una dirección de remitente válida." msgstr "No se ha encontrado una dirección de remitente válida."
#: src/src/i2p/susi/webmail/WebMail.java:1419 #: src/src/i2p/susi/webmail/WebMail.java:1458
#, java-format #, java-format
msgid "Found no valid address in \\''{0}\\''." msgid "Found no valid address in \\''{0}\\''."
msgstr "No se ha encontrado ninguna dirección válida en \\''{0}\\''." msgstr "No se ha encontrado ninguna dirección válida en \\''{0}\\''."
#: src/src/i2p/susi/webmail/WebMail.java:1438 #: src/src/i2p/susi/webmail/WebMail.java:1477
msgid "No recipients found." msgid "No recipients found."
msgstr "No se han encontrado destinatarios." msgstr "No se han encontrado destinatarios."
#: src/src/i2p/susi/webmail/WebMail.java:1445 #: src/src/i2p/susi/webmail/WebMail.java:1484
msgid "Quoted printable encoder not available." msgid "Quoted printable encoder not available."
msgstr "El codificador imprimible citado no está disponible." msgstr "El codificador imprimible citado no está disponible."
#: src/src/i2p/susi/webmail/WebMail.java:1450 #: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Header line encoder not available." msgid "Header line encoder not available."
msgstr "El codificador de línea de encabezado no está disponible." msgstr "El codificador de línea de encabezado no está disponible."
#: src/src/i2p/susi/webmail/WebMail.java:1501 #: src/src/i2p/susi/webmail/WebMail.java:1540
msgid "Mail sent." msgid "Mail sent."
msgstr "Correo enviado." msgstr "Correo enviado."
#: src/src/i2p/susi/webmail/WebMail.java:1540 #: src/src/i2p/susi/webmail/WebMail.java:1579
msgid "Send" msgid "Send"
msgstr "Enviar" msgstr "Enviar"
#: src/src/i2p/susi/webmail/WebMail.java:1541 #: src/src/i2p/susi/webmail/WebMail.java:1580
msgid "Cancel" msgid "Cancel"
msgstr "Cancelar" msgstr "Cancelar"
#: src/src/i2p/susi/webmail/WebMail.java:1542 #: src/src/i2p/susi/webmail/WebMail.java:1581
msgid "Delete Attachment" msgid "Delete Attachment"
msgstr "Eliminar datos adjuntos" msgstr "Eliminar datos adjuntos"
#: src/src/i2p/susi/webmail/WebMail.java:1543 #: src/src/i2p/susi/webmail/WebMail.java:1582
#: src/src/i2p/susi/webmail/WebMail.java:1637 #: src/src/i2p/susi/webmail/WebMail.java:1676
#: src/src/i2p/susi/webmail/WebMail.java:1718 #: src/src/i2p/susi/webmail/WebMail.java:1757
msgid "Reload Config" msgid "Reload Config"
msgstr "Recargar la configuración" msgstr "Recargar la configuración"
#: src/src/i2p/susi/webmail/WebMail.java:1544 #: src/src/i2p/susi/webmail/WebMail.java:1583
#: src/src/i2p/susi/webmail/WebMail.java:1638 #: src/src/i2p/susi/webmail/WebMail.java:1677
#: src/src/i2p/susi/webmail/WebMail.java:1719 #: src/src/i2p/susi/webmail/WebMail.java:1758
msgid "Logout" msgid "Logout"
msgstr "Desconectarse" msgstr "Desconectarse"
#: src/src/i2p/susi/webmail/WebMail.java:1567 #: src/src/i2p/susi/webmail/WebMail.java:1606
#: src/src/i2p/susi/webmail/WebMail.java:1723 #: src/src/i2p/susi/webmail/WebMail.java:1762
msgid "From:" msgid "From:"
msgstr "De:" msgstr "De:"
#: src/src/i2p/susi/webmail/WebMail.java:1568 #: src/src/i2p/susi/webmail/WebMail.java:1607
msgid "To:" msgid "To:"
msgstr "Para:" msgstr "Para:"
#: src/src/i2p/susi/webmail/WebMail.java:1569 #: src/src/i2p/susi/webmail/WebMail.java:1608
msgid "Cc:" msgid "Cc:"
msgstr "Cc:" msgstr "Cc:"
#: src/src/i2p/susi/webmail/WebMail.java:1570 #: src/src/i2p/susi/webmail/WebMail.java:1609
msgid "Bcc:" msgid "Bcc:"
msgstr "CCO:" msgstr "CCO:"
#: src/src/i2p/susi/webmail/WebMail.java:1571 #: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1725 #: src/src/i2p/susi/webmail/WebMail.java:1764
msgid "Subject:" msgid "Subject:"
msgstr "Asunto:" msgstr "Asunto:"
#: src/src/i2p/susi/webmail/WebMail.java:1572 #: src/src/i2p/susi/webmail/WebMail.java:1611
msgid "Bcc to self" msgid "Bcc to self"
msgstr "CCO a mí mism@" msgstr "CCO a mí mism@"
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "New Attachment:" msgid "New Attachment:"
msgstr "Nuevo Archivo adjunto:" msgstr "Nuevo Archivo adjunto:"
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "Upload File" msgid "Upload File"
msgstr "Subir Archivo" msgstr "Subir Archivo"
#: src/src/i2p/susi/webmail/WebMail.java:1581 #: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Attachments:" msgid "Attachments:"
msgstr "Archivos adjuntos:" msgstr "Archivos adjuntos:"
#. current postman hq length limits 16/12, new postman version 32/32 #. current postman hq length limits 16/12, new postman version 32/32
#: src/src/i2p/susi/webmail/WebMail.java:1604 #: src/src/i2p/susi/webmail/WebMail.java:1643
msgid "User" msgid "User"
msgstr "Usuario" msgstr "Usuario"
#: src/src/i2p/susi/webmail/WebMail.java:1605 #: src/src/i2p/susi/webmail/WebMail.java:1644
msgid "Password" msgid "Password"
msgstr "Contraseña" msgstr "Contraseña"
#: src/src/i2p/susi/webmail/WebMail.java:1610 #: src/src/i2p/susi/webmail/WebMail.java:1649
msgid "Host" msgid "Host"
msgstr "Host" msgstr "Host"
#: src/src/i2p/susi/webmail/WebMail.java:1611 #: src/src/i2p/susi/webmail/WebMail.java:1650
msgid "POP3-Port" msgid "POP3-Port"
msgstr "Puerto-POP3" msgstr "Puerto-POP3"
#: src/src/i2p/susi/webmail/WebMail.java:1612 #: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "SMTP-Port" msgid "SMTP-Port"
msgstr "Puerto-SMTP" msgstr "Puerto-SMTP"
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Reset" msgid "Reset"
msgstr "Cancelar" msgstr "Cancelar"
#: src/src/i2p/susi/webmail/WebMail.java:1616 #: src/src/i2p/susi/webmail/WebMail.java:1655
msgid "Learn about I2P mail" msgid "Learn about I2P mail"
msgstr "Aprende sobre I2P mail" msgstr "Aprende sobre I2P mail"
#: src/src/i2p/susi/webmail/WebMail.java:1617 #: src/src/i2p/susi/webmail/WebMail.java:1656
msgid "Create Account" msgid "Create Account"
msgstr "Crear una cuenta" msgstr "Crear una cuenta"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Really delete the marked messages?" msgid "Really delete the marked messages?"
msgstr "¿Realmente deseas borrar los mensajes marcados?" msgstr "¿Realmente deseas borrar los mensajes marcados?"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Yes, really delete them!" msgid "Yes, really delete them!"
msgstr "Sí, realmente eliminarlos!" msgstr "Sí, realmente eliminarlos!"
#: src/src/i2p/susi/webmail/WebMail.java:1631 #: src/src/i2p/susi/webmail/WebMail.java:1670
#: src/src/i2p/susi/webmail/WebMail.java:1710 #: src/src/i2p/susi/webmail/WebMail.java:1749
msgid "New" msgid "New"
msgstr "Nuevo" msgstr "Nuevo"
#: src/src/i2p/susi/webmail/WebMail.java:1632 #: src/src/i2p/susi/webmail/WebMail.java:1671
#: src/src/i2p/susi/webmail/WebMail.java:1711 #: src/src/i2p/susi/webmail/WebMail.java:1750
msgid "Reply" msgid "Reply"
msgstr "Responder" msgstr "Responder"
#: src/src/i2p/susi/webmail/WebMail.java:1633 #: src/src/i2p/susi/webmail/WebMail.java:1672
#: src/src/i2p/susi/webmail/WebMail.java:1712 #: src/src/i2p/susi/webmail/WebMail.java:1751
msgid "Reply All" msgid "Reply All"
msgstr "Responder a todos" msgstr "Responder a todos"
#: src/src/i2p/susi/webmail/WebMail.java:1634 #: src/src/i2p/susi/webmail/WebMail.java:1673
#: src/src/i2p/susi/webmail/WebMail.java:1713 #: src/src/i2p/susi/webmail/WebMail.java:1752
msgid "Forward" msgid "Forward"
msgstr "Reenviar" msgstr "Reenviar"
#: src/src/i2p/susi/webmail/WebMail.java:1635 #: src/src/i2p/susi/webmail/WebMail.java:1674
#: src/src/i2p/susi/webmail/WebMail.java:1714 #: src/src/i2p/susi/webmail/WebMail.java:1753
msgid "Delete" msgid "Delete"
msgstr "Eliminar" msgstr "Eliminar"
#: src/src/i2p/susi/webmail/WebMail.java:1636 #: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Check Mail" msgid "Check Mail"
msgstr "Comprobar correo" msgstr "Comprobar correo"
#: src/src/i2p/susi/webmail/WebMail.java:1640 #: src/src/i2p/susi/webmail/WebMail.java:1679
msgid "Sender" msgid "Sender"
msgstr "Remitente" msgstr "Remitente"
#: src/src/i2p/susi/webmail/WebMail.java:1641 #: src/src/i2p/susi/webmail/WebMail.java:1680
msgid "Subject" msgid "Subject"
msgstr "Asunto" msgstr "Asunto"
#: src/src/i2p/susi/webmail/WebMail.java:1642 #: src/src/i2p/susi/webmail/WebMail.java:1681
msgid "Date" msgid "Date"
msgstr "Fecha" msgstr "Fecha"
#: src/src/i2p/susi/webmail/WebMail.java:1643 #: src/src/i2p/susi/webmail/WebMail.java:1682
msgid "Size" msgid "Size"
msgstr "Tamaño" msgstr "Tamaño"
#: src/src/i2p/susi/webmail/WebMail.java:1669 #: src/src/i2p/susi/webmail/WebMail.java:1708
#, java-format #, java-format
msgid "1 Byte" msgid "1 Byte"
msgid_plural "{0} Bytes" msgid_plural "{0} Bytes"
msgstr[0] "1 Byte" msgstr[0] "1 Byte"
msgstr[1] "{0} Bytes" msgstr[1] "{0} Bytes"
#: src/src/i2p/susi/webmail/WebMail.java:1674 #: src/src/i2p/susi/webmail/WebMail.java:1713
msgid "Mark All" msgid "Mark All"
msgstr "Marcar todos" msgstr "Marcar todos"
#: src/src/i2p/susi/webmail/WebMail.java:1675 #: src/src/i2p/susi/webmail/WebMail.java:1714
msgid "Invert Selection" msgid "Invert Selection"
msgstr "Invertir selección" msgstr "Invertir selección"
#: src/src/i2p/susi/webmail/WebMail.java:1676 #: src/src/i2p/susi/webmail/WebMail.java:1715
msgid "Clear" msgid "Clear"
msgstr "Despejar" msgstr "Despejar"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
msgid "First" msgid "First"
msgstr "Primero" msgstr "Primero"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
#: src/src/i2p/susi/webmail/WebMail.java:1715 #: src/src/i2p/susi/webmail/WebMail.java:1754
msgid "Previous" msgid "Previous"
msgstr "Anterior" msgstr "Anterior"
#: src/src/i2p/susi/webmail/WebMail.java:1681 #: src/src/i2p/susi/webmail/WebMail.java:1720
#, java-format #, java-format
msgid "Page {0} of {1}" msgid "Page {0} of {1}"
msgstr "Página {0} de {1}" msgstr "Página {0} de {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
msgid "Last" msgid "Last"
msgstr "Última" msgstr "Última"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
#: src/src/i2p/susi/webmail/WebMail.java:1716 #: src/src/i2p/susi/webmail/WebMail.java:1755
msgid "Next" msgid "Next"
msgstr "Siguiente" msgstr "Siguiente"
#: src/src/i2p/susi/webmail/WebMail.java:1687 #: src/src/i2p/susi/webmail/WebMail.java:1726
msgid "Pagesize:" msgid "Pagesize:"
msgstr "Tamaño de página:" msgstr "Tamaño de página:"
#: src/src/i2p/susi/webmail/WebMail.java:1688 #: src/src/i2p/susi/webmail/WebMail.java:1727
msgid "Set" msgid "Set"
msgstr "Establecer" msgstr "Establecer"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Really delete this message?" msgid "Really delete this message?"
msgstr "¿Realmente deseas borrar este mensaje?" msgstr "¿Realmente deseas borrar este mensaje?"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Yes, really delete it!" msgid "Yes, really delete it!"
msgstr "Sí, ¡bórralo!" msgstr "Sí, ¡bórralo!"
#: src/src/i2p/susi/webmail/WebMail.java:1717 #: src/src/i2p/susi/webmail/WebMail.java:1756
msgid "Back to Folder" msgid "Back to Folder"
msgstr "Volver a carpeta" msgstr "Volver a carpeta"
#: src/src/i2p/susi/webmail/WebMail.java:1724 #: src/src/i2p/susi/webmail/WebMail.java:1763
msgid "Date:" msgid "Date:"
msgstr "Fecha:" msgstr "Fecha:"
#: src/src/i2p/susi/webmail/WebMail.java:1735 #: src/src/i2p/susi/webmail/WebMail.java:1774
msgid "Could not fetch mail." msgid "Could not fetch mail."
msgstr "No se pudo descargar el correo." msgstr "No se pudo descargar el correo."

232
apps/susimail/locale/messages_ru.po
View File

@@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-17 13:09+0000\n" "POT-Creation-Date: 2013-07-11 21:40+0000\n"
"PO-Revision-Date: 2012-12-24 18:32+0000\n" "PO-Revision-Date: 2012-12-24 18:32+0000\n"
"Last-Translator: Андрей Лукьяненко <operru32@yandex.ru>\n" "Last-Translator: Андрей Лукьяненко <operru32@yandex.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/I2P/language/" "Language-Team: Russian (http://www.transifex.com/projects/p/I2P/language/"
@@ -22,152 +22,152 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: src/src/i2p/susi/webmail/WebMail.java:445 #: src/src/i2p/susi/webmail/WebMail.java:447
msgid "unknown" msgid "unknown"
msgstr "неизвестно" msgstr "неизвестно"
#: src/src/i2p/susi/webmail/WebMail.java:464 #: src/src/i2p/susi/webmail/WebMail.java:466
msgid "Warning: no transfer encoding found, fallback to 7bit." msgid "Warning: no transfer encoding found, fallback to 7bit."
msgstr "" msgstr ""
"Предупреждение: кодировка передачи не найдена, откатывамся на использование " "Предупреждение: кодировка передачи не найдена, откатывамся на использование "
"7bit." "7bit."
#: src/src/i2p/susi/webmail/WebMail.java:469 #: src/src/i2p/susi/webmail/WebMail.java:471
#, java-format #, java-format
msgid "No encoder found for encoding \\''{0}\\''." msgid "No encoder found for encoding \\''{0}\\''."
msgstr "Для кодировки \\''{0}\\'' не найден кодек." msgstr "Для кодировки \\''{0}\\'' не найден кодек."
#: src/src/i2p/susi/webmail/WebMail.java:475 #: src/src/i2p/susi/webmail/WebMail.java:477
msgid "Warning: no charset found, fallback to US-ASCII." msgid "Warning: no charset found, fallback to US-ASCII."
msgstr "Предупреждение: кодировка непонятна, переключаемся в US-ASCII." msgstr "Предупреждение: кодировка непонятна, переключаемся в US-ASCII."
#: src/src/i2p/susi/webmail/WebMail.java:489 #: src/src/i2p/susi/webmail/WebMail.java:491
#, java-format #, java-format
msgid "Charset \\''{0}\\'' not supported." msgid "Charset \\''{0}\\'' not supported."
msgstr "Кодировка \\''{0}\\'' не поддерживается." msgstr "Кодировка \\''{0}\\'' не поддерживается."
#: src/src/i2p/susi/webmail/WebMail.java:493 #: src/src/i2p/susi/webmail/WebMail.java:495
#, java-format #, java-format
msgid "Part ({0}) not shown, because of {1}" msgid "Part ({0}) not shown, because of {1}"
msgstr "Часть ({0}) не отображена из-за {1}" msgstr "Часть ({0}) не отображена из-за {1}"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "Download" msgid "Download"
msgstr "Скачать" msgstr "Скачать"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "File is packed into a zipfile for security reasons." msgid "File is packed into a zipfile for security reasons."
msgstr "Файл запакован в zip-архив из соображений безопасности." msgstr "Файл запакован в zip-архив из соображений безопасности."
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
#, java-format #, java-format
msgid "attachment ({0})." msgid "attachment ({0})."
msgstr "вложение ({0})." msgstr "вложение ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:520 #: src/src/i2p/susi/webmail/WebMail.java:522
#, java-format #, java-format
msgid "Attachment ({0})." msgid "Attachment ({0})."
msgstr "Вложение ({0})." msgstr "Вложение ({0})."
#: src/src/i2p/susi/webmail/WebMail.java:570 #: src/src/i2p/susi/webmail/WebMail.java:572
msgid "Need username for authentication." msgid "Need username for authentication."
msgstr "Требуется имя пользователя для аутентификации." msgstr "Требуется имя пользователя для аутентификации."
#: src/src/i2p/susi/webmail/WebMail.java:574 #: src/src/i2p/susi/webmail/WebMail.java:576
msgid "Need password for authentication." msgid "Need password for authentication."
msgstr "Требуется пароль для аутентификации." msgstr "Требуется пароль для аутентификации."
#: src/src/i2p/susi/webmail/WebMail.java:578 #: src/src/i2p/susi/webmail/WebMail.java:580
msgid "Need hostname for connect." msgid "Need hostname for connect."
msgstr "Требуется имя хоста для соединений." msgstr "Требуется имя хоста для соединений."
#: src/src/i2p/susi/webmail/WebMail.java:583 #: src/src/i2p/susi/webmail/WebMail.java:585
msgid "Need port number for pop3 connect." msgid "Need port number for pop3 connect."
msgstr "Требуется номер порта для pop3 соединений." msgstr "Требуется номер порта для pop3 соединений."
#: src/src/i2p/susi/webmail/WebMail.java:590 #: src/src/i2p/susi/webmail/WebMail.java:592
msgid "POP3 port number is not in range 0..65535." msgid "POP3 port number is not in range 0..65535."
msgstr "Номер POP3-порта не в диапазоне 0..65535." msgstr "Номер POP3-порта не в диапазоне 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:596 #: src/src/i2p/susi/webmail/WebMail.java:598
msgid "POP3 port number is invalid." msgid "POP3 port number is invalid."
msgstr "Номер POP3-порта некорректный." msgstr "Номер POP3-порта некорректный."
#: src/src/i2p/susi/webmail/WebMail.java:602 #: src/src/i2p/susi/webmail/WebMail.java:604
msgid "Need port number for smtp connect." msgid "Need port number for smtp connect."
msgstr "Требуется номер порта для smtp соединений." msgstr "Требуется номер порта для smtp соединений."
#: src/src/i2p/susi/webmail/WebMail.java:609 #: src/src/i2p/susi/webmail/WebMail.java:611
msgid "SMTP port number is not in range 0..65535." msgid "SMTP port number is not in range 0..65535."
msgstr "Номер SMTP-порта не в диапазоне 0..65535." msgstr "Номер SMTP-порта не в диапазоне 0..65535."
#: src/src/i2p/susi/webmail/WebMail.java:615 #: src/src/i2p/susi/webmail/WebMail.java:617
msgid "SMTP port number is invalid." msgid "SMTP port number is invalid."
msgstr "Номер SMTP-порта некорректный." msgstr "Номер SMTP-порта некорректный."
#: src/src/i2p/susi/webmail/WebMail.java:662 #: src/src/i2p/susi/webmail/WebMail.java:664
msgid "User logged out." msgid "User logged out."
msgstr "Пользователь отключился." msgstr "Пользователь отключился."
#: src/src/i2p/susi/webmail/WebMail.java:666 #: src/src/i2p/susi/webmail/WebMail.java:668
msgid "Internal error, lost connection." msgid "Internal error, lost connection."
msgstr "Внутренняя ошибка, соединение потеряно." msgstr "Внутренняя ошибка, соединение потеряно."
#: src/src/i2p/susi/webmail/WebMail.java:762 #: src/src/i2p/susi/webmail/WebMail.java:764
#, java-format #, java-format
msgid "On {0} {1} wrote:" msgid "On {0} {1} wrote:"
msgstr "В сообщении от {0} {1} написал(a):" msgstr "В сообщении от {0} {1} написал(a):"
#: src/src/i2p/susi/webmail/WebMail.java:809 #: src/src/i2p/susi/webmail/WebMail.java:811
msgid "begin forwarded mail" msgid "begin forwarded mail"
msgstr "начало пересланного сообщения" msgstr "начало пересланного сообщения"
#: src/src/i2p/susi/webmail/WebMail.java:831 #: src/src/i2p/susi/webmail/WebMail.java:833
msgid "end forwarded mail" msgid "end forwarded mail"
msgstr "конец пересланного сообщения" msgstr "конец пересланного сообщения"
#: src/src/i2p/susi/webmail/WebMail.java:838 #: src/src/i2p/susi/webmail/WebMail.java:840
#: src/src/i2p/susi/webmail/WebMail.java:1731 #: src/src/i2p/susi/webmail/WebMail.java:1770
msgid "Could not fetch mail body." msgid "Could not fetch mail body."
msgstr "Не удалось скачать тело сообщения." msgstr "Не удалось скачать тело сообщения."
#: src/src/i2p/susi/webmail/WebMail.java:866 #: src/src/i2p/susi/webmail/WebMail.java:868
msgid "Message id not valid." msgid "Message id not valid."
msgstr "Message id некорректен." msgstr "Message id некорректен."
#: src/src/i2p/susi/webmail/WebMail.java:949 #: src/src/i2p/susi/webmail/WebMail.java:951
#, java-format #, java-format
msgid "No Encoding found for {0}" msgid "No Encoding found for {0}"
msgstr "Не найдена кодировка для {0}" msgstr "Не найдена кодировка для {0}"
#: src/src/i2p/susi/webmail/WebMail.java:953 #: src/src/i2p/susi/webmail/WebMail.java:955
#, java-format #, java-format
msgid "Could not encode data: {0}" msgid "Could not encode data: {0}"
msgstr "Не удаётся закодировать данные: {0}" msgstr "Не удаётся закодировать данные: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:958 #: src/src/i2p/susi/webmail/WebMail.java:960
#, java-format #, java-format
msgid "Error reading uploaded file: {0}" msgid "Error reading uploaded file: {0}"
msgstr "Ошибка при чтении загруженного файла: {0}" msgstr "Ошибка при чтении загруженного файла: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1036 #: src/src/i2p/susi/webmail/WebMail.java:1038
msgid "Error parsing download parameter." msgid "Error parsing download parameter."
msgstr "Ошибка при разборе параметра скачивания." msgstr "Ошибка при разборе параметра скачивания."
#: src/src/i2p/susi/webmail/WebMail.java:1080 #: src/src/i2p/susi/webmail/WebMail.java:1082
msgid "Invalid pagesize number, resetting to default value." msgid "Invalid pagesize number, resetting to default value."
msgstr "Некорректный размер страницы, устанавливается значение по умолчанию." msgstr "Некорректный размер страницы, устанавливается значение по умолчанию."
#: src/src/i2p/susi/webmail/WebMail.java:1104 #: src/src/i2p/susi/webmail/WebMail.java:1106
msgid "No messages marked for deletion." msgid "No messages marked for deletion."
msgstr "Не отмечено сообщений для удаления." msgstr "Не отмечено сообщений для удаления."
#: src/src/i2p/susi/webmail/WebMail.java:1124 #: src/src/i2p/susi/webmail/WebMail.java:1126
#, java-format #, java-format
msgid "Error deleting message: {0}" msgid "Error deleting message: {0}"
msgstr "Ошибка при удалении сообщения: {0}" msgstr "Ошибка при удалении сообщения: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1135 #: src/src/i2p/susi/webmail/WebMail.java:1137
#, java-format #, java-format
msgid "1 message deleted." msgid "1 message deleted."
msgid_plural "{0} messages deleted." msgid_plural "{0} messages deleted."
@@ -175,12 +175,12 @@ msgstr[0] "{0} сообщение удалено."
msgstr[1] "{0} сообщения удалено." msgstr[1] "{0} сообщения удалено."
msgstr[2] "{0} сообщений удалены." msgstr[2] "{0} сообщений удалены."
#: src/src/i2p/susi/webmail/WebMail.java:1278 #: src/src/i2p/susi/webmail/WebMail.java:1313
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Login" msgid "Login"
msgstr "Логин" msgstr "Логин"
#: src/src/i2p/susi/webmail/WebMail.java:1280 #: src/src/i2p/susi/webmail/WebMail.java:1315
#, java-format #, java-format
msgid "1 Message" msgid "1 Message"
msgid_plural "{0} Messages" msgid_plural "{0} Messages"
@@ -188,197 +188,197 @@ msgstr[0] "{0} сообщение"
msgstr[1] "{0} сообщения" msgstr[1] "{0} сообщения"
msgstr[2] "{0} сообщений" msgstr[2] "{0} сообщений"
#: src/src/i2p/susi/webmail/WebMail.java:1282 #: src/src/i2p/susi/webmail/WebMail.java:1317
msgid "Show Message" msgid "Show Message"
msgstr "Покзать сообщение" msgstr "Покзать сообщение"
#: src/src/i2p/susi/webmail/WebMail.java:1344 #: src/src/i2p/susi/webmail/WebMail.java:1383
#, java-format #, java-format
msgid "Error decoding content: {0}" msgid "Error decoding content: {0}"
msgstr "Ошибка при декодировании контента: {0}" msgstr "Ошибка при декодировании контента: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1349 #: src/src/i2p/susi/webmail/WebMail.java:1388
msgid "Error decoding content: No encoder found." msgid "Error decoding content: No encoder found."
msgstr "Ошибка при декодировании контента: кодек не найден." msgstr "Ошибка при декодировании контента: кодек не найден."
#: src/src/i2p/susi/webmail/WebMail.java:1396 #: src/src/i2p/susi/webmail/WebMail.java:1435
msgid "no subject" msgid "no subject"
msgstr "без темы" msgstr "без темы"
#: src/src/i2p/susi/webmail/WebMail.java:1413 #: src/src/i2p/susi/webmail/WebMail.java:1452
msgid "Found no valid sender address." msgid "Found no valid sender address."
msgstr "Не найдено корректного адреса отправителя." msgstr "Не найдено корректного адреса отправителя."
#: src/src/i2p/susi/webmail/WebMail.java:1419 #: src/src/i2p/susi/webmail/WebMail.java:1458
#, java-format #, java-format
msgid "Found no valid address in \\''{0}\\''." msgid "Found no valid address in \\''{0}\\''."
msgstr "Не найдено корректного адреса в \\''{0}\\''." msgstr "Не найдено корректного адреса в \\''{0}\\''."
#: src/src/i2p/susi/webmail/WebMail.java:1438 #: src/src/i2p/susi/webmail/WebMail.java:1477
msgid "No recipients found." msgid "No recipients found."
msgstr "Не найдено получателей." msgstr "Не найдено получателей."
#: src/src/i2p/susi/webmail/WebMail.java:1445 #: src/src/i2p/susi/webmail/WebMail.java:1484
msgid "Quoted printable encoder not available." msgid "Quoted printable encoder not available."
msgstr "Кодек quoted printable недоступен." msgstr "Кодек quoted printable недоступен."
#: src/src/i2p/susi/webmail/WebMail.java:1450 #: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Header line encoder not available." msgid "Header line encoder not available."
msgstr "Кодек для заголовка недоступен." msgstr "Кодек для заголовка недоступен."
#: src/src/i2p/susi/webmail/WebMail.java:1501 #: src/src/i2p/susi/webmail/WebMail.java:1540
msgid "Mail sent." msgid "Mail sent."
msgstr "Сообщение отправлено." msgstr "Сообщение отправлено."
#: src/src/i2p/susi/webmail/WebMail.java:1540 #: src/src/i2p/susi/webmail/WebMail.java:1579
msgid "Send" msgid "Send"
msgstr "Отправить" msgstr "Отправить"
#: src/src/i2p/susi/webmail/WebMail.java:1541 #: src/src/i2p/susi/webmail/WebMail.java:1580
msgid "Cancel" msgid "Cancel"
msgstr "Отмена" msgstr "Отмена"
#: src/src/i2p/susi/webmail/WebMail.java:1542 #: src/src/i2p/susi/webmail/WebMail.java:1581
msgid "Delete Attachment" msgid "Delete Attachment"
msgstr "Удалить вложение" msgstr "Удалить вложение"
#: src/src/i2p/susi/webmail/WebMail.java:1543 #: src/src/i2p/susi/webmail/WebMail.java:1582
#: src/src/i2p/susi/webmail/WebMail.java:1637 #: src/src/i2p/susi/webmail/WebMail.java:1676
#: src/src/i2p/susi/webmail/WebMail.java:1718 #: src/src/i2p/susi/webmail/WebMail.java:1757
msgid "Reload Config" msgid "Reload Config"
msgstr "Перечитать конфиг" msgstr "Перечитать конфиг"
#: src/src/i2p/susi/webmail/WebMail.java:1544 #: src/src/i2p/susi/webmail/WebMail.java:1583
#: src/src/i2p/susi/webmail/WebMail.java:1638 #: src/src/i2p/susi/webmail/WebMail.java:1677
#: src/src/i2p/susi/webmail/WebMail.java:1719 #: src/src/i2p/susi/webmail/WebMail.java:1758
msgid "Logout" msgid "Logout"
msgstr "Выйти" msgstr "Выйти"
#: src/src/i2p/susi/webmail/WebMail.java:1567 #: src/src/i2p/susi/webmail/WebMail.java:1606
#: src/src/i2p/susi/webmail/WebMail.java:1723 #: src/src/i2p/susi/webmail/WebMail.java:1762
msgid "From:" msgid "From:"
msgstr "От:" msgstr "От:"
#: src/src/i2p/susi/webmail/WebMail.java:1568 #: src/src/i2p/susi/webmail/WebMail.java:1607
msgid "To:" msgid "To:"
msgstr "Кому:" msgstr "Кому:"
#: src/src/i2p/susi/webmail/WebMail.java:1569 #: src/src/i2p/susi/webmail/WebMail.java:1608
msgid "Cc:" msgid "Cc:"
msgstr "Копия:" msgstr "Копия:"
#: src/src/i2p/susi/webmail/WebMail.java:1570 #: src/src/i2p/susi/webmail/WebMail.java:1609
msgid "Bcc:" msgid "Bcc:"
msgstr "Скрытая копия:" msgstr "Скрытая копия:"
#: src/src/i2p/susi/webmail/WebMail.java:1571 #: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1725 #: src/src/i2p/susi/webmail/WebMail.java:1764
msgid "Subject:" msgid "Subject:"
msgstr "Тема:" msgstr "Тема:"
#: src/src/i2p/susi/webmail/WebMail.java:1572 #: src/src/i2p/susi/webmail/WebMail.java:1611
msgid "Bcc to self" msgid "Bcc to self"
msgstr "Послать скрытую копию самому себе" msgstr "Послать скрытую копию самому себе"
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "New Attachment:" msgid "New Attachment:"
msgstr "Новое вложение:" msgstr "Новое вложение:"
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "Upload File" msgid "Upload File"
msgstr "Прикрепить" msgstr "Прикрепить"
#: src/src/i2p/susi/webmail/WebMail.java:1581 #: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Attachments:" msgid "Attachments:"
msgstr "Вложения:" msgstr "Вложения:"
#. current postman hq length limits 16/12, new postman version 32/32 #. current postman hq length limits 16/12, new postman version 32/32
#: src/src/i2p/susi/webmail/WebMail.java:1604 #: src/src/i2p/susi/webmail/WebMail.java:1643
msgid "User" msgid "User"
msgstr "Пользователь" msgstr "Пользователь"
#: src/src/i2p/susi/webmail/WebMail.java:1605 #: src/src/i2p/susi/webmail/WebMail.java:1644
msgid "Password" msgid "Password"
msgstr "Пароль" msgstr "Пароль"
#: src/src/i2p/susi/webmail/WebMail.java:1610 #: src/src/i2p/susi/webmail/WebMail.java:1649
msgid "Host" msgid "Host"
msgstr "Хост" msgstr "Хост"
#: src/src/i2p/susi/webmail/WebMail.java:1611 #: src/src/i2p/susi/webmail/WebMail.java:1650
msgid "POP3-Port" msgid "POP3-Port"
msgstr "POP3-порт" msgstr "POP3-порт"
#: src/src/i2p/susi/webmail/WebMail.java:1612 #: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "SMTP-Port" msgid "SMTP-Port"
msgstr "SMTP-порт" msgstr "SMTP-порт"
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Reset" msgid "Reset"
msgstr "Сброс" msgstr "Сброс"
#: src/src/i2p/susi/webmail/WebMail.java:1616 #: src/src/i2p/susi/webmail/WebMail.java:1655
msgid "Learn about I2P mail" msgid "Learn about I2P mail"
msgstr "О почте I2P" msgstr "О почте I2P"
#: src/src/i2p/susi/webmail/WebMail.java:1617 #: src/src/i2p/susi/webmail/WebMail.java:1656
msgid "Create Account" msgid "Create Account"
msgstr "Создать учётную запись" msgstr "Создать учётную запись"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Really delete the marked messages?" msgid "Really delete the marked messages?"
msgstr "Действительно удалить отмеченые сообщения?" msgstr "Действительно удалить отмеченые сообщения?"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Yes, really delete them!" msgid "Yes, really delete them!"
msgstr "Да, действительно удалить!" msgstr "Да, действительно удалить!"
#: src/src/i2p/susi/webmail/WebMail.java:1631 #: src/src/i2p/susi/webmail/WebMail.java:1670
#: src/src/i2p/susi/webmail/WebMail.java:1710 #: src/src/i2p/susi/webmail/WebMail.java:1749
msgid "New" msgid "New"
msgstr "Новое" msgstr "Новое"
#: src/src/i2p/susi/webmail/WebMail.java:1632 #: src/src/i2p/susi/webmail/WebMail.java:1671
#: src/src/i2p/susi/webmail/WebMail.java:1711 #: src/src/i2p/susi/webmail/WebMail.java:1750
msgid "Reply" msgid "Reply"
msgstr "Ответить" msgstr "Ответить"
#: src/src/i2p/susi/webmail/WebMail.java:1633 #: src/src/i2p/susi/webmail/WebMail.java:1672
#: src/src/i2p/susi/webmail/WebMail.java:1712 #: src/src/i2p/susi/webmail/WebMail.java:1751
msgid "Reply All" msgid "Reply All"
msgstr "Ответить всем" msgstr "Ответить всем"
#: src/src/i2p/susi/webmail/WebMail.java:1634 #: src/src/i2p/susi/webmail/WebMail.java:1673
#: src/src/i2p/susi/webmail/WebMail.java:1713 #: src/src/i2p/susi/webmail/WebMail.java:1752
msgid "Forward" msgid "Forward"
msgstr "Переслать" msgstr "Переслать"
#: src/src/i2p/susi/webmail/WebMail.java:1635 #: src/src/i2p/susi/webmail/WebMail.java:1674
#: src/src/i2p/susi/webmail/WebMail.java:1714 #: src/src/i2p/susi/webmail/WebMail.java:1753
msgid "Delete" msgid "Delete"
msgstr "Удалить" msgstr "Удалить"
#: src/src/i2p/susi/webmail/WebMail.java:1636 #: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Check Mail" msgid "Check Mail"
msgstr "Проверить почту" msgstr "Проверить почту"
#: src/src/i2p/susi/webmail/WebMail.java:1640 #: src/src/i2p/susi/webmail/WebMail.java:1679
msgid "Sender" msgid "Sender"
msgstr "Отправитель" msgstr "Отправитель"
#: src/src/i2p/susi/webmail/WebMail.java:1641 #: src/src/i2p/susi/webmail/WebMail.java:1680
msgid "Subject" msgid "Subject"
msgstr "Тема" msgstr "Тема"
#: src/src/i2p/susi/webmail/WebMail.java:1642 #: src/src/i2p/susi/webmail/WebMail.java:1681
msgid "Date" msgid "Date"
msgstr "Дата" msgstr "Дата"
#: src/src/i2p/susi/webmail/WebMail.java:1643 #: src/src/i2p/susi/webmail/WebMail.java:1682
msgid "Size" msgid "Size"
msgstr "Размер" msgstr "Размер"
#: src/src/i2p/susi/webmail/WebMail.java:1669 #: src/src/i2p/susi/webmail/WebMail.java:1708
#, java-format #, java-format
msgid "1 Byte" msgid "1 Byte"
msgid_plural "{0} Bytes" msgid_plural "{0} Bytes"
@@ -386,69 +386,69 @@ msgstr[0] "{0} байт"
msgstr[1] "{0} байта" msgstr[1] "{0} байта"
msgstr[2] "{0} байт" msgstr[2] "{0} байт"
#: src/src/i2p/susi/webmail/WebMail.java:1674 #: src/src/i2p/susi/webmail/WebMail.java:1713
msgid "Mark All" msgid "Mark All"
msgstr "Отметить всё" msgstr "Отметить всё"
#: src/src/i2p/susi/webmail/WebMail.java:1675 #: src/src/i2p/susi/webmail/WebMail.java:1714
msgid "Invert Selection" msgid "Invert Selection"
msgstr "Инвертировать выделение" msgstr "Инвертировать выделение"
#: src/src/i2p/susi/webmail/WebMail.java:1676 #: src/src/i2p/susi/webmail/WebMail.java:1715
msgid "Clear" msgid "Clear"
msgstr "Очистить" msgstr "Очистить"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
msgid "First" msgid "First"
msgstr "Первое" msgstr "Первое"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
#: src/src/i2p/susi/webmail/WebMail.java:1715 #: src/src/i2p/susi/webmail/WebMail.java:1754
msgid "Previous" msgid "Previous"
msgstr "Предыдущее" msgstr "Предыдущее"
#: src/src/i2p/susi/webmail/WebMail.java:1681 #: src/src/i2p/susi/webmail/WebMail.java:1720
#, java-format #, java-format
msgid "Page {0} of {1}" msgid "Page {0} of {1}"
msgstr "Страница {0} из {1}" msgstr "Страница {0} из {1}"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
msgid "Last" msgid "Last"
msgstr "Последнее" msgstr "Последнее"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
#: src/src/i2p/susi/webmail/WebMail.java:1716 #: src/src/i2p/susi/webmail/WebMail.java:1755
msgid "Next" msgid "Next"
msgstr "Следующее" msgstr "Следующее"
#: src/src/i2p/susi/webmail/WebMail.java:1687 #: src/src/i2p/susi/webmail/WebMail.java:1726
msgid "Pagesize:" msgid "Pagesize:"
msgstr "Сообщений на странице:" msgstr "Сообщений на странице:"
#: src/src/i2p/susi/webmail/WebMail.java:1688 #: src/src/i2p/susi/webmail/WebMail.java:1727
msgid "Set" msgid "Set"
msgstr "Установить" msgstr "Установить"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Really delete this message?" msgid "Really delete this message?"
msgstr "Действительно удалить это сообщение?" msgstr "Действительно удалить это сообщение?"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Yes, really delete it!" msgid "Yes, really delete it!"
msgstr "Да, удалить это!" msgstr "Да, удалить это!"
#: src/src/i2p/susi/webmail/WebMail.java:1717 #: src/src/i2p/susi/webmail/WebMail.java:1756
msgid "Back to Folder" msgid "Back to Folder"
msgstr "Вернуться к папке" msgstr "Вернуться к папке"
#: src/src/i2p/susi/webmail/WebMail.java:1724 #: src/src/i2p/susi/webmail/WebMail.java:1763
msgid "Date:" msgid "Date:"
msgstr "Дата:" msgstr "Дата:"
#: src/src/i2p/susi/webmail/WebMail.java:1735 #: src/src/i2p/susi/webmail/WebMail.java:1774
msgid "Could not fetch mail." msgid "Could not fetch mail."
msgstr "Не удалось скачать почту." msgstr "Не удалось скачать почту."

252
apps/susimail/locale/messages_zh.po
View File

@@ -3,441 +3,443 @@
# This file is distributed under the same license as the susimail package. # This file is distributed under the same license as the susimail package.
# To contribute translations, see http://www.i2p2.de/newdevelopers # To contribute translations, see http://www.i2p2.de/newdevelopers
# #
# walking <walking@i2pmail.org>, 2011. # Translators:
# walking <waling@mail.i2p>, 2013
# walking <walking@i2pmail.org>, 2011
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P\n" "Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-28 22:43+0000\n" "POT-Creation-Date: 2013-07-11 21:39+0000\n"
"PO-Revision-Date: 2011-03-24 09:37+0000\n" "PO-Revision-Date: 2013-07-11 06:41+0000\n"
"Last-Translator: walking <walking@i2pmail.org>\n" "Last-Translator: xtoaster <zhazhenzhong@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/I2P/team/" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/"
"zh_CN/)\n" "language/zh_CN/)\n"
"Language: zh_CN\n" "Language: zh_CN\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n" "Plural-Forms: nplurals=1; plural=0;\n"
#: src/src/i2p/susi/webmail/WebMail.java:445 #: src/src/i2p/susi/webmail/WebMail.java:447
msgid "unknown" msgid "unknown"
msgstr "未知" msgstr "未知"
#: src/src/i2p/susi/webmail/WebMail.java:464 #: src/src/i2p/susi/webmail/WebMail.java:466
msgid "Warning: no transfer encoding found, fallback to 7bit." msgid "Warning: no transfer encoding found, fallback to 7bit."
msgstr "警告：传输编码检测失败，回退到7位。" msgstr "警告：传输编码检测失败，回退到7位。"
#: src/src/i2p/susi/webmail/WebMail.java:469 #: src/src/i2p/susi/webmail/WebMail.java:471
#, java-format #, java-format
msgid "No encoder found for encoding \\''{0}\\''." msgid "No encoder found for encoding \\''{0}\\''."
msgstr "没有找到可用编码器处理编码\\ '' {0} \\ ''。" msgstr "没有找到可用编码器处理编码\\ '' {0} \\ ''。"
#: src/src/i2p/susi/webmail/WebMail.java:475 #: src/src/i2p/susi/webmail/WebMail.java:477
msgid "Warning: no charset found, fallback to US-ASCII." msgid "Warning: no charset found, fallback to US-ASCII."
msgstr "警告：字符集检测失败，回退为US - ASCII。" msgstr "警告：字符集检测失败，回退为US - ASCII。"
#: src/src/i2p/susi/webmail/WebMail.java:489 #: src/src/i2p/susi/webmail/WebMail.java:491
#, java-format #, java-format
msgid "Charset \\''{0}\\'' not supported." msgid "Charset \\''{0}\\'' not supported."
msgstr "不支持字符集\\ '' {0} \\ ''。" msgstr "不支持字符集\\ '' {0} \\ ''。"
#: src/src/i2p/susi/webmail/WebMail.java:493 #: src/src/i2p/susi/webmail/WebMail.java:495
#, java-format #, java-format
msgid "Part ({0}) not shown, because of {1}" msgid "Part ({0}) not shown, because of {1}"
msgstr "第（{0}）部分没有显示，因为{1}" msgstr "第（{0}）部分没有显示，因为{1}"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "Download" msgid "Download"
msgstr "下载" msgstr "下载"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
msgid "File is packed into a zipfile for security reasons." msgid "File is packed into a zipfile for security reasons."
msgstr "出于安全原因，文件被打包为zip文件。" msgstr "出于安全原因，文件被打包为zip文件。"
#: src/src/i2p/susi/webmail/WebMail.java:516 #: src/src/i2p/susi/webmail/WebMail.java:518
#, java-format #, java-format
msgid "attachment ({0})." msgid "attachment ({0})."
msgstr "附件（{0}）。" msgstr "附件（{0}）。"
#: src/src/i2p/susi/webmail/WebMail.java:520 #: src/src/i2p/susi/webmail/WebMail.java:522
#, java-format #, java-format
msgid "Attachment ({0})." msgid "Attachment ({0})."
msgstr "附件（{0}）。" msgstr "附件（{0}）。"
#: src/src/i2p/susi/webmail/WebMail.java:570 #: src/src/i2p/susi/webmail/WebMail.java:572
msgid "Need username for authentication." msgid "Need username for authentication."
msgstr "需要认证用的用户名。" msgstr "需要认证用的用户名。"
#: src/src/i2p/susi/webmail/WebMail.java:574 #: src/src/i2p/susi/webmail/WebMail.java:576
msgid "Need password for authentication." msgid "Need password for authentication."
msgstr "需要认证用的密码。" msgstr "需要认证用的密码。"
#: src/src/i2p/susi/webmail/WebMail.java:578 #: src/src/i2p/susi/webmail/WebMail.java:580
msgid "Need hostname for connect." msgid "Need hostname for connect."
msgstr "需要连接用的主机名。" msgstr "需要连接用的主机名。"
#: src/src/i2p/susi/webmail/WebMail.java:583 #: src/src/i2p/susi/webmail/WebMail.java:585
msgid "Need port number for pop3 connect." msgid "Need port number for pop3 connect."
msgstr "需要POP3的连接端口号。" msgstr "需要POP3的连接端口号。"
#: src/src/i2p/susi/webmail/WebMail.java:590 #: src/src/i2p/susi/webmail/WebMail.java:592
msgid "POP3 port number is not in range 0..65535." msgid "POP3 port number is not in range 0..65535."
msgstr "POP3端口号超出范围0-65535。" msgstr "POP3端口号超出范围0-65535。"
#: src/src/i2p/susi/webmail/WebMail.java:596 #: src/src/i2p/susi/webmail/WebMail.java:598
msgid "POP3 port number is invalid." msgid "POP3 port number is invalid."
msgstr "POP3端口号是无效的。" msgstr "POP3端口号是无效的。"
#: src/src/i2p/susi/webmail/WebMail.java:602 #: src/src/i2p/susi/webmail/WebMail.java:604
msgid "Need port number for smtp connect." msgid "Need port number for smtp connect."
msgstr "需要的SMTP连接端口号。" msgstr "需要的SMTP连接端口号。"
#: src/src/i2p/susi/webmail/WebMail.java:609 #: src/src/i2p/susi/webmail/WebMail.java:611
msgid "SMTP port number is not in range 0..65535." msgid "SMTP port number is not in range 0..65535."
msgstr "SMTP端口号是超出范围0-65535。" msgstr "SMTP端口号是超出范围0-65535。"
#: src/src/i2p/susi/webmail/WebMail.java:615 #: src/src/i2p/susi/webmail/WebMail.java:617
msgid "SMTP port number is invalid." msgid "SMTP port number is invalid."
msgstr "SMTP端口号无效。" msgstr "SMTP端口号无效。"
#: src/src/i2p/susi/webmail/WebMail.java:662 #: src/src/i2p/susi/webmail/WebMail.java:664
msgid "User logged out." msgid "User logged out."
msgstr "用户已登出。" msgstr "用户已登出。"
#: src/src/i2p/susi/webmail/WebMail.java:666 #: src/src/i2p/susi/webmail/WebMail.java:668
msgid "Internal error, lost connection." msgid "Internal error, lost connection."
msgstr "内部错误，连接已断开。" msgstr "内部错误，连接已断开。"
#: src/src/i2p/susi/webmail/WebMail.java:762 #: src/src/i2p/susi/webmail/WebMail.java:764
#, java-format #, java-format
msgid "On {0} {1} wrote:" msgid "On {0} {1} wrote:"
msgstr "在 {0} {1} 写到：" msgstr "在 {0} {1} 写到："
#: src/src/i2p/susi/webmail/WebMail.java:809 #: src/src/i2p/susi/webmail/WebMail.java:811
msgid "begin forwarded mail" msgid "begin forwarded mail"
msgstr "转信开始" msgstr "转信开始"
#: src/src/i2p/susi/webmail/WebMail.java:831 #: src/src/i2p/susi/webmail/WebMail.java:833
msgid "end forwarded mail" msgid "end forwarded mail"
msgstr "转信结束" msgstr "转信结束"
#: src/src/i2p/susi/webmail/WebMail.java:838 #: src/src/i2p/susi/webmail/WebMail.java:840
#: src/src/i2p/susi/webmail/WebMail.java:1731 #: src/src/i2p/susi/webmail/WebMail.java:1770
msgid "Could not fetch mail body." msgid "Could not fetch mail body."
msgstr "无法获取邮件正文。" msgstr "无法获取邮件正文。"
#: src/src/i2p/susi/webmail/WebMail.java:866 #: src/src/i2p/susi/webmail/WebMail.java:868
msgid "Message id not valid." msgid "Message id not valid."
msgstr "消息ID无效。" msgstr "消息ID无效。"
#: src/src/i2p/susi/webmail/WebMail.java:949 #: src/src/i2p/susi/webmail/WebMail.java:951
#, java-format #, java-format
msgid "No Encoding found for {0}" msgid "No Encoding found for {0}"
msgstr "{0}的编码检测失败。" msgstr "{0}的编码检测失败。"
#: src/src/i2p/susi/webmail/WebMail.java:953 #: src/src/i2p/susi/webmail/WebMail.java:955
#, java-format #, java-format
msgid "Could not encode data: {0}" msgid "Could not encode data: {0}"
msgstr "无法对数据进行编码：{0}" msgstr "无法对数据进行编码：{0}"
#: src/src/i2p/susi/webmail/WebMail.java:958 #: src/src/i2p/susi/webmail/WebMail.java:960
#, java-format #, java-format
msgid "Error reading uploaded file: {0}" msgid "Error reading uploaded file: {0}"
msgstr "读取上传文件错误：{0}" msgstr "读取上传文件错误：{0}"
#: src/src/i2p/susi/webmail/WebMail.java:1036 #: src/src/i2p/susi/webmail/WebMail.java:1038
msgid "Error parsing download parameter." msgid "Error parsing download parameter."
msgstr "下载参数解析错误。" msgstr "下载参数解析错误。"
#: src/src/i2p/susi/webmail/WebMail.java:1080 #: src/src/i2p/susi/webmail/WebMail.java:1082
msgid "Invalid pagesize number, resetting to default value." msgid "Invalid pagesize number, resetting to default value."
msgstr "无效的每页数，重置为默认值。" msgstr "无效的每页数，重置为默认值。"
#: src/src/i2p/susi/webmail/WebMail.java:1104 #: src/src/i2p/susi/webmail/WebMail.java:1106
msgid "No messages marked for deletion." msgid "No messages marked for deletion."
msgstr "没有邮件被标记来删除。" msgstr "没有邮件被标记来删除。"
#: src/src/i2p/susi/webmail/WebMail.java:1124 #: src/src/i2p/susi/webmail/WebMail.java:1126
#, java-format #, java-format
msgid "Error deleting message: {0}" msgid "Error deleting message: {0}"
msgstr "邮件删除错误：{0}" msgstr "邮件删除错误：{0}"
#: src/src/i2p/susi/webmail/WebMail.java:1135 #: src/src/i2p/susi/webmail/WebMail.java:1137
#, java-format #, java-format
msgid "1 message deleted." msgid "1 message deleted."
msgid_plural "{0} messages deleted." msgid_plural "{0} messages deleted."
msgstr[0] "已删除{0}封邮件。" msgstr[0] "已删除{0}封邮件。"
#: src/src/i2p/susi/webmail/WebMail.java:1278 #: src/src/i2p/susi/webmail/WebMail.java:1313
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Login" msgid "Login"
msgstr "登录" msgstr "登录"
#: src/src/i2p/susi/webmail/WebMail.java:1280 #: src/src/i2p/susi/webmail/WebMail.java:1315
#, java-format #, java-format
msgid "1 Message" msgid "1 Message"
msgid_plural "{0} Messages" msgid_plural "{0} Messages"
msgstr[0] "{0} 封邮件" msgstr[0] "{0} 封邮件"
#: src/src/i2p/susi/webmail/WebMail.java:1282 #: src/src/i2p/susi/webmail/WebMail.java:1317
msgid "Show Message" msgid "Show Message"
msgstr "显示消息" msgstr "显示消息"
#: src/src/i2p/susi/webmail/WebMail.java:1344 #: src/src/i2p/susi/webmail/WebMail.java:1383
#, java-format #, java-format
msgid "Error decoding content: {0}" msgid "Error decoding content: {0}"
msgstr "解码错误：{0}" msgstr "解码错误：{0}"
#: src/src/i2p/susi/webmail/WebMail.java:1349 #: src/src/i2p/susi/webmail/WebMail.java:1388
msgid "Error decoding content: No encoder found." msgid "Error decoding content: No encoder found."
msgstr "内容解码错误：没有可用编码器。" msgstr "内容解码错误：没有可用编码器。"
#: src/src/i2p/susi/webmail/WebMail.java:1396 #: src/src/i2p/susi/webmail/WebMail.java:1435
msgid "no subject" msgid "no subject"
msgstr "没有主题" msgstr "没有主题"
#: src/src/i2p/susi/webmail/WebMail.java:1413 #: src/src/i2p/susi/webmail/WebMail.java:1452
msgid "Found no valid sender address." msgid "Found no valid sender address."
msgstr "没有找到有效的发件人地址。" msgstr "没有找到有效的发件人地址。"
#: src/src/i2p/susi/webmail/WebMail.java:1419 #: src/src/i2p/susi/webmail/WebMail.java:1458
#, java-format #, java-format
msgid "Found no valid address in \\''{0}\\''." msgid "Found no valid address in \\''{0}\\''."
msgstr "\\ '' {0} \\ ''中没有找到有效的地址。" msgstr "\\ '' {0} \\ ''中没有找到有效的地址。"
#: src/src/i2p/susi/webmail/WebMail.java:1438 #: src/src/i2p/susi/webmail/WebMail.java:1477
msgid "No recipients found." msgid "No recipients found."
msgstr "没有找到收件人。" msgstr "没有找到收件人。"
#: src/src/i2p/susi/webmail/WebMail.java:1445 #: src/src/i2p/susi/webmail/WebMail.java:1484
msgid "Quoted printable encoder not available." msgid "Quoted printable encoder not available."
msgstr "" msgstr "引文可打印编码器不可用。"
#: src/src/i2p/susi/webmail/WebMail.java:1450 #: src/src/i2p/susi/webmail/WebMail.java:1489
msgid "Header line encoder not available." msgid "Header line encoder not available."
msgstr "标题行编码器不可用。" msgstr "标题行编码器不可用。"
#: src/src/i2p/susi/webmail/WebMail.java:1501 #: src/src/i2p/susi/webmail/WebMail.java:1540
msgid "Mail sent." msgid "Mail sent."
msgstr "邮件已发送。" msgstr "邮件已发送。"
#: src/src/i2p/susi/webmail/WebMail.java:1540 #: src/src/i2p/susi/webmail/WebMail.java:1579
msgid "Send" msgid "Send"
msgstr "发送" msgstr "发送"
#: src/src/i2p/susi/webmail/WebMail.java:1541 #: src/src/i2p/susi/webmail/WebMail.java:1580
msgid "Cancel" msgid "Cancel"
msgstr "取消" msgstr "取消"
#: src/src/i2p/susi/webmail/WebMail.java:1542 #: src/src/i2p/susi/webmail/WebMail.java:1581
msgid "Delete Attachment" msgid "Delete Attachment"
msgstr "删除附件" msgstr "删除附件"
#: src/src/i2p/susi/webmail/WebMail.java:1543 #: src/src/i2p/susi/webmail/WebMail.java:1582
#: src/src/i2p/susi/webmail/WebMail.java:1637 #: src/src/i2p/susi/webmail/WebMail.java:1676
#: src/src/i2p/susi/webmail/WebMail.java:1718 #: src/src/i2p/susi/webmail/WebMail.java:1757
msgid "Reload Config" msgid "Reload Config"
msgstr "重新载入配置" msgstr "重新载入配置"
#: src/src/i2p/susi/webmail/WebMail.java:1544 #: src/src/i2p/susi/webmail/WebMail.java:1583
#: src/src/i2p/susi/webmail/WebMail.java:1638 #: src/src/i2p/susi/webmail/WebMail.java:1677
#: src/src/i2p/susi/webmail/WebMail.java:1719 #: src/src/i2p/susi/webmail/WebMail.java:1758
msgid "Logout" msgid "Logout"
msgstr "注销" msgstr "注销"
#: src/src/i2p/susi/webmail/WebMail.java:1567 #: src/src/i2p/susi/webmail/WebMail.java:1606
#: src/src/i2p/susi/webmail/WebMail.java:1723 #: src/src/i2p/susi/webmail/WebMail.java:1762
msgid "From:" msgid "From:"
msgstr "来自：" msgstr "来自："
#: src/src/i2p/susi/webmail/WebMail.java:1568 #: src/src/i2p/susi/webmail/WebMail.java:1607
msgid "To:" msgid "To:"
msgstr "致：" msgstr "致："
#: src/src/i2p/susi/webmail/WebMail.java:1569 #: src/src/i2p/susi/webmail/WebMail.java:1608
msgid "Cc:" msgid "Cc:"
msgstr "抄送：" msgstr "抄送："
#: src/src/i2p/susi/webmail/WebMail.java:1570 #: src/src/i2p/susi/webmail/WebMail.java:1609
msgid "Bcc:" msgid "Bcc:"
msgstr "密送：" msgstr "密送："
#: src/src/i2p/susi/webmail/WebMail.java:1571 #: src/src/i2p/susi/webmail/WebMail.java:1610
#: src/src/i2p/susi/webmail/WebMail.java:1725 #: src/src/i2p/susi/webmail/WebMail.java:1764
msgid "Subject:" msgid "Subject:"
msgstr "主题：" msgstr "主题："
#: src/src/i2p/susi/webmail/WebMail.java:1572 #: src/src/i2p/susi/webmail/WebMail.java:1611
msgid "Bcc to self" msgid "Bcc to self"
msgstr "密送给自己" msgstr "密送给自己"
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "New Attachment:" msgid "New Attachment:"
msgstr "新附件：" msgstr "新附件："
#: src/src/i2p/susi/webmail/WebMail.java:1575 #: src/src/i2p/susi/webmail/WebMail.java:1614
msgid "Upload File" msgid "Upload File"
msgstr "上传文件" msgstr "上传文件"
#: src/src/i2p/susi/webmail/WebMail.java:1581 #: src/src/i2p/susi/webmail/WebMail.java:1620
msgid "Attachments:" msgid "Attachments:"
msgstr "附件：" msgstr "附件："
#. current postman hq length limits 16/12, new postman version 32/32 #. current postman hq length limits 16/12, new postman version 32/32
#: src/src/i2p/susi/webmail/WebMail.java:1604 #: src/src/i2p/susi/webmail/WebMail.java:1643
msgid "User" msgid "User"
msgstr "用户" msgstr "用户"
#: src/src/i2p/susi/webmail/WebMail.java:1605 #: src/src/i2p/susi/webmail/WebMail.java:1644
msgid "Password" msgid "Password"
msgstr "通过" msgstr "密码"
#: src/src/i2p/susi/webmail/WebMail.java:1610 #: src/src/i2p/susi/webmail/WebMail.java:1649
msgid "Host" msgid "Host"
msgstr "主机" msgstr "主机"
#: src/src/i2p/susi/webmail/WebMail.java:1611 #: src/src/i2p/susi/webmail/WebMail.java:1650
msgid "POP3-Port" msgid "POP3-Port"
msgstr "POP3端口" msgstr "POP3端口"
#: src/src/i2p/susi/webmail/WebMail.java:1612 #: src/src/i2p/susi/webmail/WebMail.java:1651
msgid "SMTP-Port" msgid "SMTP-Port"
msgstr "SMTP端口" msgstr "SMTP端口"
#: src/src/i2p/susi/webmail/WebMail.java:1615 #: src/src/i2p/susi/webmail/WebMail.java:1654
msgid "Reset" msgid "Reset"
msgstr "复位" msgstr "复位"
#: src/src/i2p/susi/webmail/WebMail.java:1616 #: src/src/i2p/susi/webmail/WebMail.java:1655
msgid "Learn about I2P mail" msgid "Learn about I2P mail"
msgstr "" msgstr "了解 I2P 邮件"
#: src/src/i2p/susi/webmail/WebMail.java:1617 #: src/src/i2p/susi/webmail/WebMail.java:1656
msgid "Create Account" msgid "Create Account"
msgstr "创建帐户" msgstr "创建帐户"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Really delete the marked messages?" msgid "Really delete the marked messages?"
msgstr "真要删除标记的邮件？" msgstr "真要删除标记的邮件？"
#: src/src/i2p/susi/webmail/WebMail.java:1629 #: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Yes, really delete them!" msgid "Yes, really delete them!"
msgstr "是的，立刻删除！" msgstr "是的，立刻删除！"
#: src/src/i2p/susi/webmail/WebMail.java:1631 #: src/src/i2p/susi/webmail/WebMail.java:1670
#: src/src/i2p/susi/webmail/WebMail.java:1710 #: src/src/i2p/susi/webmail/WebMail.java:1749
msgid "New" msgid "New"
msgstr "新建" msgstr "新建"
#: src/src/i2p/susi/webmail/WebMail.java:1632 #: src/src/i2p/susi/webmail/WebMail.java:1671
#: src/src/i2p/susi/webmail/WebMail.java:1711 #: src/src/i2p/susi/webmail/WebMail.java:1750
msgid "Reply" msgid "Reply"
msgstr "回复" msgstr "回复"
#: src/src/i2p/susi/webmail/WebMail.java:1633 #: src/src/i2p/susi/webmail/WebMail.java:1672
#: src/src/i2p/susi/webmail/WebMail.java:1712 #: src/src/i2p/susi/webmail/WebMail.java:1751
msgid "Reply All" msgid "Reply All"
msgstr "回复所有人" msgstr "回复所有人"
#: src/src/i2p/susi/webmail/WebMail.java:1634 #: src/src/i2p/susi/webmail/WebMail.java:1673
#: src/src/i2p/susi/webmail/WebMail.java:1713 #: src/src/i2p/susi/webmail/WebMail.java:1752
msgid "Forward" msgid "Forward"
msgstr "转寄" msgstr "转寄"
#: src/src/i2p/susi/webmail/WebMail.java:1635 #: src/src/i2p/susi/webmail/WebMail.java:1674
#: src/src/i2p/susi/webmail/WebMail.java:1714 #: src/src/i2p/susi/webmail/WebMail.java:1753
msgid "Delete" msgid "Delete"
msgstr "删除" msgstr "删除"
#: src/src/i2p/susi/webmail/WebMail.java:1636 #: src/src/i2p/susi/webmail/WebMail.java:1675
msgid "Check Mail" msgid "Check Mail"
msgstr "检查邮件" msgstr "检查邮件"
#: src/src/i2p/susi/webmail/WebMail.java:1640 #: src/src/i2p/susi/webmail/WebMail.java:1679
msgid "Sender" msgid "Sender"
msgstr "寄件人" msgstr "寄件人"
#: src/src/i2p/susi/webmail/WebMail.java:1641 #: src/src/i2p/susi/webmail/WebMail.java:1680
msgid "Subject" msgid "Subject"
msgstr "主题" msgstr "主题"
#: src/src/i2p/susi/webmail/WebMail.java:1642 #: src/src/i2p/susi/webmail/WebMail.java:1681
msgid "Date" msgid "Date"
msgstr "日期" msgstr "日期"
#: src/src/i2p/susi/webmail/WebMail.java:1643 #: src/src/i2p/susi/webmail/WebMail.java:1682
msgid "Size" msgid "Size"
msgstr "大小" msgstr "大小"
#: src/src/i2p/susi/webmail/WebMail.java:1669 #: src/src/i2p/susi/webmail/WebMail.java:1708
#, java-format #, java-format
msgid "1 Byte" msgid "1 Byte"
msgid_plural "{0} Bytes" msgid_plural "{0} Bytes"
msgstr[0] "{0} 字节" msgstr[0] "{0} 字节"
#: src/src/i2p/susi/webmail/WebMail.java:1674 #: src/src/i2p/susi/webmail/WebMail.java:1713
msgid "Mark All" msgid "Mark All"
msgstr "全部标记" msgstr "全部标记"
#: src/src/i2p/susi/webmail/WebMail.java:1675 #: src/src/i2p/susi/webmail/WebMail.java:1714
msgid "Invert Selection" msgid "Invert Selection"
msgstr "反向选择" msgstr "反向选择"
#: src/src/i2p/susi/webmail/WebMail.java:1676 #: src/src/i2p/susi/webmail/WebMail.java:1715
msgid "Clear" msgid "Clear"
msgstr "清除" msgstr "清除"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
msgid "First" msgid "First"
msgstr "第一页" msgstr "第一页"
#: src/src/i2p/susi/webmail/WebMail.java:1679 #: src/src/i2p/susi/webmail/WebMail.java:1718
#: src/src/i2p/susi/webmail/WebMail.java:1680 #: src/src/i2p/susi/webmail/WebMail.java:1719
#: src/src/i2p/susi/webmail/WebMail.java:1715 #: src/src/i2p/susi/webmail/WebMail.java:1754
msgid "Previous" msgid "Previous"
msgstr "上一页" msgstr "上一页"
#: src/src/i2p/susi/webmail/WebMail.java:1681 #: src/src/i2p/susi/webmail/WebMail.java:1720
#, java-format #, java-format
msgid "Page {0} of {1}" msgid "Page {0} of {1}"
msgstr "第{0}页 共{1}页" msgstr "第{0}页 共{1}页"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
msgid "Last" msgid "Last"
msgstr "最后一页" msgstr "最后一页"
#: src/src/i2p/susi/webmail/WebMail.java:1683 #: src/src/i2p/susi/webmail/WebMail.java:1722
#: src/src/i2p/susi/webmail/WebMail.java:1684 #: src/src/i2p/susi/webmail/WebMail.java:1723
#: src/src/i2p/susi/webmail/WebMail.java:1716 #: src/src/i2p/susi/webmail/WebMail.java:1755
msgid "Next" msgid "Next"
msgstr "下一页" msgstr "下一页"
#: src/src/i2p/susi/webmail/WebMail.java:1687 #: src/src/i2p/susi/webmail/WebMail.java:1726
msgid "Pagesize:" msgid "Pagesize:"
msgstr "每页容量：" msgstr "每页容量："
#: src/src/i2p/susi/webmail/WebMail.java:1688 #: src/src/i2p/susi/webmail/WebMail.java:1727
msgid "Set" msgid "Set"
msgstr "设置" msgstr "设置"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Really delete this message?" msgid "Really delete this message?"
msgstr "真的要删除此邮件？" msgstr "真的要删除此邮件？"
#: src/src/i2p/susi/webmail/WebMail.java:1698 #: src/src/i2p/susi/webmail/WebMail.java:1737
msgid "Yes, really delete it!" msgid "Yes, really delete it!"
msgstr "是的，立刻删除！" msgstr "是的，立刻删除！"
#: src/src/i2p/susi/webmail/WebMail.java:1717 #: src/src/i2p/susi/webmail/WebMail.java:1756
msgid "Back to Folder" msgid "Back to Folder"
msgstr "返回到文件夹" msgstr "返回到文件夹"
#: src/src/i2p/susi/webmail/WebMail.java:1724 #: src/src/i2p/susi/webmail/WebMail.java:1763
msgid "Date:" msgid "Date:"
msgstr "日期：" msgstr "日期："
#: src/src/i2p/susi/webmail/WebMail.java:1735 #: src/src/i2p/susi/webmail/WebMail.java:1774
msgid "Could not fetch mail." msgid "Could not fetch mail."
msgstr "无法收取邮件。" msgstr "无法收取邮件。"

45
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -170,6 +170,7 @@ public class WebMail extends HttpServlet
private static final String RC_PROP_THEME = "routerconsole.theme"; private static final String RC_PROP_THEME = "routerconsole.theme";
private static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme"; private static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
private static final String RC_PROP_FORCE_MOBILE_CONSOLE = "routerconsole.forceMobileConsole";
private static final String CONFIG_THEME = "theme"; private static final String CONFIG_THEME = "theme";
private static final String DEFAULT_THEME = "light"; private static final String DEFAULT_THEME = "light";
@@ -324,6 +325,7 @@ public class WebMail extends HttpServlet
public ArrayList attachments; public ArrayList attachments;
public boolean reallyDelete; public boolean reallyDelete;
String themePath, imgPath; String themePath, imgPath;
boolean isMobile;
SessionObject() SessionObject()
@@ -1183,6 +1185,36 @@ public class WebMail extends HttpServlet
} }
return sessionObject; return sessionObject;
} }
/**
* Copied from net.i2p.router.web.CSSHelper
* @since 0.9.7
*/
private static boolean isMobile(String ua) {
return
// text
(ua.startsWith("Lynx") || ua.startsWith("w3m") ||
ua.startsWith("ELinks") || ua.startsWith("Links") ||
ua.startsWith("Dillo") ||
// mobile
// http://www.zytrax.com/tech/web/mobile_ids.html
// Android tablet UAs don't have "Mobile" in them
(ua.contains("Android") && ua.contains("Mobile")) ||
ua.contains("iPhone") ||
ua.contains("iPod") || ua.contains("iPad") ||
ua.contains("Kindle") || ua.contains("Mobile") ||
ua.contains("Nintendo Wii") ||
ua.contains("Opera Mini") || ua.contains("Opera Mobi") ||
ua.contains("Palm") ||
ua.contains("PLAYSTATION") || ua.contains("Playstation") ||
ua.contains("Profile/MIDP-") || ua.contains("SymbianOS") ||
ua.contains("Windows CE") || ua.contains("Windows Phone") ||
ua.startsWith("BlackBerry") || ua.startsWith("DoCoMo") ||
ua.startsWith("Nokia") || ua.startsWith("OPWV-SDK") ||
ua.startsWith("MOT-") || ua.startsWith("SAMSUNG-") ||
ua.startsWith("nook") || ua.startsWith("SCH-") ||
ua.startsWith("SEC-") || ua.startsWith("SonyEricsson") ||
ua.startsWith("Vodafone"));
}
/** /**
* *
* @param httpRequest * @param httpRequest
@@ -1210,6 +1242,8 @@ public class WebMail extends HttpServlet
theme = DEFAULT_THEME; theme = DEFAULT_THEME;
} }
} }
boolean forceMobileConsole = ctx.getBooleanProperty(RC_PROP_FORCE_MOBILE_CONSOLE);
boolean isMobile = (forceMobileConsole || isMobile(httpRequest.getHeader("User-Agent")));
httpRequest.setCharacterEncoding("UTF-8"); httpRequest.setCharacterEncoding("UTF-8");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
@@ -1232,6 +1266,7 @@ public class WebMail extends HttpServlet
sessionObject.showAttachment = null; sessionObject.showAttachment = null;
sessionObject.themePath = "/themes/susimail/" + theme + '/'; sessionObject.themePath = "/themes/susimail/" + theme + '/';
sessionObject.imgPath = sessionObject.themePath + "images/"; sessionObject.imgPath = sessionObject.themePath + "images/";
sessionObject.isMobile = isMobile;
processStateChangeButtons( sessionObject, request ); processStateChangeButtons( sessionObject, request );
@@ -1290,8 +1325,12 @@ public class WebMail extends HttpServlet
"<head>\n" + "<head>\n" +
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
"<title>susimail - " + subtitle + "</title>\n" + "<title>susimail - " + subtitle + "</title>\n" +
"<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css\">\n" + "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css\">\n" );
"</head>\n<body>\n" + if (sessionObject.isMobile ) {
out.println( "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes\" />\n" +
"<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "mobile.css\" />\n" );
}
out.println( "</head>\n<body>\n" +
"<div class=\"page\"><p><img src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"><br>&nbsp;</p>\n" + "<div class=\"page\"><p><img src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"><br>&nbsp;</p>\n" +
"<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" ); "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\">" );
@@ -1635,7 +1674,7 @@ public class WebMail extends HttpServlet
button( DELETE, _("Delete") ) + spacer + button( DELETE, _("Delete") ) + spacer +
button( REFRESH, _("Check Mail") ) + spacer + button( REFRESH, _("Check Mail") ) + spacer +
button( RELOAD, _("Reload Config") ) + spacer + button( RELOAD, _("Reload Config") ) + spacer +
button( LOGOUT, _("Logout") ) + "<table cellspacing=\"0\" cellpadding=\"5\">\n" + button( LOGOUT, _("Logout") ) + "<table id=\"mailbox\" cellspacing=\"0\" cellpadding=\"5\">\n" +
"<tr><td colspan=\"8\"><hr></td></tr>\n<tr>" + "<tr><td colspan=\"8\"><hr></td></tr>\n<tr>" +
thSpacer + "<th>" + sortHeader( SORT_SENDER, _("Sender"), sessionObject.imgPath ) + "</th>" + thSpacer + "<th>" + sortHeader( SORT_SENDER, _("Sender"), sessionObject.imgPath ) + "</th>" +
thSpacer + "<th>" + sortHeader( SORT_SUBJECT, _("Subject"), sessionObject.imgPath ) + "</th>" + thSpacer + "<th>" + sortHeader( SORT_SUBJECT, _("Subject"), sessionObject.imgPath ) + "</th>" +

15
core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java
View File

@@ -139,13 +139,18 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl
long before = System.currentTimeMillis(); long before = System.currentTimeMillis();
doFill(aBuff.buffer); doFill(aBuff.buffer);
long after = System.currentTimeMillis(); long after = System.currentTimeMillis();
boolean shouldWait = _fullBuffers.size() > 1;
_fullBuffers.offer(aBuff); _fullBuffers.offer(aBuff);
_context.statManager().addRateData("prng.bufferFillTime", after - before, 0); _context.statManager().addRateData("prng.bufferFillTime", after - before, 0);
Thread.yield(); if (shouldWait) {
long waitTime = (after-before)*5; Thread.yield();
if (waitTime <= 0) // somehow postman saw waitTime show up as negative long waitTime = (after-before)*5;
waitTime = 50; if (waitTime <= 0) // somehow postman saw waitTime show up as negative
try { Thread.sleep(waitTime); } catch (InterruptedException ie) {} waitTime = 50;
else if (waitTime > 5000)
waitTime = 5000;
try { Thread.sleep(waitTime); } catch (InterruptedException ie) {}
}
} }
} }

2
core/java/src/net/i2p/CoreVersion.java
View File

@@ -16,7 +16,7 @@ package net.i2p;
public class CoreVersion { public class CoreVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = "0.9.6"; public final static String VERSION = "0.9.7";
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION); System.out.println("I2P Core version: " + VERSION);

32
core/java/src/net/i2p/util/FortunaRandomSource.java
View File

@@ -262,27 +262,23 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste
} }
} }
/***** /**
* Outputs to stdout for dieharder:
* <code>
* java -cp build/i2p.jar net.i2p.util.FortunaRandomSource | dieharder -a -g 200
* </code>
*/
public static void main(String args[]) { public static void main(String args[]) {
try { try {
RandomSource rand = I2PAppContext.getGlobalContext().random(); java.util.Properties props = new java.util.Properties();
if (true) { props.setProperty("prng.buffers", "12");
for (int i = 0; i < 1000; i++) I2PAppContext ctx = new I2PAppContext(props);
if (rand.nextFloat() < 0) RandomSource rand = ctx.random();
throw new RuntimeException("negative!"); byte[] buf = new byte[65536];
System.out.println("All positive"); while (true) {
return; rand.nextBytes(buf);
System.out.write(buf);
} }
java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
java.util.zip.GZIPOutputStream gos = new java.util.zip.GZIPOutputStream(baos);
for (int i = 0; i < 1024*1024; i++) {
int c = rand.nextInt(256);
gos.write((byte)c);
}
gos.finish();
byte compressed[] = baos.toByteArray();
System.out.println("Compressed size of 1MB: " + compressed.length);
} catch (Exception e) { e.printStackTrace(); } } catch (Exception e) { e.printStackTrace(); }
} }
*****/
} }

16
debian/changelog vendored
View File

@@ -1,3 +1,19 @@
i2p (0.9.7-2) unstable; urgency=low
* Bugfix: Add missing ; to i2prouter script.
* Test scripts with "sh -n" in the build target
-- Kill Your TV <killyourtv@i2pmail.org> Tue, 16 Jul 2013 11:08:48 +0000
i2p (0.9.7-1) unstable; urgency=low
* New upstream release
* debconf:
- New Chinese, Portuguese, and Turkish translations
- Russian translation updates
-- Kill Your TV <killyourtv@i2pmail.org> Mon, 15 Jul 2013 19:35:09 +0000
i2p (0.9.6-1) unstable; urgency=low i2p (0.9.6-1) unstable; urgency=low
* New upstream release * New upstream release

45
debian/patches/0001-path-substitution.patch vendored
View File

@@ -41,7 +41,7 @@ Debian wrapper.config to try to prevent confusion.
-# should have been replaced by the izpack installer. -# should have been replaced by the izpack installer.
-# If you did not run the installer, replace them with the appropriate paths. -# If you did not run the installer, replace them with the appropriate paths.
-I2P="%INSTALL_PATH" -I2P="%INSTALL_PATH"
-if [ "`uname -s`" == "Darwin" ]; then -if [ "`uname -s`" = "Darwin" ]; then
- if [ -d "%USER_HOME/Library/Application Support" ]; then - if [ -d "%USER_HOME/Library/Application Support" ]; then
- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" - I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
- else - else
@@ -158,7 +158,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1866,24 +1809,9 @@ @@ -1866,24 +1809,10 @@
status status
;; ;;
@@ -183,6 +183,7 @@ Debian wrapper.config to try to prevent confusion.
+ 'install' | 'remove' | 'uninstall') + 'install' | 'remove' | 'uninstall')
+ echo "Use \"dpkg-reconfigure i2p\" to configure the initscript." + echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
+ exit 1 + exit 1
+ ;;
'dump') 'dump')
checkUser "" "$COMMAND" checkUser "" "$COMMAND"
@@ -439,3 +440,43 @@ Debian wrapper.config to try to prevent confusion.
-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true" -msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true" +msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
--- a/installer/resources/locale/po/messages_zh.po
+++ b/installer/resources/locale/po/messages_zh.po
@@ -187,13 +187,13 @@
msgstr "请求Java转储(如果在运行)。"
#: ../i2prouter:1796
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "请编辑 /etc/default/i2p 设置 RUN_AS_USER 变量"
#: ../i2prouter:1801
msgid "Running I2P as the root user is *not* recommended."
msgstr "推荐 *不要* 以 root 身份运行 I2P 。"
#: ../i2prouter:1804
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "要以root运行，请编辑 /etc/default/i2p 并设置 ALLOW_ROOT=true。"
--- a/installer/resources/locale/po/messages_tr.po
+++ b/installer/resources/locale/po/messages_tr.po
@@ -186,13 +186,13 @@
msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin."
#: ../i2prouter:1796
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "/etc/default/i2p dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"
#: ../i2prouter:1801
msgid "Running I2P as the root user is *not* recommended."
msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*."
#: ../i2prouter:1804
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."
+msgid "To run as root anyway, edit /etc/defalt/i2p and set ALLOW_ROOT=true."
+msgstr "Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."

80
debian/po/zh.po vendored Normal file
View File

@@ -0,0 +1,80 @@
# Chinese debconf translation
# Copyright (C) 2013 The I2P Project
# This file is distributed under the same license as the i2p package.
#
# Translators:
# walking <waling@mail.i2p>, 2013
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2011-12-27 22:25+0000\n"
"PO-Revision-Date: 2013-07-11 06:58+0000\n"
"Last-Translator: xtoaster <zhazhenzhong@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/"
"language/zh_CN/)\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: boolean
#. Description
#: ../i2p.templates:2001
msgid "Should the I2P router be started at boot?"
msgstr "您是否希望 I2P 随系统启动？"
#. Type: boolean
#. Description
#: ../i2p.templates:2001
msgid ""
"The I2P router can be run as a daemon that starts automatically when your "
"computer boots up. This is the recommended configuration."
msgstr "I2P 可以作为后台服务系统启动时自动运行，此项为推荐设置。"
#. Type: string
#. Description
#: ../i2p.templates:3001
msgid "I2P daemon user:"
msgstr "运行I2P服务的账户："
#. Type: string
#. Description
#: ../i2p.templates:3001
msgid ""
"By default I2P is configured to run under the account i2psvc when running as "
"a daemon. To use an **existing** I2P profile you may enter a different "
"account name here. For example, if your previous I2P installation is at /"
"home/user/i2p, you may enter 'user' here."
msgstr ""
"I2P后台服务默认以i2psvc账户运行。要使用*已有*的I2P配置文件，您可以输入不同的"
"账户名。例如，如果您之前的I2P安装在 /home/user/i2p，此处可输入'user'。"
#. Type: string
#. Description
#: ../i2p.templates:3001
msgid ""
"Very important: If a user other than the default of 'i2psvc' is entered "
"here, the chosen username *MUST* already exist."
msgstr "重要：如果您输入默认'i2psvc'以外的账户，此账户务必已经存在。"
#. Type: string
#. Description
#: ../i2p.templates:4001
msgid "Memory that can be allocated to I2P:"
msgstr "I2P 可用最大内存："
#. Type: string
#. Description
#: ../i2p.templates:4001
msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
msgstr "I2P 默认最大内存128M。"
#. Type: string
#. Description
#: ../i2p.templates:4001
msgid ""
"High bandwidth routers, as well as routers with a lot of active torrents / "
"plugins, may need to have this value increased."
msgstr "高带宽路由节点及BT下载很多的节点，建议考虑放宽此限制。"

2
debian/rules vendored
View File

@@ -62,6 +62,8 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
endif endif
sh -n installer/resources/i2prouter || exit 1
sh -n installer/resources/runplain.sh || exit 1
TZ=UTC ant preppkg-unix javadoc TZ=UTC ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config echo router.updateDisabled=true > $(I2P)/router.config
mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper

19
history.txt
View File

@@ -1,3 +1,22 @@
2012-07-19 zzz
* PRNG:
- Don't delay the refiller if we need more (don't limit max output)
- Add FortunaRandomSource.main() to output to stdout for testing e.g. with dieharder
2012-07-19 zab
* Streaming:
- initialize streaming RTT from sample, trac #979, RFC 6298
- store rttDev in TCBCache
* 2013-07-15 0.9.7 released
2013-07-11 kytv
* Chinese, Russian, Spanish, and Turkish updates from Transifex
* Update geoip.txt based on Maxmind GeoLite Country database from 2013-07-02
2013-07-11 str4d
* susimail: Improvements to layout in mobile browsers
2013-07-06 zzz 2013-07-06 zzz
* TunnelPool: Don't reuse peers for exploratory tunnels * TunnelPool: Don't reuse peers for exploratory tunnels

2
installer/install.xml
View File

@@ -4,7 +4,7 @@
<info> <info>
<appname>i2p</appname> <appname>i2p</appname>
<appversion>0.9.6</appversion> <appversion>0.9.7</appversion>
<authors> <authors>
<author name="I2P" email="http://www.i2p2.de/"/> <author name="I2P" email="http://www.i2p2.de/"/>
</authors> </authors>

1
installer/resources/deletelist.txt
View File

@@ -3,6 +3,7 @@
certificates/r31453.ovh.net certificates/r31453.ovh.net
certificates/75.145.125.59.crt certificates/75.145.125.59.crt
certificates/forum.i2p2.de.crt certificates/forum.i2p2.de.crt
certificates/cowpuncher.drollette.com.crt
# old translated proxy error pages # old translated proxy error pages
docs/ahelper-conflict-header_ar.ht docs/ahelper-conflict-header_ar.ht
docs/ahelper-conflict-header_de.ht docs/ahelper-conflict-header_de.ht

107169
installer/resources/geoip.txt
View File

File diff suppressed because it is too large Load Diff

2
installer/resources/i2prouter
View File

@@ -29,7 +29,7 @@
# should have been replaced by the izpack installer. # should have been replaced by the izpack installer.
# If you did not run the installer, replace them with the appropriate paths. # If you did not run the installer, replace them with the appropriate paths.
I2P="%INSTALL_PATH" I2P="%INSTALL_PATH"
if [ "`uname -s`" == "Darwin" ]; then if [ "`uname -s`" = "Darwin" ]; then
if [ -d "%USER_HOME/Library/Application Support" ]; then if [ -d "%USER_HOME/Library/Application Support" ]; then
I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
else else

198
installer/resources/locale/po/messages_tr.po Normal file
View File

@@ -0,0 +1,198 @@
# I2P
# Copyright (C) 2012 The I2P Project
# This file is distributed under the same license as the routerconsole package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# Translators:
# Kaya Zeren <kayazeren@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
"POT-Creation-Date: 2013-07-04 16:43+0000\n"
"PO-Revision-Date: 2013-07-11 20:20+0000\n"
"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../i2prouter:203
msgid "Failed to load the wrapper"
msgstr "Sarıcı yüklenemedi"
#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037
#: ../i2prouter:1061
#, sh-format
msgid "$APP_LONG_NAME is already running."
msgstr "$APP_LONG_NAME zaten çalışıyor."
#: ../i2prouter:919
#, sh-format
msgid "Running $APP_LONG_NAME"
msgstr "$APP_LONG_NAME çalışıyor"
#: ../i2prouter:942
#, sh-format
msgid "Waiting for $APP_LONG_NAME"
msgstr "$APP_LONG_NAME bekleniyor"
#: ../i2prouter:989
#, sh-format
msgid "WARNING: $APP_LONG_NAME may have failed to start."
msgstr "DİKKAT: $APP_LONG_NAME başlatılamamış olabilir."
#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529
msgid "Must be root to perform this action."
msgstr "Bu işlemi ancak root yapabilir."
#: ../i2prouter:1047
#, sh-format
msgid "Starting $APP_LONG_NAME"
msgstr "$APP_LONG_NAME başlatılıyor"
#: ../i2prouter:1072
#, sh-format
msgid "Stopping $APP_LONG_NAME"
msgstr "$APP_LONG_NAME durduruluyor"
#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697
#, sh-format
msgid "$APP_LONG_NAME was not running."
msgstr "$APP_LONG_NAME çalışmıyordu."
#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167
#, sh-format
msgid "Unable to stop $APP_LONG_NAME."
msgstr "$APP_LONG_NAME durdurulamıyor."
#: ../i2prouter:1115
#, sh-format
msgid "Waiting for $APP_LONG_NAME to exit"
msgstr "$APP_LONG_NAME kapanması bekleniyor"
#: ../i2prouter:1129
#, sh-format
msgid "Failed to stop $APP_LONG_NAME."
msgstr "$APP_LONG_NAME durdurulamadı."
#: ../i2prouter:1132
#, sh-format
msgid "Stopped $APP_LONG_NAME."
msgstr "$APP_LONG_NAME durduruldu."
#: ../i2prouter:1140
#, sh-format
msgid "Stopping $APP_LONG_NAME gracefully"
msgstr "$APP_LONG_NAME düzgün şekilde kapatıldı"
#: ../i2prouter:1186
#, sh-format
msgid "$APP_LONG_NAME is not running."
msgstr "$APP_LONG_NAME çalışmıyor."
#: ../i2prouter:1191
#, sh-format
msgid "$APP_LONG_NAME is running: PID:$pid"
msgstr "$APP_LONG_NAME çalışıyor: PID:$pid"
#: ../i2prouter:1194
#, sh-format
msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
msgstr "$APP_LONG_NAME çalışıyor: PID:$pid, Sarıcı:$STATUS, Java:$JAVASTATUS"
#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295
#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410
#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511
#, sh-format
msgid "The $APP_LONG_NAME daemon is already installed."
msgstr "$APP_LONG_NAME arka plan hizmeti zaten yüklenmiş."
#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399
#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479
#: ../i2prouter:1514
#, sh-format
msgid "Installing the $APP_LONG_NAME daemon"
msgstr "$APP_LONG_NAME arka plan hizmeti yükleniyor"
#: ../i2prouter:1521
#, sh-format
msgid "Install not currently supported for $DIST_OS"
msgstr "$DIST_OS üzerine yükleme desteklenmiyor"
#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573
#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632
#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677
#, sh-format
msgid "Removing $APP_LONG_NAME daemon"
msgstr "$APP_LONG_NAME arka plan hizmeti kaldırılıyor"
#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577
#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626
#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682
#, sh-format
msgid "The $APP_LONG_NAME daemon is not currently installed."
msgstr "$APP_LONG_NAME arka plan hizmeti yüklü değil."
#: ../i2prouter:1686
#, sh-format
msgid "Remove not currently supported for $DIST_OS"
msgstr "$DIST_OS üzerinden kaldırma desteklenmiyor"
#: ../i2prouter:1773
msgid "Commands:"
msgstr "Komutlar:"
#: ../i2prouter:1774
msgid "Launch in the current console."
msgstr "Geçerli konsolda başlatın."
#: ../i2prouter:1775
msgid "Start in the background as a daemon process."
msgstr "Arka plan hizmeti olarak başlatın."
#: ../i2prouter:1776
msgid "Stop if running as a daemon or in another console."
msgstr "Arka plan hizmeti olarak ya da başka bir konsolda çalışıyorsa durdurun."
#: ../i2prouter:1777
msgid "Stop gracefully, may take up to 11 minutes."
msgstr "Uygun şekilde kapatın. 11 dakika sürebilir."
#: ../i2prouter:1778
msgid "Stop if running and then start."
msgstr "Çalışıyorsa durdurun ve başlatın."
#: ../i2prouter:1779
msgid "Restart only if already running."
msgstr "Yalnız zaten çalışıyorsa yeniden başlatın."
#: ../i2prouter:1780
msgid "Query the current status."
msgstr "Geçerli durumu öğrenin."
#: ../i2prouter:1781
msgid "Install to start automatically when system boots."
msgstr "Sistem açılırken kendiliğinden yüklensin."
#: ../i2prouter:1782
msgid "Uninstall."
msgstr "Kaldırın."
#: ../i2prouter:1783
msgid "Request a Java thread dump if running."
msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin."
#: ../i2prouter:1796
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"
#: ../i2prouter:1801
msgid "Running I2P as the root user is *not* recommended."
msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*."
#: ../i2prouter:1804
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr "Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."

199
installer/resources/locale/po/messages_zh.po Normal file
View File

@@ -0,0 +1,199 @@
# I2P
# Copyright (C) 2012 The I2P Project
# This file is distributed under the same license as the routerconsole package.
# To contribute translations, see http://www.i2p2.de/newdevelopers
#
# Translators:
# walking <waling@mail.i2p>, 2013
msgid ""
msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-11 21:39+0000\n"
"PO-Revision-Date: 2013-07-11 07:19+0000\n"
"Last-Translator: xtoaster <zhazhenzhong@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/"
"language/zh_CN/)\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../i2prouter:203
msgid "Failed to load the wrapper"
msgstr "封装程序载入失败"
#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037
#: ../i2prouter:1061
#, sh-format
msgid "$APP_LONG_NAME is already running."
msgstr "$APP_LONG_NAME 已运行。"
#: ../i2prouter:919
#, sh-format
msgid "Running $APP_LONG_NAME"
msgstr "正在运行 $APP_LONG_NAME"
#: ../i2prouter:942
#, sh-format
msgid "Waiting for $APP_LONG_NAME"
msgstr "正在等待 $APP_LONG_NAME"
#: ../i2prouter:989
#, sh-format
msgid "WARNING: $APP_LONG_NAME may have failed to start."
msgstr "警告：$APP_LONG_NAME 可能启动失败。"
#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529
msgid "Must be root to perform this action."
msgstr "root 才能执行此操作。"
#: ../i2prouter:1047
#, sh-format
msgid "Starting $APP_LONG_NAME"
msgstr "正在启动 $APP_LONG_NAME"
#: ../i2prouter:1072
#, sh-format
msgid "Stopping $APP_LONG_NAME"
msgstr "正在停止 $APP_LONG_NAME"
#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697
#, sh-format
msgid "$APP_LONG_NAME was not running."
msgstr "$APP_LONG_NAME 未运行"
#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167
#, sh-format
msgid "Unable to stop $APP_LONG_NAME."
msgstr "无法停止 $APP_LONG_NAME"
#: ../i2prouter:1115
#, sh-format
msgid "Waiting for $APP_LONG_NAME to exit"
msgstr "正在等待 $APP_LONG_NAME 退出"
#: ../i2prouter:1129
#, sh-format
msgid "Failed to stop $APP_LONG_NAME."
msgstr "无法停止 $APP_LONG_NAME。"
#: ../i2prouter:1132
#, sh-format
msgid "Stopped $APP_LONG_NAME."
msgstr "$APP_LONG_NAME 已停止。"
#: ../i2prouter:1140
#, sh-format
msgid "Stopping $APP_LONG_NAME gracefully"
msgstr "正在等待 $APP_LONG_NAME 自然关闭"
#: ../i2prouter:1186
#, sh-format
msgid "$APP_LONG_NAME is not running."
msgstr "$APP_LONG_NAME 未运行"
#: ../i2prouter:1191
#, sh-format
msgid "$APP_LONG_NAME is running: PID:$pid"
msgstr "$APP_LONG_NAME 已运行：PID:$pid"
#: ../i2prouter:1194
#, sh-format
msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
msgstr "$APP_LONG_NAME 已运行：PID:$pid, 封装:$STATUS, Java:$JAVASTATUS"
#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295
#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410
#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511
#, sh-format
msgid "The $APP_LONG_NAME daemon is already installed."
msgstr "后台服务 $APP_LONG_NAME 已运行。"
#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399
#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479
#: ../i2prouter:1514
#, sh-format
msgid "Installing the $APP_LONG_NAME daemon"
msgstr "正在安装后台服务 $APP_LONG_NAME"
#: ../i2prouter:1521
#, sh-format
msgid "Install not currently supported for $DIST_OS"
msgstr "暂不支持 $DIST_OS 平台上的安装"
#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573
#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632
#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677
#, sh-format
msgid "Removing $APP_LONG_NAME daemon"
msgstr "正在删除后台服务 $APP_LONG_NAME"
#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577
#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626
#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682
#, sh-format
msgid "The $APP_LONG_NAME daemon is not currently installed."
msgstr "后台服务 $APP_LONG_NAME 未安装。"
#: ../i2prouter:1686
#, sh-format
msgid "Remove not currently supported for $DIST_OS"
msgstr "暂不支持 $DIST_OS 平台上的删除"
#: ../i2prouter:1773
msgid "Commands:"
msgstr "命令："
#: ../i2prouter:1774
msgid "Launch in the current console."
msgstr "从当前控制台中启动。"
#: ../i2prouter:1775
msgid "Start in the background as a daemon process."
msgstr "作为服务进程从后台启动。"
#: ../i2prouter:1776
msgid "Stop if running as a daemon or in another console."
msgstr "关闭作为服务进程或从其他控制台启动的I2P。"
#: ../i2prouter:1777
msgid "Stop gracefully, may take up to 11 minutes."
msgstr "自然关闭，可以需要最多11分钟。"
#: ../i2prouter:1778
msgid "Stop if running and then start."
msgstr "先终止（如果运行）再启动。"
#: ../i2prouter:1779
msgid "Restart only if already running."
msgstr "重启(仅在已运行时)。"
#: ../i2prouter:1780
msgid "Query the current status."
msgstr "查询当前状态。"
#: ../i2prouter:1781
msgid "Install to start automatically when system boots."
msgstr "安装为随系统启动。"
#: ../i2prouter:1782
msgid "Uninstall."
msgstr "卸载。"
#: ../i2prouter:1783
msgid "Request a Java thread dump if running."
msgstr "请求Java转储(如果在运行)。"
#: ../i2prouter:1796
msgid "Please edit i2prouter and set the variable RUN_AS_USER"
msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量"
#: ../i2prouter:1801
msgid "Running I2P as the root user is *not* recommended."
msgstr "推荐 *不要* 以 root 身份运行 I2P 。"
#: ../i2prouter:1804
msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。"

13
installer/resources/themes/susimail/dark/mobile.css Normal file
View File

@@ -0,0 +1,13 @@
#mailbox tr, #mailbox td {
display: block;
}
#mailbox th {
position: absolute;
top: -9999px;
left: -9999px;
}
#mailbox .optbox {
float: left;
}

13
installer/resources/themes/susimail/light/mobile.css Normal file
View File

@@ -0,0 +1,13 @@
#mailbox tr, #mailbox td {
display: block;
}
#mailbox th {
position: absolute;
top: -9999px;
left: -9999px;
}
#mailbox .optbox {
float: left;
}

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

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