diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index ccaab1e5c..4f83e8d30 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -2,6 +2,7 @@ - file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/BOB.java + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java index ee3f5937a..2c689f65d 100644 --- a/apps/BOB/src/net/i2p/BOB/BOB.java +++ b/apps/BOB/src/net/i2p/BOB/BOB.java @@ -256,11 +256,13 @@ public class BOB { listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST))); Socket server = null; listener.setSoTimeout(500); // .5 sec + while (spin.get()) { //DoCMDS connection; try { server = listener.accept(); + server.setKeepAlive(true); g = true; } catch (ConnectException ce) { g = false; diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java index 85dcf5b41..4c186700f 100644 --- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java +++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java @@ -102,6 +102,7 @@ public class I2PtoTCP implements Runnable { break die; } sock = new Socket(host, port); + sock.setKeepAlive(true); // make readers/writers in = sock.getInputStream(); out = sock.getOutputStream(); diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java index 714ee1e7f..154e2a4d1 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java +++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java @@ -78,6 +78,7 @@ public class TCPlistener implements Runnable { while (lives.get()) { try { server = listener.accept(); + server.setKeepAlive(true); g = true; } catch (SocketTimeoutException ste) { g = false; diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po index 3e7ab41b1..c21a81526 100644 --- a/apps/i2psnark/locale/messages_ru.po +++ b/apps/i2psnark/locale/messages_ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 03:19+0000\n" -"PO-Revision-Date: 2009-12-20 07:03+0000\n" +"POT-Creation-Date: 2010-01-14 06:24+0000\n" +"PO-Revision-Date: 2010-01-14 06:33+0000\n" "Last-Translator: 4get \n" "Language-Team: foo \n" "MIME-Version: 1.0\n" @@ -141,8 +141,8 @@ msgstr "Слишком много файлов в торренте \"{0}\" ({1}) #: ../java/src/org/klomp/snark/SnarkManager.java:564 #, java-format -msgid "Torrent file \"{0}\" cannot end in '.torrent', deleting it!" -msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на '.torrent', удаляем его!" +msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" +msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!" #: ../java/src/org/klomp/snark/SnarkManager.java:566 #, java-format @@ -291,13 +291,13 @@ msgid "Torrent file {0} does not exist" msgstr "Торрент {0} не существует" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:237 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:990 #, java-format msgid "Torrent already running: {0}" msgstr "Торрент уже запущен: {0}" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:239 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:988 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:992 #, java-format msgid "Torrent already in the queue: {0}" msgstr "Торрент уже в очереди: {0}" @@ -414,7 +414,7 @@ msgstr "ОшибкаТрекера" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:530 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 msgid "peers" msgstr "пир." @@ -454,7 +454,7 @@ msgid "Open file" msgstr "Открыть файл" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:779 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:781 msgid "Tracker" msgstr "Трекер" @@ -514,134 +514,134 @@ msgstr "Uninterested (У нас нужных этому пиру частей т msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части торрента)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:742 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:743 msgid "Add Torrent" msgstr "Добавить Торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:745 msgid "From URL" msgstr "Из URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:749 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:750 msgid "Add torrent" msgstr "Добавить торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:752 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:753 #, java-format msgid "Alternately, you can copy .torrent files to the directory {0}." msgstr "Ну или вы можете скопировать .torrent-файлы в директорию {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:754 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:755 msgid "Removing a .torrent file will cause the torrent to stop." msgstr "Удаление .torrent-файла приведет к остановке торрента." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:770 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:772 msgid "Create Torrent" msgstr "Создать Торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:773 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:775 msgid "Data to seed" msgstr "Файлы для раздачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:777 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:779 msgid "File or directory to seed (must be within the specified path)" msgstr "Файл или директория для раздачи (вводите только название файла или директории, указание абсолютных путей не поддерживается)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:781 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:783 msgid "Select a tracker" msgstr "Выбрать трекер" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796 msgid "or" msgstr "или" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:797 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799 msgid "Specify custom tracker announce URL" msgstr "Задать URL анонсера вручную" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:800 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:802 msgid "Create torrent" msgstr "Создать торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:817 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820 msgid "Configuration" msgstr "Настройки" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "Data directory" msgstr "Директория для файлов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826 msgid "Directory to store torrents and data" msgstr "Директория, где будут храниться торренты и загружаемые файлы" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828 msgid "Edit i2psnark.config and restart to change" msgstr "Для изменения отредактируйте файл i2psnark.config и перезагрузите I2PSnark" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:829 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:832 msgid "Auto start" msgstr "Автозапуск" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836 msgid "If checked, automatically start torrents that are added" msgstr "Автоматически запускать торренты после добавления" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:859 msgid "Total uploader limit" msgstr "Ограничение количества слотов отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Up bandwidth limit" msgstr "Ограничение скорости отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:869 msgid "Half available bandwidth recommended." msgstr "Рекомендуется использовать половину от доступной пропускной способности." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:871 msgid "View or change router bandwidth" msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:875 msgid "Use open trackers also" msgstr "Дополнительно использовать открытые трекеры" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:879 msgid "If checked, announce torrents to open trackers as well as the tracker listed in the torrent file" msgstr "Анонсировать торренты на открытых трекерах, дополнительно к тем, что указаны внутри торрента" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:880 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:883 msgid "Open tracker announce URLs" msgstr "URL открытых трекеров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:891 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:894 msgid "I2CP host" msgstr "Адрес I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:896 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:899 msgid "I2CP port" msgstr "Порт I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:909 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:912 msgid "I2CP options" msgstr "Параметры I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:917 msgid "Save configuration" msgstr "Сохранить настройки" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 #, java-format msgid "Torrent fetched from {0}" msgstr "Получен торрент из: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:994 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:998 #, java-format msgid "Torrent at {0} was not valid" msgstr "Торрент полученный из {0} некорректен" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:999 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1003 #, java-format msgid "Torrent was not retrieved from {0}" msgstr "Не удалось получить торрент из: {0}" diff --git a/apps/i2ptunnel/locale/messages_ru.po b/apps/i2ptunnel/locale/messages_ru.po index 593f7aa37..f6adb0096 100644 --- a/apps/i2ptunnel/locale/messages_ru.po +++ b/apps/i2ptunnel/locale/messages_ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2ptunnel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-02 04:59+0000\n" -"PO-Revision-Date: 2010-01-02 07:05+0000\n" +"POT-Creation-Date: 2010-01-14 06:24+0000\n" +"PO-Revision-Date: 2010-01-18 18:40+0000\n" "Last-Translator: 4get \n" "Language-Team: foo \n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Russian\n" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:430 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:436 #, java-format msgid "To visit the destination in your host database, click here. To visit the conflicting addresshelper link by temporarily giving it a random alias, click here." msgstr "Для перехода по ссылке из локальной адресной книги, нажмите здесь. Для перехода по новой addresshelper-ссылке с временным присвоением ей случайного имени, нажмите здесь." -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:800 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:802 msgid "Click a link below to look for an address helper by using a \"jump\" service:" msgstr "Jump-сервисы, которые, возможно, знают нужную Вам addresshelper-ссылку:" @@ -70,6 +70,10 @@ msgstr "Streamr-клиент" msgid "Streamr server" msgstr "Streamr-сервер" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:392 +msgid "HTTP bidir" +msgstr "HTTP bidir (экспериментальный двунаправленный режим, инструкцию спрашивайте у sponge)" + #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:73 msgid "I2P Tunnel Manager - Edit Client Tunnel" msgstr "Менеджер Туннелей I2P — Редактирование Клиентского Туннеля" @@ -112,6 +116,7 @@ msgstr "Точка доступа" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:130 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:132 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:167 msgid "Access Point" msgstr "Точка доступа" @@ -119,28 +124,34 @@ msgstr "Точка доступа" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:179 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:207 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:157 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:181 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:172 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:228 msgid "required" msgstr "*" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:150 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:142 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:183 msgid "Reachable by" msgstr "Кому будет доступно (Сетевой интерфейс)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:195 msgid "Locally (127.0.0.1)" msgstr "Только в пределах этого компьютера (127.0.0.1)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:199 msgid "Everyone (0.0.0.0)" msgstr "Всем (0.0.0.0)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:203 msgid "LAN Hosts (Please specify your LAN address)" msgstr "Только из локальной сети (Введите свой LAN-адрес)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:186 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:205 msgid "Other" msgstr "Адрес сетевого интерфейса" @@ -157,17 +168,17 @@ msgid "name or destination" msgstr "имя или адрес" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:190 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:237 msgid "Profile" msgstr "Режим" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:227 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:197 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:244 msgid "interactive connection" msgstr "оптимизировать для малых задержек (irc)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:231 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:201 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:248 msgid "bulk connection (downloads/websites/BT)" msgstr "оптимизировать для большого обьема (www/bittorrent)" @@ -198,7 +209,7 @@ msgid "(Check the Box for 'YES')" msgstr "(поставьте галочку для включения)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:253 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:219 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Advanced networking options" msgstr "Расширенные сетевые настройки" @@ -207,151 +218,151 @@ msgid "(NOTE: when this client proxy is configured to share tunnels, then these msgstr "(ПРИМЕЧАНИЕ: при коллективном использовании туннелей эти опции будут применяться ко всем коллективным прокси-клиентам!)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:257 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 msgid "Tunnel Options" msgstr "Параметры туннеля" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 msgid "Length" msgstr "Длина" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:266 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 msgid "0 hop tunnel (low anonymity, low latency)" msgstr "0 хопов (низкая анонимность, малые задержки)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:270 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 msgid "1 hop tunnel (medium anonymity, medium latency)" msgstr "1 хоп (умеренная анонимность, умеренные задержки)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:274 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:238 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 msgid "2 hop tunnel (high anonymity, high latency)" msgstr "2 хопа (высокая анонимность, высокие задержки)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:278 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:242 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 msgid "3 hop tunnel (very high anonymity, poor performance)" msgstr "3 хопа (очень высокая анонимность, низкая производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:287 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:298 msgid "hop tunnel (very poor performance)" msgstr "хопов (очень низкая производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:256 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303 msgid "Variance" msgstr "Разброс" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:299 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:263 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:310 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "нулевой разброс (без рандомизации, фиксированная производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:303 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:267 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:314 msgid "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "+ 0-1 разброс (умеренно повышенная рандомизация, пониженная производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:271 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:318 msgid "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "+ 0-2 разброс (сильно повышенная рандомизация, пониженная производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:275 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:322 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "+/- 0-1 разброс (стандартная рандомизация, стандартная производительность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:315 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:279 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:326 msgid "+/- 0-2 hop variance (not recommended)" msgstr "+/- 0-2 разброс (не рекомендуется)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:327 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:338 msgid "hop variance" msgstr "разброс" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:332 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:296 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:343 msgid "Count" msgstr "Количество" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:339 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:350 msgid "1 inbound, 1 outbound tunnel (low bandwidth usage, less reliability)" msgstr "1 входящий, 1 исходящий туннель (низкая пропускная способность, низкая надежность) " #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:343 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:354 msgid "2 inbound, 2 outbound tunnels (standard bandwidth usage, standard reliability)" msgstr "2 входящих, 2 исходящих туннеля (стандартная пропускная способность, стандартная надежность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:347 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358 msgid "3 inbound, 3 outbound tunnels (higher bandwidth usage, higher reliability)" msgstr "3 входящих, 3 исходящих туннеля (высокая пропускная способность, высокая надежность)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367 msgid "tunnels" msgstr "туннелей" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 msgid "Backup Count" msgstr "Резервное количество" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:368 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "без резервных туннелей (отсутствие избыточности, отсутствие дополнительной нагрузки на систему)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:372 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:383 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "1 резервный туннель в каждом направлении (низкая избыточность, низкая нагрузка на систему)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:387 msgid "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "2 резервных туннеля в каждом направлении (умеренная избыточность, умеренная нагрузка на систему)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "3 резервных туннеля в каждом направлении (высокая избыточность, высокая нагрузка на систему)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:353 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400 msgid "backup tunnels" msgstr "резервных туннелей" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405 msgid "I2CP Options" msgstr "Параметры I2CP" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:396 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:146 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:407 msgid "Host" msgstr "Адрес" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:400 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:152 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266 msgid "Port" msgstr "Порт" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:398 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:445 msgid "Reduce tunnel quantity when idle" msgstr "Снижать количество туннелей при простое" @@ -360,20 +371,20 @@ msgstr "Снижать количество туннелей при просто #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:430 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:388 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:447 msgid "Enable" msgstr "Включить" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451 msgid "Reduced tunnel count" msgstr "Количество туннелей" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:436 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:408 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455 msgid "Idle minutes" msgstr "Минут простоя" @@ -402,7 +413,7 @@ msgid "File" msgstr "Файл" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:460 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:205 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:252 msgid "Local destination" msgstr "Локальный адрес назначения" @@ -411,27 +422,27 @@ msgid "(if known)" msgstr "(если известен)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:468 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:491 msgid "Custom options" msgstr "Дополнительные параметры" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:472 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495 msgid "NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted." msgstr "ПРИМЕЧАНИЕ: для вступления в силу измененных настроек потребуется остановка и перезапуск туннеля" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:474 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497 msgid "Save" msgstr "Сохранить" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501 msgid "Delete" msgstr "Удалить" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503 msgid "Cancel" msgstr "Отмена" @@ -447,92 +458,92 @@ msgstr "Редактирование настроек серверного ту msgid "New server settings" msgstr "Настройки нового серверного туннеля" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:167 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:214 msgid "Website name" msgstr "Имя веб-сайта" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:171 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:218 msgid "(leave blank for outproxies)" msgstr "(не заполнять для outproxy)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:176 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:223 msgid "Private key file" msgstr "Файл секретного ключа" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:215 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:262 msgid "Add to local addressbook" msgstr "Добавить в локальную адресную книгу" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:368 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:415 msgid "Encrypt Leaseset" msgstr "Шифровать LeaseSet" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:421 msgid "Encryption Key" msgstr "Ключ шифрования" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:425 msgid "Generate New Key" msgstr "Сгенерировать новый ключ" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:427 msgid "Generate" msgstr "Сгенерировать" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:382 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489 msgid "(Tunnel must be stopped first)" msgstr "(Туннель перед этим следует остановить)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:384 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:431 msgid "Restricted Access List" msgstr "Ограниченный доступ" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433 msgid "Unimplemented" msgstr "не реализовано" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:439 msgid "Access List" msgstr "Список доступа" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:443 msgid "(Restrict to these clients only)" msgstr "(Разрешить доступ только перечисленным клиентам)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:459 msgid "New Certificate type" msgstr "Создать новый сертификат. Тип" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:461 msgid "None" msgstr "Без" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:465 msgid "Hashcash (effort)" msgstr "Hashcash (экспериментальный)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471 msgid "Hashcash Calc Time" msgstr "Время генерации hashcash-сертификата" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:473 msgid "Estimate" msgstr "Прогноз" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:475 msgid "Hidden" msgstr "Скрытый" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479 msgid "Signed (signed by)" msgstr "Подписанный (указать кем подписан)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485 msgid "Modify Certificate" msgstr "Изменить сертификат" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:487 msgid "Modify" msgstr "Изменить" diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp index 595aa2ce0..560759236 100644 --- a/apps/routerconsole/jsp/help_ru.jsp +++ b/apps/routerconsole/jsp/help_ru.jsp @@ -104,6 +104,9 @@ [Включить построение графика]. +
  • Доля транзита: + +Количество транзитных туннелей, проходящих через Ваш маршрутизатор, поделенное на суммарное количество хопов в Ваших зондирующих и клиентских туннелях. Значение больше 1.00 означает, что Вы предоставляете для сети больше туннелей, чем используете сами. diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po index 1eb7859df..f77d7852e 100644 --- a/apps/routerconsole/locale/messages_ru.po +++ b/apps/routerconsole/locale/messages_ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-06 20:14+0000\n" -"PO-Revision-Date: 2010-01-09 05:50+0300\n" +"POT-Creation-Date: 2010-01-18 18:36+0000\n" +"PO-Revision-Date: 2010-01-18 18:37+0000\n" "Last-Translator: 4get \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1058,80 +1058,116 @@ msgid "Error saving the configuration (applied but not saved) - please see the e msgstr "Не удалось сохранить настройки (применены, но не сохранены) — загляните в журнал ошибок" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:32 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:332 msgid "Save Client Configuration" msgstr "Сохранить настройки клиентов" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:36 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:344 msgid "Save WebApp Configuration" msgstr "Сохранить настройки веб-апплетов" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:54 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:67 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:66 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:97 msgid "Start" msgstr "Запустить" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:80 #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:49 msgid "Unsupported" msgstr "Не поддерживается" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:83 +# This term intentionally left in English +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:110 +msgid "desc" +msgstr "desc" + +# This term intentionally left in English +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:105 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:120 +msgid "name" +msgstr "name" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:125 +msgid "New client added" +msgstr "Добавлен новый клиент" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 msgid "Client configuration saved successfully - restart required to take effect." msgstr "Настройки клиентов сохранены, требуется перезагрузка маршрутизатора для вступления в силу." -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:143 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:154 msgid "Bad client index." msgstr "Индекс клиента не найден в списке." -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:148 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:159 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:36 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 #: ../java/src/net/i2p/router/web/SummaryHelper.java:384 msgid "Client" msgstr "Клиент" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:148 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:194 msgid "started" msgstr "запущен" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:111 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:159 +msgid "deleted" +msgstr "удален" + +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:176 msgid "WebApp configuration saved successfully - restart required to take effect." msgstr "Настройки веб-апплетов сохранены, требуется перезагрузка маршрутизатора для вступления в силу." -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:129 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:194 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:55 msgid "WebApp" msgstr "Веб-апплет" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:131 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:196 msgid "Failed to start" msgstr "Не удалось запустить" -#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:137 +#: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:202 msgid "Failed to find server." msgstr "Не удалось найти сервер." -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:19 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:100 +msgid "Edit" +msgstr "Редактировать" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:28 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:328 +msgid "Add Client" +msgstr "Добавить клиента" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:36 msgid "Class and arguments" msgstr "Название класса и параметры" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:36 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:55 msgid "Run at Startup?" msgstr "Запускать автоматически?" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:17 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:36 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:55 msgid "Start Now" msgstr "Запустить вручную" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:34 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:55 msgid "Description" msgstr "Описание" +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:101 +msgid "Delete" +msgstr "Удалить" + #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 msgid "Add key" @@ -1258,7 +1294,7 @@ msgid "Peers" msgstr "Пиры" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:293 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:128 msgid "Stats" msgstr "Статистика" @@ -1787,7 +1823,7 @@ msgid "Updating unsigned update URL to" msgstr "Новый URL неподписанной тестовой сборки" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:75 -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#: ../java/src/net/i2p/router/web/GraphHelper.java:133 msgid "Never" msgstr "Никогда" @@ -1810,66 +1846,66 @@ msgstr "Только скачать и проверить целостность msgid "Download, verify, and restart" msgstr "Скачать, проверить и обновить I2P" -#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +#: ../java/src/net/i2p/router/web/GraphHelper.java:125 msgid "Configure Graph Display" msgstr "Настройка показа графиков" -#: ../java/src/net/i2p/router/web/GraphHelper.java:107 +#: ../java/src/net/i2p/router/web/GraphHelper.java:125 msgid "Select Stats" msgstr "Выбрать параметры" -#: ../java/src/net/i2p/router/web/GraphHelper.java:109 +#: ../java/src/net/i2p/router/web/GraphHelper.java:127 msgid "Periods" msgstr "Количество интервалов" -#: ../java/src/net/i2p/router/web/GraphHelper.java:110 +#: ../java/src/net/i2p/router/web/GraphHelper.java:128 msgid "Plot averages" msgstr "Строить график средних значений" -#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#: ../java/src/net/i2p/router/web/GraphHelper.java:129 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332 msgid "or" msgstr "или" -#: ../java/src/net/i2p/router/web/GraphHelper.java:111 +#: ../java/src/net/i2p/router/web/GraphHelper.java:129 msgid "plot events" msgstr "строить график количества событий" -#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +#: ../java/src/net/i2p/router/web/GraphHelper.java:130 msgid "Image sizes" msgstr "Размеры графиков" -#: ../java/src/net/i2p/router/web/GraphHelper.java:112 +#: ../java/src/net/i2p/router/web/GraphHelper.java:130 msgid "width" msgstr "ширина" -#: ../java/src/net/i2p/router/web/GraphHelper.java:113 +#: ../java/src/net/i2p/router/web/GraphHelper.java:131 msgid "height" msgstr "высота" -#: ../java/src/net/i2p/router/web/GraphHelper.java:113 -#: ../java/src/net/i2p/router/web/GraphHelper.java:114 +#: ../java/src/net/i2p/router/web/GraphHelper.java:131 +#: ../java/src/net/i2p/router/web/GraphHelper.java:132 msgid "pixels" msgstr "пикселей" -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#: ../java/src/net/i2p/router/web/GraphHelper.java:133 msgid "Refresh delay" msgstr "Интервал обновления" -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#: ../java/src/net/i2p/router/web/GraphHelper.java:133 msgid "hour" msgstr "час" -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#: ../java/src/net/i2p/router/web/GraphHelper.java:133 msgid "minute" msgstr "минута" -#: ../java/src/net/i2p/router/web/GraphHelper.java:115 +#: ../java/src/net/i2p/router/web/GraphHelper.java:133 msgid "minutes" msgstr "минут(ы)" -#: ../java/src/net/i2p/router/web/GraphHelper.java:116 +#: ../java/src/net/i2p/router/web/GraphHelper.java:134 msgid "Redraw" msgstr "Перерисовать" @@ -1878,175 +1914,175 @@ msgstr "Перерисовать" msgid "File location" msgstr "Путь к файлу журнала" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:59 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:60 msgid "Network Database RouterInfo Lookup" msgstr "Просмотр RouterInfo" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:75 #: ../java/strings/Strings.java:68 msgid "Router" msgstr "Маршрутизатор" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:74 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:75 msgid "not found in network database" msgstr "не найден в сетевой базе данных" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:82 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135 msgid "Network Database Contents" msgstr "Просмотр сетевой базы данных" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:83 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 msgid "View RouterInfo" msgstr "Показать список RouterInfo" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:84 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:85 msgid "LeaseSets" msgstr "Список LeaseSet" # This term intentionally left in English -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:93 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:94 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:95 msgid "Local" msgstr "Локальный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 msgid "Unpublished" msgstr "Неопубликованный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:97 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:104 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:98 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 msgid "Destination" msgstr "Адрес назначения" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:114 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:115 #, java-format msgid "Expires in {0}" msgstr "Истекает через {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:116 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:117 #, java-format msgid "Expired {0} ago" msgstr "Истек {0} назад" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:119 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:156 msgid "Gateway" msgstr "Шлюз" # This term intentionally left in English -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:118 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:119 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:120 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:121 msgid "Tunnel" msgstr "Туннель" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:134 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135 msgid "View LeaseSets" msgstr "Показать список LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:136 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137 msgid "Not initialized" msgstr "База не инициализирована" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:145 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:146 msgid "Routers" msgstr "Маршрутизаторы" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:148 msgid "Show all routers" msgstr "Показать полный список" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:149 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:150 msgid "Show all routers with full stats" msgstr "Показать полный список с полной статистикой" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Network Database Router Statistics" msgstr "Статистика маршрутизаторов" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:191 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:205 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:223 msgid "Count" msgstr "Количество" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:191 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:161 msgid "Version" msgstr "Версия" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:204 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:205 msgid "Transports" msgstr "Транспортный протокол" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:222 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:223 msgid "Country" msgstr "Страна" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:254 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:255 msgid "Our info" msgstr "Информация о нас" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:256 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:257 msgid "Peer info for" msgstr "Информация о пире" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:260 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:261 msgid "Full entry" msgstr "Показать полную запись" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 #: ../java/src/net/i2p/router/web/SummaryHelper.java:105 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589 msgid "Hidden" msgstr "Скрытый" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:266 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 msgid "Updated" msgstr "Обновленный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:267 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:268 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:271 #, java-format msgid "{0} ago" msgstr "{0} назад" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:269 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:273 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:270 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:274 msgid "Published" msgstr "Опубликовано" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:275 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:276 msgid "Address(es)" msgstr "Адрес(а)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "Hidden or starting up" msgstr "В скрытом режиме или недавно запущен" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:308 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 msgid "SSU with introducers" msgstr "SSU через посредников" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:310 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:310 msgid "NTCP and SSU" msgstr "NTCP и SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:309 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:310 msgid "NTCP and SSU with introducers" msgstr "NTCP и SSU через посредников" @@ -2552,26 +2588,30 @@ msgid "Participating" msgstr "Транзитные" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:384 +msgid "Share ratio" +msgstr "Доля транзита" + +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "What's in the router's job queue?" msgstr "Просмотр очереди заданий маршрутизатора." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:386 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:392 msgid "Congestion" msgstr "Занятость" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:391 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 msgid "Job lag" msgstr "Задержка задач" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 msgid "Message delay" msgstr "Задежка сообщений" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409 msgid "Tunnel lag" msgstr "Задержка туннелей" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:409 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 msgid "Backlog" msgstr "Очередь" @@ -3082,11 +3122,11 @@ msgstr "Вы настроили очень низкий лимит для тра #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:345 msgid "I2P requires at least 12KBps to enable sharing. " -msgstr "I2P нужно как минимум 12 килобайт/секунду для включения этой функции." +msgstr "I2P нужно как минимум 12 килобайт/секунду для включения этой функции. " #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:346 msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. " -msgstr "Пожалуйста, повысьте долю транзитного трафика." +msgstr "Пожалуйста, повысьте долю транзитного трафика. " #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347 msgid "It improves your anonymity by creating cover traffic, and helps the network." @@ -3104,6 +3144,7 @@ msgstr "Чем выше доля транзитного трафика, тем #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:375 @@ -3559,36 +3600,36 @@ msgstr "Для вступления некоторых изменений в с msgid "config clients" msgstr "настройки клиентов" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:241 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:244 msgid "I2P Client Configuration" msgstr "Настройки клиентов I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:309 msgid "Client Configuration" msgstr "Настройки клиентов" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:311 msgid "The Java clients listed below are started by the router and run in the same JVM." msgstr "Перечисленные ниже Java-клиенты запускаются маршрутизатором внутри своей JVM." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:315 msgid "To change other client options, edit the file" msgstr "Для изменения других клиентских настроек отредактируйте файл" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:319 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:331 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:322 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:342 msgid "All changes require restart to take effect." msgstr "Для вступления изменённых настроек в силу потребуется перезагрузка маршрутизатора." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:334 msgid "WebApp Configuration" msgstr "Настройки веб-апплетов" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:336 msgid "The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook)." msgstr "Перечисленные ниже Java веб-апплеты запускаются консолью маршрутизатора внутри JVM маршрутизатора. Обычно эти приложения доступны через консоль маршрутизатора. Это могут быть как самостоятельные приложения (например, i2psnark), так и интерфейсы к другим приложениям или клиентам, которые надо включать отдельно (например, susidns, i2ptunnel), либо могут вообще не иметь веб-интерфейса (например, addressbook)." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:327 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:338 msgid "A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method." msgstr "Веб-апплет также можно отключить, просто удалив .war-файл из директории webapps. Однако при обновлении маршрутизатора и .war-файл и соответствующее приложение будут возвращены на свои места, поэтому отключение веб-апплетов через эту страницу это более корректный способ." @@ -4127,28 +4168,3 @@ msgstr "обзор туннелей" msgid "I2P Tunnel Summary" msgstr "Обзор туннелей I2P" -#~ msgid "This is useful in some situations" -#~ msgstr "" -#~ "(например, после изменения базовых настроек, которые считываются " -#~ "приложением только во время запуска)." -#~ msgid "I2P will install (or remove) a service accordingly." -#~ msgstr "" -#~ "В зависимости от выбранной кнопки I2P немедленно установит или удалит " -#~ "свою службу из списка служб Windows." - -#, fuzzy -#~ msgid "Depth" -#~ msgstr "Глубина" - -#, fuzzy -#~ msgid "skew" -#~ msgstr "отклонение" - -#, fuzzy -#~ msgid "Expl. + Client" -#~ msgstr "Разведочной + Клиентский" - -#, fuzzy -#~ msgid "Part. from + to" -#~ msgstr "Participating from + to" - diff --git a/history.txt b/history.txt index 11ae0d23d..bdfdbf910 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2010-01-19 sponge + * Firewall fix for NTCP, where firewalls will forget a NAT relationship + on a stream... AKA setting keepalive. This should fix the stuck NTCP + issue that has been bothing zzz for years. + * Set keepalive on BOB connections too, since this will assist closing + the connections in the event of a crash on a client. + 2010-01-18 zzz * configclients.jsp: Fix add-new-client feature * Console: Add a tunnel share ratio estimate diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml index a5dae3100..a23654b94 100644 --- a/installer/resources/initialNews.xml +++ b/installer/resources/initialNews.xml @@ -17,6 +17,7 @@ please check out our

    Point your IRC client to localhost:6668 and say hi to us on #i2p.

    +

    • Gratulation zur erfolgreichen Installation von I2P!

    Willkommen bei I2P! @@ -32,5 +33,19 @@ Sobald auf der linken Seite eine "shared clients" Verbindung aufgelistet ist

    Verbinde deinen IRC Klienten mit dem Server auf localhost:6668 und sage Hallo zu uns im Kanal #i2p.

    + +

    • Поздравляем с успешным завершением установки I2P!

    +

    +Добро пожаловать в I2P! Немного терпения! I2P-маршрутизатору потребуется пара минут для запуска модулей и первого подключения к сети I2P. +

    +

    +Пока Вы ждете, самое время зайти в сетевые настройки и выставить ограничение скорости в соответствии со скоростью Вашего подключения к интернету. +

    +

    +Как только в панели слева в разделе «Локальные туннели» появится запись «коллективные клиенты» — I2P готов к работе. Подключайте Ваш IRC-клиент к серверу localhost:6668 и заходите сказать нам привет на канал #i2p. +

    +

    +Не забудьте заглянуть в наш FAQ. +

    diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index be2f8c298..869f2a488 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = "-rc"; diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java index 89c12250c..82ec5719e 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -418,6 +418,8 @@ public class EventPumper implements Runnable { try { chan.close(); } catch (IOException ioe) { } return; } + // BUGFIX for firewalls. --Sponge + chan.socket().setKeepAlive(true); SelectionKey ckey = chan.register(_selector, SelectionKey.OP_READ); NTCPConnection con = new NTCPConnection(_context, _transport, chan, ckey); @@ -436,6 +438,8 @@ public class EventPumper implements Runnable { if (_log.shouldLog(Log.DEBUG)) _log.debug("processing connect for " + key + " / " + con + ": connected? " + connected); if (connected) { + // BUGFIX for firewalls. --Sponge + chan.socket().setKeepAlive(true); con.setKey(key); con.outboundConnected(); _context.statManager().addRateData("ntcp.connectSuccessful", 1, 0);