merge of '59ab6afe6ba2e217124fe55e8d854d0e04b965c4'

and '6cf70779bcd05bcf782d6d7bb8d131ce8d71426f'
This commit is contained in:
dev
2010-03-15 19:01:07 +00:00
6 changed files with 113 additions and 67 deletions

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2psnark\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-02-23 08:02+0000\n"
"PO-Revision-Date: 2010-02-23 08:27+0000\n"
"POT-Creation-Date: 2010-03-13 09:42+0000\n"
"PO-Revision-Date: 2010-03-13 09:44+0000\n"
"Last-Translator: 4get <forget@mail.i2p>\n"
"Language-Team: foo <foo@bar>\n"
"MIME-Version: 1.0\n"
@@ -114,92 +114,97 @@ msgstr "Ошибка соединения с I2P, проверьте настр
msgid "Error: Could not add the torrent {0}"
msgstr "Ошибка: Не удалось добавить торрент {0}"
#: ../java/src/org/klomp/snark/SnarkManager.java:434
#: ../java/src/org/klomp/snark/SnarkManager.java:430
#, java-format
msgid "Cannot open \"{0}\""
msgstr "Не удалось открыть \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:443
#, java-format
msgid "Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open trackers only"
msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, будут использоваться только открытые i2p трекеры"
#: ../java/src/org/klomp/snark/SnarkManager.java:436
#: ../java/src/org/klomp/snark/SnarkManager.java:445
#, java-format
msgid "Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are disabled, you must enable open trackers before starting the torrent!"
msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, однако использование открытых i2p трекеров отключено, Вы должны включить поддержку открытых i2p трекеров перед запуском этого торрента!"
#: ../java/src/org/klomp/snark/SnarkManager.java:455
#: ../java/src/org/klomp/snark/SnarkManager.java:464
#, java-format
msgid "Torrent in \"{0}\" is invalid"
msgstr "Торрент в \"{0}\" некорректен"
#: ../java/src/org/klomp/snark/SnarkManager.java:470
#: ../java/src/org/klomp/snark/SnarkManager.java:479
#, java-format
msgid "Torrent added and started: \"{0}\""
msgstr "Торрент добавлен и запущен: \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:472
#: ../java/src/org/klomp/snark/SnarkManager.java:481
#, java-format
msgid "Torrent added: \"{0}\""
msgstr "Торрент добавлен: \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:569
#: ../java/src/org/klomp/snark/SnarkManager.java:578
#, java-format
msgid "Too many files in \"{0}\" ({1}), deleting it!"
msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!"
#: ../java/src/org/klomp/snark/SnarkManager.java:571
#: ../java/src/org/klomp/snark/SnarkManager.java:580
#, java-format
msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!"
#: ../java/src/org/klomp/snark/SnarkManager.java:573
#: ../java/src/org/klomp/snark/SnarkManager.java:582
#, java-format
msgid "No pieces in \"{0}\", deleting it!"
msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!"
#: ../java/src/org/klomp/snark/SnarkManager.java:575
#: ../java/src/org/klomp/snark/SnarkManager.java:584
#, java-format
msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
msgstr "Слишком много частей в торренте \"{0}\" (наш предел {1}), удаляем его!"
#: ../java/src/org/klomp/snark/SnarkManager.java:577
#: ../java/src/org/klomp/snark/SnarkManager.java:586
#, java-format
msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
msgstr "Слишком крупные части в торренте \"{0}\" ({1}B), удаляем его."
#: ../java/src/org/klomp/snark/SnarkManager.java:578
#: ../java/src/org/klomp/snark/SnarkManager.java:587
#, java-format
msgid "Limit is {0}B"
msgstr "Наш предел {0}B"
#: ../java/src/org/klomp/snark/SnarkManager.java:586
#: ../java/src/org/klomp/snark/SnarkManager.java:595
#, java-format
msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
msgstr "Торренты крупнее чем {0}B пока не поддерживается, удаляем \"{1}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:602
#: ../java/src/org/klomp/snark/SnarkManager.java:611
#, java-format
msgid "Error: Could not remove the torrent {0}"
msgstr "Ошибка: Невозможно удалить торрент {0}"
#: ../java/src/org/klomp/snark/SnarkManager.java:623
#: ../java/src/org/klomp/snark/SnarkManager.java:632
#, java-format
msgid "Torrent stopped: \"{0}\""
msgstr "Торрент остановлен: \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:638
#: ../java/src/org/klomp/snark/SnarkManager.java:647
#, java-format
msgid "Torrent removed: \"{0}\""
msgstr "Торрент удален: \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:671
#: ../java/src/org/klomp/snark/SnarkManager.java:680
#, java-format
msgid "Download finished: \"{0}\""
msgstr "Завершена загрузка: \"{0}\""
#: ../java/src/org/klomp/snark/SnarkManager.java:671
#: ../java/src/org/klomp/snark/SnarkManager.java:680
#, java-format
msgid "size: {0}B"
msgstr "размер: {0}B"
#: ../java/src/org/klomp/snark/SnarkManager.java:699
#: ../java/src/org/klomp/snark/SnarkManager.java:708
msgid "Unable to connect to I2P!"
msgstr "Не удалось установить соединение с I2P!"

View File

@@ -39,8 +39,10 @@ public class IndexBean {
private String _action;
private int _tunnel;
private long _prevNonce;
private long _prevNonce2;
private long _curNonce;
private long _nextNonce;
/** deprecated unimplemented, now using routerconsole realm */
private String _passphrase;
private String _type;
@@ -79,8 +81,10 @@ public class IndexBean {
public static final int NOT_RUNNING = 3;
public static final int STANDBY = 4;
/** deprecated unimplemented, now using routerconsole realm */
public static final String PROP_TUNNEL_PASSPHRASE = "i2ptunnel.passphrase";
static final String PROP_NONCE = IndexBean.class.getName() + ".nonce";
static final String PROP_NONCE_OLD = PROP_NONCE + '2';
static final String CLIENT_NICKNAME = "shared clients";
public static final String PROP_THEME_NAME = "routerconsole.theme";
@@ -96,10 +100,16 @@ public class IndexBean {
_tunnel = -1;
_curNonce = -1;
_prevNonce = -1;
_prevNonce2 = -1;
try {
String nonce2 = System.getProperty(PROP_NONCE_OLD);
if (nonce2 != null)
_prevNonce2 = Long.parseLong(nonce2);
String nonce = System.getProperty(PROP_NONCE);
if (nonce != null)
if (nonce != null) {
_prevNonce = Long.parseLong(nonce);
System.setProperty(PROP_NONCE_OLD, nonce);
}
} catch (NumberFormatException nfe) {}
_nextNonce = _context.random().nextLong();
System.setProperty(PROP_NONCE, Long.toString(_nextNonce));
@@ -117,6 +127,7 @@ public class IndexBean {
}
}
/** deprecated unimplemented, now using routerconsole realm */
public void setPassphrase(String phrase) {
_passphrase = phrase;
}
@@ -134,6 +145,7 @@ public class IndexBean {
}
}
/** deprecated unimplemented, now using routerconsole realm */
private boolean validPassphrase(String proposed) {
if (proposed == null) return false;
String pass = _context.getProperty(PROP_TUNNEL_PASSPHRASE);
@@ -146,7 +158,7 @@ public class IndexBean {
private String processAction() {
if ( (_action == null) || (_action.trim().length() <= 0) || ("Cancel".equals(_action)))
return "";
if ( (_prevNonce != _curNonce) && (!validPassphrase(_passphrase)) )
if ( (_prevNonce != _curNonce) && (_prevNonce2 != _curNonce) && (!validPassphrase(_passphrase)) )
return "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.";
if ("Stop all".equals(_action))
return stopAll();

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P i2ptunnel\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-04 09:53+0000\n"
"PO-Revision-Date: 2010-03-04 12:28+0000\n"
"POT-Creation-Date: 2010-03-06 00:05+0000\n"
"PO-Revision-Date: 2010-03-06 00:08+0000\n"
"Last-Translator: 4get <forget@mail.i2p>\n"
"Language-Team: foo <foo@bar>\n"
"MIME-Version: 1.0\n"
@@ -26,51 +26,55 @@ msgstr "Для перехода по ссылке из локальной адр
msgid "Click a link below to look for an address helper by using a \"jump\" service:"
msgstr "Jump-сервисы, которые, возможно, знают нужную Вам addresshelper-ссылку:"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:362
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:363
msgid "New Tunnel"
msgstr "Новый туннель"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:382
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:383
msgid "Standard client"
msgstr "Обычный клиент"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:383
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:384
msgid "HTTP client"
msgstr "HTTP-клиент"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:384
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:385
msgid "IRC client"
msgstr "IRC-клиент"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:385
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:386
msgid "Standard server"
msgstr "Обычный сервер"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:386
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:387
msgid "HTTP server"
msgstr "HTTP-сервер"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:387
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:388
msgid "SOCKS 4/4a/5 proxy"
msgstr "SOCKS 4/4a/5 прокси"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:388
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
msgid "SOCKS IRC proxy"
msgstr "SOCKS IRC прокси"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
msgid "CONNECT/SSL/HTTPS proxy"
msgstr "CONNECT/SSL/HTTPS прокси"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
msgid "IRC server"
msgstr "IRC-сервер"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:390
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
msgid "Streamr client"
msgstr "Streamr-клиент"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:391
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:393
msgid "Streamr server"
msgstr "Streamr-сервер"
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392
#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:394
msgid "HTTP bidir"
msgstr "HTTP bidir (экспериментальный двунаправленный режим, инструкцию спрашивайте у sponge)"
@@ -105,7 +109,7 @@ msgstr "Тип"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:120
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:120
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:226
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:357
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:358
msgid "Description"
msgstr "Описание"
@@ -638,12 +642,12 @@ msgid "New server tunnel"
msgstr "Новый серверный туннель"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:236
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:368
msgid "Standard"
msgstr "Стандартный"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:369
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:370
msgid "Create"
msgstr "Создать"
@@ -661,15 +665,15 @@ msgid "Standby"
msgstr "Режим ожидания"
# This term intentionally left in English
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:345
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346
msgid "Outproxy"
msgstr "Outproxy"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:349
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:350
msgid "Destination"
msgstr "Адрес назначения"
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:366
msgid "New client tunnel"
msgstr "Новый клиентский туннель"

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-04 09:52+0000\n"
"PO-Revision-Date: 2010-03-04 12:24+0000\n"
"POT-Creation-Date: 2010-03-06 00:05+0000\n"
"PO-Revision-Date: 2010-03-13 09:35+0000\n"
"Last-Translator: 4get <forget@mail.i2p>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,45 @@ msgstr "Принимаем туннели"
msgid "Rejecting tunnels"
msgstr "Не принимаем туннели"
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:46
msgid "Ensure that nothing blocks outbound HTTP, check <a href=logs.jsp>logs</a> and if nothing helps, read FAQ about reseeding manually."
msgstr "Убедитесь, что исходящие HTTP-запросы ничем не блокируются, загляните в <a href=logs.jsp>журналы ошибок</a> и если ничто не помогло, прочтите в FAQ инструкцию по начальной загрузке вручную."
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:78
msgid "Reseeding"
msgstr "Производится начальная загрузка"
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:142
msgid "Reseeding: fetching seed URL."
msgstr "Производится начальная загрузка: загружается URL каталога маршрутизаторов."
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:148
msgid "Last reseed failed fully (failed reading seed URL)."
msgstr "Предыдущая попытка начальной загрузки полностью провалилась (не удалось загрузить URL каталога маршрутизаторов)"
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174
msgid "Last reseed failed fully (no routerInfo URLs at seed URL)."
msgstr "Предыдущая попытка начальной загрузки полностью провалилась (не удалось найти список routerInfo-ссылок в загруженном каталоге)"
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:187
#, java-format
msgid "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
msgstr "Производится начальная загрузка: получение информации о маршрутизаторах ({0} удачно, {1} ошибок)."
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:208
#, java-format
msgid "Last reseed failed partly ({0}% of {1})."
msgstr "Предыдущая попытка начальной загрузки частично не удалась ({0}% из {1})."
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:213
#, java-format
msgid "Last reseed failed ({0}% of {1})."
msgstr "Предыдущая попытка начальной загрузки почти полностью провалилась ({0}% из {1})."
#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:223
msgid "Last reseed failed fully (exception caught)."
msgstr "Предыдущая попытка начальной загрузки полностью провалилась (произошла необрабатываемая ошибка)."
#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:70
msgid "No transports (hidden or starting up?)"
msgstr "Нет транспортных протоколов (в скрытом режиме или запущен недавно?)"
@@ -1104,21 +1143,10 @@ msgstr "Запустить"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:135
#: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49
#: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:61
msgid "Unsupported"
msgstr "Не поддерживается"
# This term intentionally left in English
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:150
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:166
msgid "desc"
msgstr "desc"
# This term intentionally left in English
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:161
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:176
msgid "name"
msgstr "name"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:181
msgid "New client added"
msgstr "Добавлен новый клиент"
@@ -1170,11 +1198,6 @@ msgstr "Не удалось запустить"
msgid "Failed to find server."
msgstr "Не удалось найти сервер."
# This term intentionally left in English
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:274
msgid "pluginURL"
msgstr "pluginURL"
#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:276
msgid "No plugin URL specified."
msgstr "Не указан URL загрузки плагина"
@@ -1968,6 +1991,10 @@ msgstr "Только скачать и проверить целостность
msgid "Download, verify, and restart"
msgstr "Скачать, проверить и обновить I2P"
#: ../java/src/net/i2p/router/web/FormHandler.java:163
msgid "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."
msgstr "Форма не принята, скорее всего это произошло из-за того, что Вы нажимали кнопку \"Назад\" или \"Обновить\" в браузере. Пожалуйста, заполните форму заново."
#: ../java/src/net/i2p/router/web/GraphHelper.java:128
msgid "Configure Graph Display"
msgstr "Настройка показа графиков"
@@ -4514,8 +4541,3 @@ msgstr "обзор туннелей"
msgid "I2P Tunnel Summary"
msgstr "Обзор туннелей I2P"
#~ msgid "Show the router's workload, and how it's performing"
#~ msgstr "Просмотр загрузки маршрутизатора и эффективности его работы"
#~ msgid "Jobs"
#~ msgstr "Задачи"

View File

@@ -1,3 +1,6 @@
2010-03-013 zzz
* Partial fix for i2ptunnel nonce troubles
2010-03-08 zzz
* Floodfills: Increase max to 60 (was 28) and min to 45 (was 20)
* i2psnark: Better track outgoing bandwidth by incrementing

View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10;
public final static long BUILD = 11;
/** for example "-test" */
public final static String EXTRA = "-rc";