Changeset bec1b4a


Ignore:
Timestamp:
Feb 17, 2011 10:45:49 AM (9 years ago)
Author:
dev <dev@…>
Branches:
master
Children:
a3d466e
Parents:
84990d9 (diff), ecadbba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '2640744244f35bbe1cfa2738209238b69696c3aa'

and 'a9276b7c162ada9a117bde0a54aa4da8fdc05773'

Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed
  • .tx/config

    r84990d9 rbec1b4a  
    4040source_lang = en
    4141trans.nl = apps/desktopgui/locale/messages_nl.po
     42trans.ru = apps/desktopgui/locale/messages_ru.po
    4243trans.zh_CN = apps/desktopgui/locale/messages_zh.po
    4344
  • apps/desktopgui/src/net/i2p/desktopgui/Main.java

    r84990d9 rbec1b4a  
    5757    public static void beginStartup(String[] args) {
    5858        try {
    59             String headless = RouterManager.getRouterContext().getProperty("router.isHeadless");
     59            String headless = System.getProperty("java.awt.headless");
    6060            boolean isHeadless = Boolean.parseBoolean(headless);
    6161            if(isHeadless) {
     62                log.warn("Headless environment: not starting desktopgui!");
    6263                return;
    6364            }
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r84990d9 rbec1b4a  
    858858        out.write(statusString + "</td>\n\t");
    859859
     860        // (i) icon column
    860861        out.write("<td class=\"" + rowClass + "\">");
     862        if (isValid && meta.getAnnounce() != null) {
     863            // Link to local details page - note that trailing slash on a single-file torrent
     864            // gets us to the details page instead of the file.
     865            //StringBuilder buf = new StringBuilder(128);
     866            //buf.append("<a href=\"").append(snark.getBaseName())
     867            //   .append("/\" title=\"").append(_("Torrent details"))
     868            //   .append("\"><img alt=\"").append(_("Info")).append("\" border=\"0\" src=\"")
     869            //   .append(_imgPath).append("details.png\"></a>");
     870            //out.write(buf.toString());
     871
     872            // Link to tracker details page
     873            String trackerLink = getTrackerLink(meta.getAnnounce(), snark.getInfoHash());
     874            if (trackerLink != null)
     875                out.write(trackerLink);
     876        }
     877
     878        // File type icon column
     879        out.write("</td>\n<td class=\"" + rowClass + "\">");
    861880        if (isValid) {
     881            // Link to local details page - note that trailing slash on a single-file torrent
     882            // gets us to the details page instead of the file.
    862883            StringBuilder buf = new StringBuilder(128);
    863884            buf.append("<a href=\"").append(snark.getBaseName())
    864885               .append("/\" title=\"").append(_("Torrent details"))
    865                .append("\"><img alt=\"").append(_("Info")).append("\" border=\"0\" src=\"")
    866                .append(_imgPath).append("details.png\"></a>");
    867              out.write(buf.toString());
    868         }
    869 
    870         out.write("</td>\n<td class=\"" + rowClass + "\">");
    871         StringBuilder buf = null;
     886               .append("\">");
     887            out.write(buf.toString());
     888        }
     889        String icon;
     890        if (isMultiFile)
     891            icon = "folder";
     892        else if (isValid)
     893            icon = toIcon(meta.getName());
     894        else
     895            icon = "magnet";
     896        if (isValid) {
     897            out.write(toImg(icon, _("Info")));
     898            out.write("</a>");
     899        } else {
     900            out.write(toImg(icon));
     901        }
     902
     903        // Torrent name column
     904        out.write("</td><td class=\"snarkTorrentName " + rowClass + "\">");
    872905        if (remaining == 0 || isMultiFile) {
    873             buf = new StringBuilder(128);
     906            StringBuilder buf = new StringBuilder(128);
    874907            buf.append("<a href=\"").append(snark.getBaseName());
    875908            if (isMultiFile)
     
    883916            out.write(buf.toString());
    884917        }
    885         String icon;
    886         if (isMultiFile)
    887             icon = "folder";
    888         else if (isValid)
    889             icon = toIcon(meta.getName());
    890         else
    891             icon = "magnet";
    892         if (remaining == 0 || isMultiFile) {
    893             out.write(toImg(icon, _("Open")));
    894             out.write("</a>");
    895         } else {
    896             out.write(toImg(icon));
    897         }
    898         out.write("</td><td class=\"snarkTorrentName " + rowClass + "\">");
    899         if (remaining == 0 || isMultiFile)
    900             out.write(buf.toString());
    901918        out.write(filename);
    902919        if (remaining == 0 || isMultiFile)
     
    11701187        out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\"");
    11711188        out.write("title=\"");
    1172         out.write(_("Torrent file must originate from an I2P-based tracker"));
     1189        out.write(_("Enter the torrent file download URL (I2P only), magnet link, or maggot link"));
    11731190        out.write("\"> \n");
    11741191        // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
  • apps/i2psnark/locale/messages_ru.po

    r84990d9 rbec1b4a  
    99"Project-Id-Version: I2P i2psnark\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2010-12-13 19:43+0000\n"
    12 "PO-Revision-Date: 2010-12-16 00:10+0500\n"
     11"POT-Creation-Date: 2011-02-15 17:24+0000\n"
     12"PO-Revision-Date: 2011-02-15 22:27+0500\n"
    1313"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
    1414"Language-Team: foo <foo@bar>\n"
     
    2020"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"
    2121
    22 #: ../java/src/org/klomp/snark/SnarkManager.java:94
    23 #, java-format
    24 msgid "Adding torrents in {0} minutes"
    25 msgstr "Торренты будут подгружены через {0} минут(ы)"
    26 
    27 #: ../java/src/org/klomp/snark/SnarkManager.java:296
     22#: ../java/src/org/klomp/snark/SnarkManager.java:307
    2823#, java-format
    2924msgid "Total uploaders limit changed to {0}"
    3025msgstr "Новое значение лимита количества слотов отдачи: {0}"
    3126
    32 #: ../java/src/org/klomp/snark/SnarkManager.java:298
     27#: ../java/src/org/klomp/snark/SnarkManager.java:309
    3328#, java-format
    3429msgid "Minimum total uploaders limit is {0}"
    3530msgstr "Минимально допустимое значение для количества слотов: {0}"
    3631
    37 #: ../java/src/org/klomp/snark/SnarkManager.java:310
     32#: ../java/src/org/klomp/snark/SnarkManager.java:321
    3833#, java-format
    3934msgid "Up BW limit changed to {0}KBps"
    4035msgstr "Новое значение лимита скорости отдачи: {0} KBps"
    4136
    42 #: ../java/src/org/klomp/snark/SnarkManager.java:312
     37#: ../java/src/org/klomp/snark/SnarkManager.java:323
    4338#, java-format
    4439msgid "Minimum up bandwidth limit is {0}KBps"
    4540msgstr "Минимально допустимое значение для лимита скорости отдачи: {0} KBps"
    4641
    47 #: ../java/src/org/klomp/snark/SnarkManager.java:324
    48 #, java-format
    49 msgid "Startup delay limit changed to {0} minutes"
    50 msgstr "Новое значение задержки запуска: {0} минут(ы)"
    51 
    52 #: ../java/src/org/klomp/snark/SnarkManager.java:371
     42#: ../java/src/org/klomp/snark/SnarkManager.java:335
     43#, java-format
     44msgid "Startup delay changed to {0}"
     45msgstr "Задержка запуска изменена на {0}"
     46
     47#: ../java/src/org/klomp/snark/SnarkManager.java:386
    5348msgid "I2CP and tunnel changes will take effect after stopping all torrents"
    5449msgstr "Изменения настроек I2CP и туннелей вступят в силу после остановки всех торрентов."
    5550
    56 #: ../java/src/org/klomp/snark/SnarkManager.java:378
     51#: ../java/src/org/klomp/snark/SnarkManager.java:393
    5752msgid "Disconnecting old I2CP destination"
    5853msgstr "Рассоединяемся по старому адресу I2CP"
    5954
    60 #: ../java/src/org/klomp/snark/SnarkManager.java:382
     55#: ../java/src/org/klomp/snark/SnarkManager.java:397
    6156#, java-format
    6257msgid "I2CP settings changed to {0}"
    6358msgstr "Новые параметры I2CP: {0}"
    6459
    65 #: ../java/src/org/klomp/snark/SnarkManager.java:386
     60#: ../java/src/org/klomp/snark/SnarkManager.java:402
    6661msgid "Unable to connect with the new settings, reverting to the old I2CP settings"
    6762msgstr "Не удалось соединиться с использованием новых настроек I2CP, возвращаемся к старым настройкам"
    6863
    69 #: ../java/src/org/klomp/snark/SnarkManager.java:390
     64#: ../java/src/org/klomp/snark/SnarkManager.java:406
    7065msgid "Unable to reconnect with the old settings!"
    7166msgstr "Не удалось пересоединиться с использованием старых настроек I2CP!"
    7267
    73 #: ../java/src/org/klomp/snark/SnarkManager.java:392
     68#: ../java/src/org/klomp/snark/SnarkManager.java:408
    7469msgid "Reconnected on the new I2CP destination"
    7570msgstr "Пересоединились по новому адресу I2CP"
    7671
    77 #: ../java/src/org/klomp/snark/SnarkManager.java:403
     72#: ../java/src/org/klomp/snark/SnarkManager.java:418
    7873#, java-format
    7974msgid "I2CP listener restarted for \"{0}\""
    8075msgstr "I2CP-приёмник перезапущен для \"{0}\""
    8176
    82 #: ../java/src/org/klomp/snark/SnarkManager.java:414
     77#: ../java/src/org/klomp/snark/SnarkManager.java:429
    8378msgid "Enabled autostart"
    8479msgstr "Автостарт включен"
    8580
    86 #: ../java/src/org/klomp/snark/SnarkManager.java:416
     81#: ../java/src/org/klomp/snark/SnarkManager.java:431
    8782msgid "Disabled autostart"
    8883msgstr "Автостарт выключен"
    8984
    90 #: ../java/src/org/klomp/snark/SnarkManager.java:422
     85#: ../java/src/org/klomp/snark/SnarkManager.java:437
    9186msgid "Enabled open trackers - torrent restart required to take effect."
    9287msgstr "Включено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
    9388
    94 #: ../java/src/org/klomp/snark/SnarkManager.java:424
     89#: ../java/src/org/klomp/snark/SnarkManager.java:439
    9590msgid "Disabled open trackers - torrent restart required to take effect."
    9691msgstr "Отключено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
    9792
    98 #: ../java/src/org/klomp/snark/SnarkManager.java:431
     93#: ../java/src/org/klomp/snark/SnarkManager.java:447
    9994msgid "Open Tracker list changed - torrent restart required to take effect."
    10095msgstr "Изменен список открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу."
    10196
    102 #: ../java/src/org/klomp/snark/SnarkManager.java:438
     97#: ../java/src/org/klomp/snark/SnarkManager.java:454
    10398#, java-format
    10499msgid "{0} theme loaded, return to main i2psnark page to view."
    105100msgstr "{0} тема загружена, вернитесь на основную страницу i2psnark для просмотра."
    106101
    107 #: ../java/src/org/klomp/snark/SnarkManager.java:445
     102#: ../java/src/org/klomp/snark/SnarkManager.java:461
    108103msgid "Configuration unchanged."
    109104msgstr "Настройки не изменились."
    110105
    111 #: ../java/src/org/klomp/snark/SnarkManager.java:455
     106#: ../java/src/org/klomp/snark/SnarkManager.java:471
    112107#, java-format
    113108msgid "Unable to save the config to {0}"
    114109msgstr "Не удалось сохранить настройки в {0}"
    115110
    116 #: ../java/src/org/klomp/snark/SnarkManager.java:494
     111#: ../java/src/org/klomp/snark/SnarkManager.java:536
    117112msgid "Connecting to I2P"
    118113msgstr "Устанавливается соединение с I2P"
    119114
    120 #: ../java/src/org/klomp/snark/SnarkManager.java:497
     115#: ../java/src/org/klomp/snark/SnarkManager.java:539
    121116msgid "Error connecting to I2P - check your I2CP settings!"
    122117msgstr "Ошибка соединения с I2P, проверьте настройки I2CP!"
    123118
    124 #: ../java/src/org/klomp/snark/SnarkManager.java:506
     119#: ../java/src/org/klomp/snark/SnarkManager.java:548
    125120#, java-format
    126121msgid "Error: Could not add the torrent {0}"
     
    128123
    129124#. catch this here so we don't try do delete it below
    130 #: ../java/src/org/klomp/snark/SnarkManager.java:528
     125#: ../java/src/org/klomp/snark/SnarkManager.java:570
    131126#, java-format
    132127msgid "Cannot open \"{0}\""
    133128msgstr "Не удалось открыть \"{0}\""
    134129
    135 #: ../java/src/org/klomp/snark/SnarkManager.java:541
    136 #, java-format
    137 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", will announce to i2p open trackers only"
    138 msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, будут использоваться только открытые i2p трекеры"
    139 
    140 #: ../java/src/org/klomp/snark/SnarkManager.java:543
    141 #, java-format
    142 msgid "Warning - Ignoring non-i2p tracker in \"{0}\", and open trackers are disabled, you must enable open trackers before starting the torrent!"
    143 msgstr "Внимание: указанные в \"{0}\" не-i2p трекеры будут проигнорированы, однако использование открытых i2p трекеров отключено, Вы должны включить поддержку открытых i2p трекеров перед запуском этого торрента!"
    144 
    145 #: ../java/src/org/klomp/snark/SnarkManager.java:563
     130#. TODO - if the existing one is a magnet, delete it and add the metainfo instead?
     131#: ../java/src/org/klomp/snark/SnarkManager.java:586
     132#: ../java/src/org/klomp/snark/SnarkManager.java:661
     133#: ../java/src/org/klomp/snark/SnarkManager.java:716
     134#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971
     135#, java-format
     136msgid "Torrent with this info hash is already running: {0}"
     137msgstr "Торрент с таким info hash уже запущен: {0}"
     138
     139#. addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
     140#: ../java/src/org/klomp/snark/SnarkManager.java:593
     141#, java-format
     142msgid "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only."
     143msgstr "Внимание - в \"{0}\" не найдено I2P трекеров, анонсирование будет производиться только на открытых трекерах I2P."
     144
     145#. addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
     146#: ../java/src/org/klomp/snark/SnarkManager.java:598
     147#, java-format
     148msgid "Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is enabled before starting this torrent."
     149msgstr "Внимание - в \"{0}\" не найдено I2P трекеров. Перед запуском торрента убедитесь, что использование открытых трекеров включено."
     150
     151#: ../java/src/org/klomp/snark/SnarkManager.java:619
    146152#, java-format
    147153msgid "Torrent in \"{0}\" is invalid"
    148154msgstr "Торрент в \"{0}\" некорректен"
    149155
    150 #: ../java/src/org/klomp/snark/SnarkManager.java:578
     156#: ../java/src/org/klomp/snark/SnarkManager.java:624
     157#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1994
     158#, java-format
     159msgid "ERROR - Out of memory, cannot create torrent from {0}"
     160msgstr "ОШИБКА - нехватка памяти, невозможно создать торрент из {0}"
     161
     162#: ../java/src/org/klomp/snark/SnarkManager.java:635
    151163#, java-format
    152164msgid "Torrent added and started: \"{0}\""
    153165msgstr "Торрент добавлен и запущен: \"{0}\""
    154166
    155 #: ../java/src/org/klomp/snark/SnarkManager.java:580
     167#: ../java/src/org/klomp/snark/SnarkManager.java:637
    156168#, java-format
    157169msgid "Torrent added: \"{0}\""
    158170msgstr "Торрент добавлен: \"{0}\""
    159171
    160 #: ../java/src/org/klomp/snark/SnarkManager.java:734
     172#: ../java/src/org/klomp/snark/SnarkManager.java:672
     173#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:489
     174#, java-format
     175msgid "Fetching {0}"
     176msgstr "Получение торрента: {0}"
     177
     178#: ../java/src/org/klomp/snark/SnarkManager.java:675
     179#, java-format
     180msgid "We have no saved peers and no other torrents are running. Fetch of {0} will not succeed until you start another torrent."
     181msgstr "Мы не имеем сохранённых пиров и нет других запущенных торрентов. Загрузка {0} не будет успешна пока вы не запустите другой торрент."
     182
     183#: ../java/src/org/klomp/snark/SnarkManager.java:679
     184#, java-format
     185msgid "Adding {0}"
     186msgstr "Добавление {0}"
     187
     188#: ../java/src/org/klomp/snark/SnarkManager.java:726
     189#: ../java/src/org/klomp/snark/SnarkManager.java:749
     190#: ../java/src/org/klomp/snark/SnarkManager.java:1174
     191#, java-format
     192msgid "Failed to copy torrent file to {0}"
     193msgstr "Не удалось скопировать торрент в: {0}"
     194
     195#: ../java/src/org/klomp/snark/SnarkManager.java:972
    161196#, java-format
    162197msgid "Too many files in \"{0}\" ({1}), deleting it!"
    163198msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!"
    164199
    165 #: ../java/src/org/klomp/snark/SnarkManager.java:736
     200#: ../java/src/org/klomp/snark/SnarkManager.java:974
    166201#, java-format
    167202msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!"
    168203msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!"
    169204
    170 #: ../java/src/org/klomp/snark/SnarkManager.java:738
     205#: ../java/src/org/klomp/snark/SnarkManager.java:976
    171206#, java-format
    172207msgid "No pieces in \"{0}\",  deleting it!"
    173208msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!"
    174209
    175 #: ../java/src/org/klomp/snark/SnarkManager.java:740
     210#: ../java/src/org/klomp/snark/SnarkManager.java:978
    176211#, java-format
    177212msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!"
    178213msgstr "Слишком много частей в торренте \"{0}\" (наш предел {1}), удаляем его!"
    179214
    180 #: ../java/src/org/klomp/snark/SnarkManager.java:742
     215#: ../java/src/org/klomp/snark/SnarkManager.java:980
    181216#, java-format
    182217msgid "Pieces are too large in \"{0}\" ({1}B), deleting it."
    183218msgstr "Слишком крупные части в торренте \"{0}\" ({1}B), удаляем его."
    184219
    185 #: ../java/src/org/klomp/snark/SnarkManager.java:743
     220#: ../java/src/org/klomp/snark/SnarkManager.java:981
    186221#, java-format
    187222msgid "Limit is {0}B"
    188223msgstr "Наш предел {0}B"
    189224
    190 #: ../java/src/org/klomp/snark/SnarkManager.java:751
     225#: ../java/src/org/klomp/snark/SnarkManager.java:989
    191226#, java-format
    192227msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\""
    193228msgstr "Торренты крупнее чем {0}B пока не поддерживается, удаляем \"{1}\""
    194229
    195 #: ../java/src/org/klomp/snark/SnarkManager.java:767
     230#: ../java/src/org/klomp/snark/SnarkManager.java:1005
    196231#, java-format
    197232msgid "Error: Could not remove the torrent {0}"
    198233msgstr "Ошибка: Невозможно удалить торрент {0}"
    199234
    200 #: ../java/src/org/klomp/snark/SnarkManager.java:794
     235#: ../java/src/org/klomp/snark/SnarkManager.java:1026
     236#: ../java/src/org/klomp/snark/SnarkManager.java:1044
    201237#, java-format
    202238msgid "Torrent stopped: \"{0}\""
    203239msgstr "Торрент остановлен: \"{0}\""
    204240
    205 #: ../java/src/org/klomp/snark/SnarkManager.java:814
     241#: ../java/src/org/klomp/snark/SnarkManager.java:1065
    206242#, java-format
    207243msgid "Torrent removed: \"{0}\""
    208244msgstr "Торрент удален: \"{0}\""
    209245
    210 #: ../java/src/org/klomp/snark/SnarkManager.java:852
     246#: ../java/src/org/klomp/snark/SnarkManager.java:1073
     247#, java-format
     248msgid "Adding torrents in {0}"
     249msgstr "Добавление торрентов через {0}"
     250
     251#: ../java/src/org/klomp/snark/SnarkManager.java:1122
    211252#, java-format
    212253msgid "Download finished: {0}"
    213254msgstr "Закачка завершена: {0}"
    214255
    215 #: ../java/src/org/klomp/snark/SnarkManager.java:880
     256#: ../java/src/org/klomp/snark/SnarkManager.java:1170
     257#, java-format
     258msgid "Metainfo received for {0}"
     259msgstr "Метаданные получены для {0}"
     260
     261#: ../java/src/org/klomp/snark/SnarkManager.java:1171
     262#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524
     263#, java-format
     264msgid "Starting up torrent {0}"
     265msgstr "Запускаем торрент: {0}"
     266
     267#: ../java/src/org/klomp/snark/SnarkManager.java:1225
    216268msgid "Unable to connect to I2P!"
    217269msgstr "Не удалось установить соединение с I2P!"
    218270
    219 #: ../java/src/org/klomp/snark/SnarkManager.java:886
     271#: ../java/src/org/klomp/snark/SnarkManager.java:1231
    220272#, java-format
    221273msgid "Unable to add {0}"
    222274msgstr "Не удаётся добавить {0}"
    223275
    224 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:185
     276#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:205
    225277msgid "I2PSnark - Anonymous BitTorrent Client"
    226278msgstr "I2PSnark — Анонимный  BitTorrent Клиент"
    227279
    228 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:198
     280#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:218
    229281msgid "Torrents"
    230282msgstr "Торренты"
    231283
    232 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:201
    233 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:208
    234 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977
     284#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:221
     285#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:228
     286#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1024
    235287msgid "I2PSnark"
    236288msgstr "I2PSnark"
    237289
    238 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:205
     290#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:225
    239291msgid "Refresh page"
    240292msgstr "Обновить страницу"
    241293
    242 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:210
     294#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:230
    243295msgid "Forum"
    244296msgstr "Форум"
    245297
    246 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:264
    247 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1483
     298#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:284
     299#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1715
    248300msgid "Status"
    249301msgstr "Статус"
    250302
    251 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:270
    252 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:272
     303#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:290
     304#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:292
    253305msgid "Hide Peers"
    254306msgstr "спрятать список пиров"
    255307
    256 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277
    257 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:279
     308#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
     309#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:299
    258310msgid "Show Peers"
    259311msgstr "показать список пиров"
    260312
    261 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:286
    262 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1464
     313#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306
     314#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1639
     315#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1655
    263316msgid "Torrent"
    264317msgstr "Торрент"
    265318
    266 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:290
     319#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:310
    267320msgid "Estimated time remaining"
    268321msgstr "Примерное оставшееся время"
    269322
    270323#. Translators: Please keep short or translate as " "
    271 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:293
     324#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:313
    272325msgid "ETA"
    273326msgstr "Осталось"
    274327
    275 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:297
     328#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
    276329msgid "Downloaded"
    277330msgstr "Получено"
    278331
    279332#. Translators: Please keep short or translate as " "
    280 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:300
    281 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:314
     333#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:320
     334#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:334
    282335msgid "RX"
    283336msgstr "Принято"
    284337
    285 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:304
     338#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:324
    286339msgid "Uploaded"
    287340msgstr "Отдано"
    288341
    289342#. Translators: Please keep short or translate as " "
    290 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:307
    291 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:324
     343#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:327
     344#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:344
    292345msgid "TX"
    293346msgstr "Отдано"
    294347
    295 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:312
     348#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:332
    296349msgid "Down Rate"
    297350msgstr "Скорость загрузки"
    298351
    299352#. Translators: Please keep short or translate as " "
    300 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317
    301 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326
     353#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:337
     354#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346
    302355msgid "Rate"
    303356msgstr "Скорость"
    304357
    305 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322
     358#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
    306359msgid "Up Rate"
    307360msgstr "Скорость отдачи"
    308361
    309 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:340
     362#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:364
    310363msgid "Stop all torrents and the I2P tunnel"
    311364msgstr "Остановить все торренты и закрыть соединение с I2P"
    312365
    313 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:342
     366#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:366
    314367msgid "Stop All"
    315368msgstr "Остановить все"
    316369
    317 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:351
     370#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:375
    318371msgid "Start all torrents and the I2P tunnel"
    319372msgstr "Запустить все торренты и открыть соединение с I2P"
    320373
    321 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:353
     374#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:377
    322375msgid "Start All"
    323376msgstr "Запустить все"
    324377
    325 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:372
     378#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:396
    326379msgid "No torrents loaded."
    327380msgstr "Нет загруженных торрентов."
    328381
    329 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:377
     382#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:401
    330383msgid "Totals"
    331384msgstr "Всего"
    332385
    333 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:379
     386#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:403
    334387#, java-format
    335388msgid "1 torrent"
     
    339392msgstr[2] "{0} торрентов"
    340393
    341 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:382
     394#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:406
    342395#, java-format
    343396msgid "1 connected peer"
     
    347400msgstr[2] "{0} подсоединенных пиров"
    348401
    349 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:454
    350 #, java-format
    351 msgid "Fetching {0}"
    352 msgstr "Получение торрента: {0}"
    353 
    354 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:458
    355 msgid "Invalid URL - must start with http://"
    356 msgstr "Некорректный URL, должен начинаться с http://"
    357 
    358 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:489
    359 #, java-format
    360 msgid "Starting up torrent {0}"
    361 msgstr "Запускаем торрент: {0}"
    362 
    363 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509
    364 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:527
     402#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:495
     403#, java-format
     404msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\""
     405msgstr "Некорректный URL: должен начинаться с \"http://\", \"{0}\", или \"{1}\""
     406
     407#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:543
     408#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570
     409#, java-format
     410msgid "Magnet deleted: {0}"
     411msgstr "Magnet удален: {0}"
     412
     413#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:551
     414#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:576
    365415#, java-format
    366416msgid "Torrent file deleted: {0}"
    367417msgstr "Удален торрент: {0}"
    368418
    369 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533
    370 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:543
     419#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582
     420#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:592
    371421#, java-format
    372422msgid "Data file deleted: {0}"
    373423msgstr "Файл удален: {0}"
    374424
    375 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535
    376 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:545
     425#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584
     426#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:594
    377427#, java-format
    378428msgid "Data file could not be deleted: {0}"
    379429msgstr "Не удалось удалить файл: {0}"
    380430
    381 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554
     431#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:603
    382432#, java-format
    383433msgid "Data dir deleted: {0}"
    384434msgstr "Директория удалена: {0}"
    385435
    386 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:587
     436#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:636
    387437msgid "Error creating torrent - you must select a tracker"
    388438msgstr "Торрент не создан — вы должны указать трекер"
    389439
    390 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602
     440#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:652
    391441#, java-format
    392442msgid "Torrent created for \"{0}\""
    393443msgstr "Создан торрент для \"{0}\""
    394444
    395 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:605
     445#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:654
    396446#, java-format
    397447msgid "Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\""
    398448msgstr "Многие I2P трекеры требуют зарегистрировать на них торрент перед началом раздачи — пожалуйста проверьте требуется ли это перед запуском \"{0}\""
    399449
    400 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:607
     450#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:656
    401451#, java-format
    402452msgid "Error creating a torrent for \"{0}\""
    403453msgstr "Ошибка при создании торрента для: \"{0}\""
    404454
    405 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:610
     455#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:659
    406456#, java-format
    407457msgid "Cannot create a torrent for the nonexistent data: {0}"
    408458msgstr "Невозможно создать торрент для несуществующего файла или директории: {0}"
    409459
    410 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:613
     460#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:662
    411461msgid "Error creating torrent - you must enter a file or directory"
    412462msgstr "Торрент не создан — вы должны указать файл или директорию"
    413463
    414 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616
     464#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:665
    415465msgid "Stopping all torrents and closing the I2P tunnel."
    416466msgstr "Останавливаем все торренты и закрываем соединение с I2P"
    417467
    418 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:627
     468#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676
    419469msgid "I2P tunnel closed."
    420470msgstr "Соединение с I2P закрыто."
    421471
    422 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630
     472#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679
    423473msgid "Opening the I2P tunnel and starting all torrents."
    424474msgstr "Соединяемся с I2P и запускаем все торренты."
    425475
    426 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:759
    427 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:764
    428 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:770
     476#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:802
     477#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:807
     478#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:813
    429479msgid "Tracker Error"
    430480msgstr "Ошибка Трекера"
    431481
    432482# TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
    433 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:762
    434 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:766
    435 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:778
    436 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:782
    437 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:790
    438 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:794
    439 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:799
    440 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:803
     483#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
     484#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:809
     485#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821
     486#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825
     487#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833
     488#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837
     489#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:842
     490#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:846
    441491#, java-format
    442492msgid "1 peer"
     
    446496msgstr[2] "{0} пиров"
    447497
    448 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:775
    449 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:780
     498#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:818
     499#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823
    450500msgid "Seeding"
    451501msgstr "Раздается"
    452502
    453 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:784
    454 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533
     503#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:827
     504#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1661
     505#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766
    455506msgid "Complete"
    456507msgstr "Завершен"
    457508
    458 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:787
    459 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:792
     509#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:830
     510#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:835
    460511msgid "OK"
    461512msgstr "Загружается"
    462513
    463 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796
    464 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:801
     514#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839
     515#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:844
    465516msgid "Stalled"
    466517msgstr "Простаивает"
    467518
    468 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:805
    469 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:808
     519#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848
     520#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:851
    470521msgid "No Peers"
    471522msgstr "Нет Пиров"
    472523
    473 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:810
     524#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:853
    474525msgid "Stopped"
    475526msgstr "Остановлен"
    476527
    477 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837
    478 #, java-format
    479 msgid "Details at {0} tracker"
    480 msgstr "Детали на трекере {0}"
    481 
    482 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:838
     528#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:885
     529msgid "Torrent details"
     530msgstr "Подробная информация"
     531
     532#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:897
     533#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1156
    483534msgid "Info"
    484535msgstr "Информация"
    485536
    486 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:853
     537#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:912
    487538msgid "View files"
    488539msgstr "Открыть директорию"
    489540
    490 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:855
     541#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:914
    491542msgid "Open file"
    492543msgstr "Открыть файл"
    493544
    494 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:865
    495 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569
    496 msgid "Open"
    497 msgstr "Открыть"
    498 
    499 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:909
     545#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956
    500546msgid "Stop the torrent"
    501547msgstr "Остановить торрент"
    502548
    503 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:911
     549#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
    504550msgid "Stop"
    505551msgstr "Остановить"
    506552
    507 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:921
     553#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:967
    508554msgid "Start the torrent"
    509555msgstr "Запустить торрент"
    510556
    511 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:923
     557#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:969
    512558msgid "Start"
    513559msgstr "Запустить"
    514560
    515 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933
     561#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:979
    516562msgid "Remove the torrent from the active list, deleting the .torrent file"
    517563msgstr "Удалить торрент из списка и с диска"
     
    520566#. Single quotes in translate strings with parameters must be doubled.
    521567#. Then the remaining single quite must be escaped
    522 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:938
     568#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:984
    523569#, java-format
    524570msgid "Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?"
    525571msgstr "Вы действительно хотите удалить \\''{0}.torrent\\''? (загруженные файлы удаляться НЕ будут)"
    526572
    527 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:941
     573#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:987
    528574msgid "Remove"
    529575msgstr "Удалить"
    530576
    531 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:950
     577#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:997
    532578msgid "Delete the .torrent file and the associated data file(s)"
    533579msgstr "Удалить торрент и стереть загруженные файлы"
     
    536582#. Single quotes in translate strings with parameters must be doubled.
    537583#. Then the remaining single quite must be escaped
    538 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:955
     584#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1002
    539585#, java-format
    540586msgid "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?"
    541587msgstr "Вы действительно хотите удалить торрент \\''{0}\\'' и все загруженные файлы?"
    542588
    543 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958
     589#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1005
    544590msgid "Delete"
    545591msgstr "Стереть"
    546592
    547 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:991
     593#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1038
    548594msgid "Unknown"
    549595msgstr "Неизвестный"
    550596
    551 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1001
     597#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1050
    552598msgid "Seed"
    553599msgstr "Сид"
    554600
    555 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1019
     601#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1073
    556602msgid "Uninteresting (The peer has no pieces we need)"
    557603msgstr "Uninteresting (У пира нет нужных нам частей торрента)"
    558604
    559 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1021
     605#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1075
    560606msgid "Choked (The peer is not allowing us to request pieces)"
    561607msgstr "Choked (Этот пир не позволяет нам запрашивать части торрента)"
    562608
    563 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1035
     609#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1095
    564610msgid "Uninterested (We have no pieces the peer needs)"
    565611msgstr "Uninterested (У нас нужных этому пиру частей торрента)"
    566612
    567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1037
     613#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097
    568614msgid "Choking (We are not allowing the peer to request pieces)"
    569615msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части торрента)"
    570616
    571 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092
     617#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155
     618#, java-format
     619msgid "Details at {0} tracker"
     620msgstr "Детали на трекере {0}"
     621
     622#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1184
    572623msgid "Add Torrent"
    573624msgstr "Добавить Торрент"
    574625
    575 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094
     626#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
    576627msgid "From URL"
    577628msgstr "Из URL"
    578629
    579 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097
    580 msgid "Torrent file must originate from an I2P-based tracker"
    581 msgstr "Торрент-файл должен быть с I2P-трекера"
    582 
    583 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1102
     630#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1189
     631msgid "Enter the torrent file download URL (I2P only), magnet link, or maggot link"
     632msgstr "Введите URL (только I2P) для загрузки торрент-файла, magnet-ссылку, или maggot-ссылку"
     633
     634#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
    584635msgid "Add torrent"
    585636msgstr "Добавить торрент"
    586637
    587 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1105
     638#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1197
    588639#, java-format
    589640msgid "You can also copy .torrent files to: {0}."
    590641msgstr "Либо вы можете просто скопировать .torrent-файлы в директорию {0}."
    591642
    592 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1107
     643#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1199
    593644msgid "Removing a .torrent will cause it to stop."
    594645msgstr "Удаление .torrent-файла приведёт к остановке торрента."
    595646
    596 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1131
     647#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1222
    597648msgid "Create Torrent"
    598649msgstr "Создать Торрент"
    599650
    600651#. out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
    601 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1134
     652#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1225
    602653msgid "Data to seed"
    603654msgstr "Файлы для раздачи"
    604655
    605 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1138
     656#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229
    606657msgid "File or directory to seed (must be within the specified path)"
    607658msgstr "Файл или директория для раздачи (вводите только название файла или директории, указание абсолютных путей не поддерживается)"
    608659
    609 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1140
     660#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231
     661#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1680
    610662msgid "Tracker"
    611663msgstr "Трекер"
    612664
    613 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142
     665#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233
    614666msgid "Select a tracker"
    615667msgstr "Выбрать трекер"
    616668
    617 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155
     669#. out.write(_("Open trackers and DHT only"));
     670#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1238
     671msgid "Open trackers only"
     672msgstr "Только открытые трекеры"
     673
     674#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253
    618675msgid "or"
    619676msgstr "или"
    620677
    621 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1158
     678#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1256
    622679msgid "Specify custom tracker announce URL"
    623680msgstr "Задать URL анонсера вручную"
    624681
    625 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1161
     682#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259
    626683msgid "Create torrent"
    627684msgstr "Создать торрент"
    628685
    629 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1180
    630 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1317
     686#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277
     687#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416
    631688msgid "Configuration"
    632689msgstr "Настройки"
    633690
    634 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1184
     691#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281
    635692msgid "Data directory"
    636693msgstr "Директория для файлов"
    637694
    638 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1186
     695#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283
    639696msgid "Edit i2psnark.config and restart to change"
    640697msgstr "Для изменения отредактируйте файл i2psnark.config и перезагрузите I2PSnark"
    641698
    642 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1190
     699#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287
    643700msgid "Auto start"
    644701msgstr "Автозапуск"
    645702
    646 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194
     703#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
    647704msgid "If checked, automatically start torrents that are added"
    648705msgstr "Автоматически запускать торренты после добавления"
    649706
    650 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1198
     707#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295
    651708msgid "Theme"
    652709msgstr "Тема"
    653710
    654 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1211
     711#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1308
    655712msgid "Startup delay"
    656713msgstr "Задержка запуска"
    657714
    658 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1213
     715#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1310
    659716msgid "minutes"
    660717msgstr "минут"
    661718
    662 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237
     719#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1334
    663720msgid "Total uploader limit"
    664721msgstr "Ограничение количества слотов отдачи"
    665722
    666723# TODO should replace "uploader limit NN peers" with "global number of upload slots: NN"
    667 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240
     724#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1337
    668725msgid "peers"
    669726msgstr "пиров"
    670727
    671 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244
     728#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1341
    672729msgid "Up bandwidth limit"
    673730msgstr "Ограничение скорости отдачи"
    674731
    675 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1247
     732#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1344
    676733msgid "Half available bandwidth recommended."
    677734msgstr "Рекомендуется использовать половину от доступной пропускной способности."
    678735
    679 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1249
     736#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346
    680737msgid "View or change router bandwidth"
    681738msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P"
    682739
    683 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253
     740#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1350
    684741msgid "Use open trackers also"
    685742msgstr "Дополнительно использовать открытые трекеры"
    686743
    687 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257
     744#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1354
    688745msgid "If checked, announce torrents to open trackers as well as the tracker listed in the torrent file"
    689746msgstr "Анонсировать торренты на открытых трекерах, дополнительно к тем, что указаны внутри торрента"
    690747
    691 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261
     748#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358
    692749msgid "Open tracker announce URLs"
    693750msgstr "URL открытых трекеров"
    694751
    695 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1273
     752#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370
    696753msgid "Inbound Settings"
    697754msgstr "Входящие туннели"
    698755
    699 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1279
     756#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1376
    700757msgid "Outbound Settings"
    701758msgstr "Исходящие туннели"
    702759
    703 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286
     760#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1384
    704761msgid "I2CP host"
    705762msgstr "Адрес I2CP"
    706763
    707 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291
     764#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1389
    708765msgid "I2CP port"
    709766msgstr "Порт I2CP"
    710767
    711 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1303
     768#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1402
    712769msgid "I2CP options"
    713770msgstr "Параметры I2CP"
    714771
    715 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1308
     772#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1407
    716773msgid "Save configuration"
    717774msgstr "Сохранить настройки"
    718775
     776#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1432
     777#, java-format
     778msgid "Invalid magnet URL {0}"
     779msgstr "Неправильный magnet URL {0}"
     780
     781#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1466
     782#, java-format
     783msgid "Invalid info hash in magnet URL {0}"
     784msgstr "Неправильный info hash в magnet URL {0}"
     785
    719786#. * dummies for translation
    720 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1325
     787#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1496
    721788#, java-format
    722789msgid "1 hop"
     
    726793msgstr[2] "{0} хопов"
    727794
    728 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1326
     795#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1497
    729796#, java-format
    730797msgid "1 tunnel"
     
    734801msgstr[2] "{0} туннелей"
    735802
    736 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1480
     803#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1659
     804msgid "Completion"
     805msgstr "Загружено"
     806
     807#. else unknown
     808#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1663
     809#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712
    737810msgid "Size"
    738811msgstr "Размер"
    739812
    740 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1487
     813#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1668
     814msgid "Files"
     815msgstr "Файлов"
     816
     817#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1670
     818msgid "Pieces"
     819msgstr "Части"
     820
     821#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671
     822msgid "Piece size"
     823msgstr "Размер части"
     824
     825#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1693
     826msgid "Magnet link"
     827msgstr "Magnet ссылка"
     828
     829#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1710
     830#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1749
     831msgid "Directory"
     832msgstr "Директория"
     833
     834#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1719
    741835msgid "Priority"
    742836msgstr "Приоритет"
    743837
    744 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492
     838#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724
    745839msgid "Up to higher level directory"
    746840msgstr "Перейти в директорию уровнем выше"
    747841
    748 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517
    749 msgid "Directory"
    750 msgstr "Директория"
    751 
    752842# This debug error message intentionally left in English
    753 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522
     843#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1754
    754844msgid "Torrent not found?"
    755845msgstr "Torrent not found?"
    756846
    757847# This debug error message intentionally left in English
    758 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530
     848#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763
    759849msgid "File not found in torrent?"
    760850msgstr "File not found in torrent?"
    761851
    762 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543
     852#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1776
    763853msgid "complete"
    764854msgstr "скачано"
    765855
    766 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544
     856#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1777
    767857msgid "bytes remaining"
    768858msgstr "байт осталось"
    769859
    770 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1595
     860#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1802
     861msgid "Open"
     862msgstr "Открыть"
     863
     864#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1828
    771865msgid "High"
    772866msgstr "Высокий"
    773867
    774 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1600
     868#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1833
    775869msgid "Normal"
    776870msgstr "Нормальный"
    777871
    778 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1605
     872#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838
    779873msgid "Skip"
    780874msgstr "Пропустить"
    781875
    782 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1614
     876#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1847
    783877msgid "Save priorities"
    784878msgstr "Сохранить приоритеты"
    785879
    786 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726
     880#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1962
    787881#, java-format
    788882msgid "Torrent fetched from {0}"
    789883msgstr "Получен торрент из: {0}"
    790884
    791 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1746
     885#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1984
    792886#, java-format
    793887msgid "Torrent already running: {0}"
    794888msgstr "Торрент уже запущен: {0}"
    795889
    796 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1748
     890#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1986
    797891#, java-format
    798892msgid "Torrent already in the queue: {0}"
    799893msgstr "Торрент уже в очереди: {0}"
    800894
    801 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1755
    802 #, java-format
    803 msgid "Failed to copy torrent file to {0}"
    804 msgstr "Не удалось скопировать торрент в: {0}"
    805 
    806 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1759
     895#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1992
    807896#, java-format
    808897msgid "Torrent at {0} was not valid"
    809898msgstr "Торрент полученный из {0} некорректен"
    810899
    811 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1764
     900#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1999
    812901#, java-format
    813902msgid "Torrent was not retrieved from {0}"
    814903msgstr "Не удалось получить торрент из: {0}"
    815904
     905#~ msgid "Torrent file must originate from an I2P-based tracker"
     906#~ msgstr "Торрент-файл должен быть с I2P-трекера"
     907
    816908#~ msgid "size: {0}B"
    817909#~ msgstr "размер: {0}B"
     
    832924#~ msgstr "Идёт загрузка"
    833925
    834 #~ msgid "File"
    835 #~ msgstr "Файл"
    836 
    837926#~ msgid "FileSize"
    838927#~ msgstr "Размер Файла"
  • apps/i2ptunnel/locale/messages_ru.po

    r84990d9 rbec1b4a  
    99"Project-Id-Version: I2P i2ptunnel\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2011-01-17 18:54+0000\n"
    12 "PO-Revision-Date: 2011-01-18 00:34+0500\n"
     11"POT-Creation-Date: 2011-02-14 18:14+0000\n"
     12"PO-Revision-Date: 2011-02-14 23:24+0500\n"
    1313"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
    1414"Language-Team: foo <foo@bar>\n"
     
    3333msgstr "внутренний"
    3434
    35 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:170
     35#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:171
    3636msgid "Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit."
    3737msgstr "Неправильно переданная форма, возможно вы использовали действие браузера \"назад\" или \"обновить\". Пожалуйста повторите попытку."
    3838
    39 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:217
     39#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:218
    4040msgid "Configuration reloaded for all tunnels"
    4141msgstr "Конфигурация для всех туннелей перечитана"
    4242
    4343#. and give them something to look at in any case
    44 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:229
     44#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:230
    4545msgid "Starting tunnel"
    4646msgstr "Запуск туннеля"
    4747
    4848#. and give them something to look at in any case
    49 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:242
     49#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:243
    5050msgid "Stopping tunnel"
    5151msgstr "Остановка туннеля"
    5252
    53 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:389
     53#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:311
     54msgid "Configuration changes saved"
     55msgstr "Настройки сохранены"
     56
     57#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:314
     58msgid "Failed to save configuration"
     59msgstr "Не удалось сохранить настройки"
     60
     61#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:398
    5462msgid "New Tunnel"
    5563msgstr "Новый туннель"
    5664
    57 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:409
     65#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:418
    5866msgid "Standard client"
    5967msgstr "Обычный клиент"
    6068
    61 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:410
     69#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:419
    6270msgid "HTTP client"
    6371msgstr "HTTP-клиент"
    6472
    65 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:411
     73#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:420
    6674msgid "IRC client"
    6775msgstr "IRC-клиент"
    6876
    69 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:412
     77#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:421
    7078msgid "Standard server"
    7179msgstr "Обычный сервер"
    7280
    73 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:413
     81#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:422
    7482msgid "HTTP server"
    7583msgstr "HTTP-сервер"
    7684
    77 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:414
     85#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:423
    7886msgid "SOCKS 4/4a/5 proxy"
    7987msgstr "SOCKS 4/4a/5 прокси"
    8088
    81 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:415
     89#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:424
    8290msgid "SOCKS IRC proxy"
    8391msgstr "SOCKS IRC прокси"
    8492
    85 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:416
     93#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:425
    8694msgid "CONNECT/SSL/HTTPS proxy"
    8795msgstr "CONNECT/SSL/HTTPS прокси"
    8896
    89 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:417
     97#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:426
    9098msgid "IRC server"
    9199msgstr "IRC-сервер"
    92100
    93 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:418
     101#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:427
    94102msgid "Streamr client"
    95103msgstr "Streamr-клиент"
    96104
    97 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:419
     105#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:428
    98106msgid "Streamr server"
    99107msgstr "Streamr-сервер"
    100108
    101 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:420
     109#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:429
    102110msgid "HTTP bidir"
    103111msgstr "HTTP bidir (экспериментальный двунаправленный режим, инструкцию спрашивайте у sponge)"
    104112
    105 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508
     113#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517
     114#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:290
    106115msgid "Host not set"
    107116msgstr "Хост не задан"
    108117
    109 #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512
     118#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:521
    110119#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:272
    111120msgid "Port not set"
     
    561570
    562571#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:451
    563 msgid "Inbound connection limits (0 to disable)"
    564 msgstr "Ограничение входящих соединений (0 для отключения)"
     572msgid "Inbound connection limits (0=unlimited)"
     573msgstr "Ограничение входящих соединений (0=неограниченно)"
    565574
    566575#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:453
     
    585594
    586595#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:475
    587 msgid "Max concurrent connections (0 to disable)"
    588 msgstr "Максимум одновременных соединений (0 для отключения)"
     596msgid "Max concurrent connections (0=unlimited)"
     597msgstr "Максимум одновременных соединений (0=неограниченно)"
    589598
    590599#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:493
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r84990d9 rbec1b4a  
    5656    private static final String USAGE = "Bad RouterConsoleRunner arguments, check clientApp.0.args in your clients.config file! " +
    5757                                        "Usage: [[port host[,host]] [-s sslPort [host[,host]]] [webAppsDir]]";
    58     private static final String PROP_HEADLESS = "router.isHeadless";
    5958   
    6059    static {
     
    6261       
    6362        //Check if we are in a headless environment, set properties accordingly
    64         List<RouterContext> contexts = RouterContext.listContexts();
    65         if(contexts != null && contexts.size() > 0) {
    66                 RouterContext context = contexts.get(0);
    67                 String headless = context.getProperty(PROP_HEADLESS);
    68                 if(headless == null) {
    69                         /*
    70                          * Let's check if we are in a headless environment.
    71                          * We do this by setting headless to false
    72                          * and trying to get the graphics environment.
    73                          * If this fails, we should be headless.
    74                          */
    75                         System.setProperty("java.awt.headless", "false");
    76                         try {
    77                         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
    78                         ge.isHeadlessInstance();
    79                         context.setProperty(PROP_HEADLESS, "false");
    80                         }
    81                         catch(InternalError e) {
    82                                 context.setProperty(PROP_HEADLESS, "true");
    83                         }
    84                         context.router().setConfigSetting(PROP_HEADLESS, context.getProperty(PROP_HEADLESS));
    85                 context.router().saveConfig();
    86                 context.router().shutdown(0);
    87                 }
    88                 boolean isHeadless = true;
    89                 try {
    90                         isHeadless = Boolean.parseBoolean(headless);
    91                 }
    92                 catch(Exception e) {
    93                         //Incorrect setting, let's choose headless for safety
    94                         isHeadless = true;
    95                 }
    96                 if(isHeadless) {
    97                         System.setProperty("java.awt.headless", "true");
    98                 }
    99                 else {
    100                         System.setProperty("java.awt.headless", "false");
    101                 }
     63        String headless = "java.awt.headless";
     64        if(GraphicsEnvironment.isHeadless()) {
     65                System.setProperty(headless, "true");
     66        }
     67        else {
     68                System.setProperty(headless, "false");
    10269        }
    10370    }
     
    360327
    361328        try {
    362                 //TODO: move away from routerconsole into a separate application.
    363                 //ApplicationManager?
    364                 VersionComparator v = new VersionComparator();
    365                 if(v.compare(System.getProperty("java.runtime.version"), "1.6") >= 0) {
     329            //TODO: move away from routerconsole into a separate application.
     330            //ApplicationManager?
     331            VersionComparator v = new VersionComparator();
     332            if(v.compare(System.getProperty("java.runtime.version"), "1.6") >= 0) {
    366333                String[] args = new String[0];
    367                 net.i2p.desktopgui.Main.beginStartup(args);     
    368                 }
     334                net.i2p.desktopgui.Main.beginStartup(args);   
     335            }
    369336        } catch (Throwable t) {
    370337            t.printStackTrace();
  • apps/routerconsole/locale/messages_ru.po

    r84990d9 rbec1b4a  
    99"Project-Id-Version: I2P routerconsole\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2011-01-17 18:53+0000\n"
    12 "PO-Revision-Date: 2011-01-18 01:19+0500\n"
     11"POT-Creation-Date: 2011-02-14 18:14+0000\n"
     12"PO-Revision-Date: 2011-02-14 23:21+0500\n"
    1313"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
    1414"Language-Team: \n"
     
    8585msgstr[2] "{0} дней"
    8686
    87 #: ../../../router/java/src/net/i2p/router/Blocklist.java:126
     87#: ../../../router/java/src/net/i2p/router/Blocklist.java:122
    8888#, java-format
    8989msgid "Banned by router hash: {0}"
    9090msgstr "Забанен по хэшу маршрутизатора: {0}"
    9191
    92 #: ../../../router/java/src/net/i2p/router/Blocklist.java:128
     92#: ../../../router/java/src/net/i2p/router/Blocklist.java:124
    9393msgid "Banned by router hash"
    9494msgstr "Забанен по хэшу маршрутизатора"
    9595
    9696#. Temporary reason, until the job finishes
    97 #: ../../../router/java/src/net/i2p/router/Blocklist.java:673
     97#: ../../../router/java/src/net/i2p/router/Blocklist.java:669
    9898msgid "IP banned"
    9999msgstr "IP заблокирован"
    100100
    101 #: ../../../router/java/src/net/i2p/router/Blocklist.java:743
     101#: ../../../router/java/src/net/i2p/router/Blocklist.java:739
    102102#, java-format
    103103msgid "IP banned by blocklist.txt entry {0}"
     
    153153msgstr "Не принимаем туннели"
    154154
    155 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:98
     155#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:105
    156156#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20
    157157msgid "Reseeding"
    158158msgstr "Начальная загрузка"
    159159
    160 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:121
     160#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:128
    161161#, java-format
    162162msgid "Reseed fetched only 1 router."
     
    166166msgstr[2] "При начальной загрузке получены данные только о {0} роутерах."
    167167
    168 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:128
     168#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:135
    169169msgid "Reseed failed."
    170170msgstr "Попытка начальной загрузки провалилась."
    171171
    172 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:129
     172#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:136
    173173#, java-format
    174174msgid "See {0} for help."
    175175msgstr "Смотрите {0} для помощи."
    176176
    177 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:130
     177#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:137
    178178msgid "reseed configuration page"
    179179msgstr "страница настройки начальной загрузки"
    180180
    181 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:231
     181#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:239
    182182msgid "Reseeding: fetching seed URL."
    183183msgstr "Производится начальная загрузка: загружается URL каталога маршрутизаторов."
    184184
    185 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:272
     185#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:281
    186186#, java-format
    187187msgid "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
    188188msgstr "Производится начальная загрузка: получение информации о маршрутизаторах ({0} удачно, {1} ошибок)."
    189189
    190 #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:513
     190#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:512
    191191msgid "NetDb entry"
    192192msgstr "показать описание в NetDb"
     
    197197msgstr "Нет транспортных протоколов (в скрытом режиме или запущен недавно?)"
    198198
    199 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:452
     199#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:450
    200200msgid "Unreachable on any transport"
    201201msgstr "Недоступен по всем транспортным протоколам"
    202202
    203 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:501
     203#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:499
    204204msgid "Router Transport Addresses"
    205205msgstr "Адреса транспортов маршрутизатора"
    206206
    207 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:506
     207#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:504
    208208#, java-format
    209209msgid "{0} is used for outbound connections only"
    210210msgstr "{0} используется только для исходящих соединений"
    211211
    212 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:520
     212#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:518
    213213#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:123
    214214msgid "Help"
    215215msgstr "Справка"
    216216
    217 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:521
     217#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:519
    218218msgid "Your transport connection limits are automatically set based on your configured bandwidth."
    219219msgstr "Лимиты транспортных соединений назначены автоматически на основе заданной вами пропускной способности."
    220220
    221 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:523
     221#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:521
    222222msgid "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and i2np.udp.maxConnections=nnn on the advanced configuration page."
    223223msgstr "Для переопределения этих лимитов добавьте параметры i2np.ntcp.maxConnections=nnn и i2np.udp.maxConnections=nnn на странице расширенных настроек."
    224224
    225 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:525
     225#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:523
    226226#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:257
    227227msgid "Definitions"
    228228msgstr "Условные обозначения"
    229229
    230 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:526
     230#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:524
    231231#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:735
    232232#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1890
     
    240240msgstr "Пир"
    241241
    242 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:526
     242#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:524
    243243msgid "The remote peer, identified by router hash"
    244244msgstr "Уникальный идентификатор пира (несколько начальных символов из хеша его маршрутизатора)"
    245245
    246 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:527
     246#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:525
    247247#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:736
    248248#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1894
     
    250250msgstr "Направление"
    251251
    252 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
     252#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:526
    253253msgid "Inbound connection"
    254254msgstr "Входящее соединение"
    255255
    256 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
     256#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:528
    257257msgid "Outbound connection"
    258258msgstr "Исходящее соединение"
    259259
    260 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
     260#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:530
    261261msgid "They offered to introduce us (help other peers traverse our firewall)"
    262262msgstr "Этот пир предлагает себя в качестве нашего посредника (для того, чтобы другие пиры могли соединяться с нами в обход нашего брандмауэра)"
    263263
    264 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
     264#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:532
    265265msgid "We offered to introduce them (help other peers traverse their firewall)"
    266266msgstr "Мы предлагаем себя в качестве посредника для этого пира (для того, чтобы другие пиры могли соединяться с ним в обход его брандмауэра)"
    267267
    268 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
     268#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
    269269msgid "How long since a packet has been received / sent"
    270270msgstr "Сколько прошло времени после приёма/передачи последнего пакета"
    271271
    272 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
     272#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:533
    273273#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:737
    274274#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1895
     
    276276msgstr "Неактивен"
    277277
    278 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
     278#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
    279279#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:738
    280280#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1900
     
    283283msgstr "Приём/Передача"
    284284
    285 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
     285#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:534
    286286msgid "The smoothed inbound / outbound transfer rate (KBytes per second)"
    287287msgstr "Усреднённые скорости приёма / передачи (КБайт/сек) "
    288288
    289 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
     289#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
    290290msgid "How long ago this connection was established"
    291291msgstr "Время жизни соединения"
    292292
    293 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
     293#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:535
    294294#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:739
    295295#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1905
     
    297297msgstr "Подключен"
    298298
    299 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
     299#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
    300300#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:740
    301301#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1907
     
    303303msgstr "Сдвиг"
    304304
    305 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
     305#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:536
    306306msgid "The difference between the peer's clock and your own"
    307307msgstr "Разница хода часов между пиром и нами"
    308308
    309 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
     309#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:537
    310310msgid "The congestion window, which is how many bytes can be sent without an acknowledgement"
    311311msgstr "<i>Congestion Window.</i> Окно насыщения — количество байт, которое мы можем послать до ожидания подтверждения"
    312312
    313 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
     313#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:538
    314314msgid "The number of sent messages awaiting acknowledgement"
    315315msgstr "Количество отправленных сообщений ожидающих подтверждения"
    316316
    317 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
     317#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:539
    318318msgid "The maximum number of concurrent messages to send"
    319319msgstr "Максимальное количество параллельно отправляемых сообщений"
    320320
    321 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
     321#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:540
    322322msgid "The number of pending sends which exceed congestion window"
    323323msgstr "Количество ожидающих посылок превосходящих размер окна насыщения"
    324324
    325 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
     325#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:541
    326326msgid "The slow start threshold"
    327327msgstr "<i>Slow Start Threshold.</i> Величина порога медленного старта"
    328328
    329 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
     329#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:542
    330330msgid "The round trip time in milliseconds"
    331331msgstr "<i>Round-Trip Time.</i> Время между отправкой запроса и получением ответа (миллисекунды)"
    332332
    333 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
     333#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
    334334#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1917
    335335msgid "Dev"
    336336msgstr "Отклонение"
    337337
    338 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
     338#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:543
    339339msgid "The standard deviation of the round trip time in milliseconds"
    340340msgstr "Среднеквадратическое отклонение RTT (миллисекунды)"
    341341
    342 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
     342#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:544
    343343msgid "The retransmit timeout in milliseconds"
    344344msgstr "<i>Retransmit Time-Out.</i> Время ожидания подтверждения перед повторной посылкой пакета (миллисекунды)"
    345345
    346 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
     346#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:545
    347347msgid "Current maximum send packet size / estimated maximum receive packet size (bytes)"
    348348msgstr "<i>Maximum Transfer Unit.</i> Текущий максимальный размер исходящего пакета / максимальный размер принятого пакета (байт) "
    349349
    350 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
     350#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
    351351#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:741
    352352#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1924
     
    354354msgstr "Передано"
    355355
    356 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
     356#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:546
    357357msgid "The total number of packets sent to the peer"
    358358msgstr "Общее количество посланных пиру пакетов"
    359359
    360 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
     360#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
    361361#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:742
    362362#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1926
     
    364364msgstr "Принято"
    365365
    366 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
     366#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:547
    367367msgid "The total number of packets received from the peer"
    368368msgstr "Общее количество принятых от пира пакетов"
    369369
    370 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:550
     370#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
    371371#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1929
    372372msgid "Dup TX"
    373373msgstr "Повт. принято"
    374374
    375 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:550
     375#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:548
    376376msgid "The total number of packets retransmitted to the peer"
    377377msgstr "Общее количество повторно посланных пиру пакетов"
    378378
    379 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
     379#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
    380380#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:1931
    381381msgid "Dup RX"
    382382msgstr "Повт. передано"
    383383
    384 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:551
     384#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:549
    385385msgid "The total number of duplicate packets received from the peer"
    386386msgstr "Общее количество повторно принятых от пира пакетов"
     
    21852185
    21862186#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:80
    2187 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:335
     2187#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:323
    21882188msgid "Run I2P on startup"
    21892189msgstr "Запускать I2P при старте"
    21902190
    21912191#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:82
    2192 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
     2192#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
    21932193msgid "Don't run I2P on startup"
    21942194msgstr "Не запускать I2P при старте"
    21952195
    21962196#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:84
    2197 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:355
     2197#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:343
    21982198msgid "Dump threads"
    21992199msgstr "Вывести список потоков"
    22002200
    22012201#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:91
    2202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:323
    2203 msgid "Show systray icon"
    2204 msgstr "Показать значок статуса"
    2205 
    2206 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96
    2207 msgid "System tray icon enabled."
    2208 msgstr "Включен значок-индикатор статуса в области уведомлений."
    2209 
    2210 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:98
    2211 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:110
    2212 msgid "System tray icon feature not supported on this platform. Sorry!"
    2213 msgstr "Вывод индикаторов в области уведомлений на этой платформе не поддерживается. Извините!"
    2214 
    2215 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:101
    2216 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113
    2217 msgid "Warning: unable to contact the systray manager"
    2218 msgstr "Предупреждение: Не удалось соединиться с менеджером области уведомлений"
    2219 
    2220 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:103
    2221 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:325
    2222 msgid "Hide systray icon"
    2223 msgstr "Спрятать значок статуса"
    2224 
    2225 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:108
    2226 msgid "System tray icon disabled."
    2227 msgstr "Выключен значок-индикатор статуса в области уведомлений."
    2228 
    2229 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115
    2230 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:363
     2202#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:351
    22312203msgid "View console on startup"
    22322204msgstr "Открывать веб-консоль при запуске I2P"
    22332205
    2234 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:117
     2206#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:93
    22352207msgid "Console is to be shown on startup"
    22362208msgstr "Веб-консоль будет открываться при запуске I2P"
    22372209
    2238 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:118
    2239 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:365
     2210#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:94
     2211#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:353
    22402212msgid "Do not view console on startup"
    22412213msgstr "Не открывать веб-консоль при запуске I2P"
    22422214
    2243 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:120
     2215#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:96
    22442216msgid "Console is not to be shown on startup"
    22452217msgstr "Веб-консоль не будет открываться при запуске I2P"
    22462218
    2247 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:129
     2219#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:105
    22482220msgid "Service installed"
    22492221msgstr "Служба установлена"
    22502222
    2251 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:131
     2223#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:107
    22522224msgid "Warning: unable to install the service"
    22532225msgstr "Предупреждение: не удалось установить службу"
    22542226
    2255 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:137
     2227#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:113
    22562228msgid "Service removed"
    22572229msgstr "Служба удалена"
    22582230
    2259 #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:139
     2231#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:115
    22602232msgid "Warning: unable to remove the service"
    22612233msgstr "Предупреждение: не удалось удалить службу"
     
    25012473#: ../java/src/net/i2p/router/web/GraphHelper.java:152
    25022474#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:417
    2503 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333
     2475#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:321
    25042476msgid "or"
    25052477msgstr "или"
     
    27692741msgstr "{0} байт скачано"
    27702742
    2771 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:152
     2743#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:153
    27722744msgid "Plugin downloaded"
    27732745msgstr "Плагин загружен"
    27742746
    2775 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:157
    2776 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:344
     2747#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:158
     2748#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:345
    27772749#, java-format
    27782750msgid "Cannot create plugin directory {0}"
    27792751msgstr "Не удалось создать директорию плагина {0}"
    27802752
    2781 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:166
     2753#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:167
    27822754#: ../java/src/net/i2p/router/web/UpdateHandler.java:298
    27832755#, java-format
     
    27852757msgstr "из {0}"
    27862758
    2787 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:176
     2759#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:177
    27882760#, java-format
    27892761msgid "Plugin from {0} is corrupt"
    27902762msgstr "Загруженный из {0} плагин поврежден"
    27912763
    2792 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:187
     2764#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:188
    27932765#, java-format
    27942766msgid "Plugin from {0} does not contain the required configuration file"
     
    27962768
    27972769#. updateStatus("<b>" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + "</b>");
    2798 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:200
     2770#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:201
    27992771#, java-format
    28002772msgid "Plugin from {0} contains an invalid key"
    28012773msgstr "Загруженный из {0} плагин содержит некорректный ключ"
    28022774
    2803 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:219
    2804 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:228
    2805 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:237
     2775#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:220
     2776#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:229
     2777#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:238
    28062778#, java-format
    28072779msgid "Plugin signature verification of {0} failed"
    28082780msgstr "Плагин {0} содержит недействительную подпись"
    28092781
    2810 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:252
     2782#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:253
    28112783#, java-format
    28122784msgid "Plugin from {0} has invalid name or version"
    28132785msgstr "Загруженный из {0} плагин имеет некорректное название или версию"
    28142786
    2815 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:257
     2787#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:258
    28162788#, java-format
    28172789msgid "Plugin {0} has mismatched versions"
    28182790msgstr "Плагин {0} содержит несовпадающие версии"
    28192791
    2820 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:265
     2792#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:266
    28212793#, java-format
    28222794msgid "This plugin requires I2P version {0} or higher"
    28232795msgstr "Для этого плагина требуется версия I2P {0} и выше"
    28242796
    2825 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:273
     2797#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:274
    28262798#, java-format
    28272799msgid "This plugin requires Java version {0} or higher"
    28282800msgstr "Для этого плагина требуется версия Java {0} и выше"
    28292801
    2830 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:281
     2802#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:282
    28312803msgid "Downloaded plugin is for new installs only, but the plugin is already installed"
    28322804msgstr "Загруженный инсталлятор плагина предназначен только для первоначальной установки, но такой плагин уже установлен"
    28332805
    2834 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:293
     2806#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:294
    28352807msgid "Installed plugin does not contain the required configuration file"
    28362808msgstr "Установленный плагин не содержит необходимого файла настроек"
    28372809
    2838 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:301
     2810#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:302
    28392811msgid "Signature of downloaded plugin does not match installed plugin"
    28402812msgstr "Подпись загруженного плагина не совпадает с установленным плагином"
    28412813
    2842 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:308
     2814#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:309
    28432815#, java-format
    28442816msgid "Downloaded plugin version {0} is not newer than installed plugin"
    28452817msgstr "Версия скачанного плагина {0} не новее версии уже установленного плагина"
    28462818
    2847 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:315
     2819#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:316
    28482820#, java-format
    28492821msgid "Plugin update requires installed plugin version {0} or higher"
    28502822msgstr "Для обновления плагина требуется установленная версия плагина {0} и выше"
    28512823
    2852 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:322
     2824#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:323
    28532825#, java-format
    28542826msgid "Plugin update requires installed plugin version {0} or lower"
    28552827msgstr "Для обновления плагина требуется установленная версия плагина {0} и ниже"
    28562828
    2857 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:339
     2829#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:340
    28582830msgid "Plugin is for upgrades only, but the plugin is not installed"
    28592831msgstr "Загруженный инсталлятор плагина предназначен только для обновления, но такой плагин ещё не был установлен"
    28602832
    2861 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:352
     2833#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:353
    28622834#, java-format
    28632835msgid "Failed to install plugin in {0}"
    28642836msgstr "Не удалось установить плагин в {0}"
    28652837
    2866 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:359
     2838#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:360
    28672839#, java-format
    28682840msgid "Plugin {0} installed, router restart required"
    28692841msgstr "Плагин {0} установлен, требуется перезапуск маршрутизатора"
    28702842
    2871 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:361
     2843#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:362
    28722844#, java-format
    28732845msgid "Plugin {0} installed"
    28742846msgstr "Плагин {0} установлен"
    28752847
    2876 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:379
     2848#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:380
    28772849#, java-format
    28782850msgid "Plugin {0} installed and started"
    28792851msgstr "Плагин {0} установлен и запущен"
    28802852
    2881 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:382
     2853#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:383
    28822854#, java-format
    28832855msgid "Plugin {0} installed but failed to start, check logs"
    28842856msgstr "Плагин {0} установлен, но при его запуске произошел сбой, загляните в логи"
    28852857
    2886 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:384
     2858#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:385
    28872859#, java-format
    28882860msgid "Plugin {0} installed but failed to start"
    28892861msgstr "Плагин {0} установлен, но при его запуске произошел сбой"
    28902862
    2891 #: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:394
     2863#: ../java/src/net/i2p/router/web/PluginUpdateHandler.java:395
    28922864#, java-format
    28932865msgid "Failed to download plugin from {0}"
     
    32153187msgstr "Максимальное среднее"
    32163188
    3217 #: ../java/src/net/i2p/router/web/StatsGenerator.java:202
    3218 #, java-format
    3219 msgid "in this period which ended {0} ago."
    3220 msgstr "в этом периоде который закончился {0} назад."
    3221 
    3222 #: ../java/src/net/i2p/router/web/StatsGenerator.java:204
     3189#. breaking the sentence like before makes translation in my language impossible.
     3190#: ../java/src/net/i2p/router/web/StatsGenerator.java:201
     3191#, java-format
     3192msgid "There were {0} event(s) in this period"
     3193msgstr "Было {0} событий в этом периоде"
     3194
     3195#. buf.append(' ');
     3196#: ../java/src/net/i2p/router/web/StatsGenerator.java:203
     3197#, java-format
     3198msgid " which ended {0} ago."
     3199msgstr "который закончился {0} назад."
     3200
     3201#: ../java/src/net/i2p/router/web/StatsGenerator.java:205
    32233202msgid "No events"
    32243203msgstr "Нет событий"
    32253204
    3226 #: ../java/src/net/i2p/router/web/StatsGenerator.java:210
     3205#: ../java/src/net/i2p/router/web/StatsGenerator.java:211
    32273206msgid "Average event count"
    32283207msgstr "Среднее число событий"
    32293208
    3230 #: ../java/src/net/i2p/router/web/StatsGenerator.java:212
     3209#: ../java/src/net/i2p/router/web/StatsGenerator.java:213
    32313210msgid "Events in peak period"
    32323211msgstr "Событий за период пика"
    32333212
    3234 #: ../java/src/net/i2p/router/web/StatsGenerator.java:220
     3213#: ../java/src/net/i2p/router/web/StatsGenerator.java:221
    32353214msgid "Graph Data"
    32363215msgstr "График данных"
    32373216
    3238 #: ../java/src/net/i2p/router/web/StatsGenerator.java:222
     3217#: ../java/src/net/i2p/router/web/StatsGenerator.java:223
    32393218msgid "Graph Event Count"
    32403219msgstr "График количества событий"
    32413220
    3242 #: ../java/src/net/i2p/router/web/StatsGenerator.java:225
     3221#: ../java/src/net/i2p/router/web/StatsGenerator.java:226
    32433222msgid "Export Data as XML"
    32443223msgstr "Экспорт данных в XML"
    32453224
    32463225#. Display the strict average
    3247 #: ../java/src/net/i2p/router/web/StatsGenerator.java:230
     3226#: ../java/src/net/i2p/router/web/StatsGenerator.java:231
    32483227msgid "Lifetime average value"
    32493228msgstr "Среднее значение за время работы"
     
    43644343
    43654344#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:509
    4366 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:339
     4345#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:327
    43674346#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:330
    43684347msgid "Note"
     
    50215000
    50225001#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:315
    5023 msgid "Systray integration"
    5024 msgstr "Интеграция в область уведомлений"
    5025 
    5026 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:317
    5027 msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status"
    5028 msgstr "Если Вы работаете под Windows, у Вас есть возможность отслеживать статус маршрутизатора через значок в области уведомлений"
    5029 
    5030 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:319
    5031 msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)."
    5032 msgstr "(когда-нибудь и клиентские приложения для I2P будут там доступны)."
    5033 
    5034 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:321
    5035 msgid "If you are on windows, you can either enable or disable that icon here."
    5036 msgstr "Если Вы пользуетесь I2P под Windows, то здесь Вы можете настроить отображение этого значка."
    5037 
    5038 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:327
    50395002msgid "Run on startup"
    50405003msgstr "Автоматический запуск I2P"
    50415004
    5042 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
     5005#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:317
    50435006msgid "You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly."
    50445007msgstr "Вы можете настроить автоматическую загрузку маршрутизатора при каждом запуске Windows. В зависимости от выбранной кнопки I2P немедленно установит или удалит свою службу из списка служб Windows."
    50455008
    5046 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:331
     5009#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:319
    50475010msgid "If you prefer the command line, you can also run the "
    50485011msgstr "Если Вам удобно работать через командную строку, попробуйте использовать "
    50495012
    5050 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:341
     5013#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:329
    50515014msgid "If you are running I2P as service right now, removing it will shut down your router immediately."
    50525015msgstr "Если служба I2P уже была запущена, при выборе варианта <b>\"Не запускать I2P при старте\"</b> маршрутизатор будет моментально остановлен."
    50535016
    5054 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:343
     5017#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:331
    50555018msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat."
    50565019msgstr "Возможно лучше плавно остановить маршрутизатор и после этого запустить файл C:\\Program Files\\I2P\\uninstall_i2p_service_winnt.bat."
    50575020
    5058 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:347
     5021#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:335
    50595022msgid "Debugging"
    50605023msgstr "Отладка"
    50615024
    5062 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:349
     5025#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337
    50635026msgid "View the job queue"
    50645027msgstr "Просмотр очереди заданий"
    50655028
    5066 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:353
     5029#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:341
    50675030msgid "At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
    50685031msgstr "В некоторых случаях для отладки может пригодиться список состояний потоков I2P-маршутизатора. Для получения такого списка нажмите эту кнопку. Список будет сохранен в файле <a href=\"logs.jsp#servicelogs\">wrapper.log</a>."
    50695032
    5070 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:359
     5033#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:347
    50715034msgid "Launch browser on router startup?"
    50725035msgstr "Запускать браузер при старте I2P?"
    50735036
    5074 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:361
     5037#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:349
    50755038msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at"
    50765039msgstr "Основной интерфейс настройки I2P это веб-консоль. Здесь можно выбрать автоматическое открытие при запуске маршрутизатора страницы"
     
    54345397msgid "I2P Tunnel Summary"
    54355398msgstr "Обзор туннелей I2P"
     5399
     5400#~ msgid "Show systray icon"
     5401#~ msgstr "Показать значок статуса"
     5402
     5403#~ msgid "System tray icon enabled."
     5404#~ msgstr "Включен значок-индикатор статуса в области уведомлений."
     5405
     5406#~ msgid "System tray icon feature not supported on this platform. Sorry!"
     5407#~ msgstr ""
     5408#~ "Вывод индикаторов в области уведомлений на этой платформе не "
     5409#~ "поддерживается. Извините!"
     5410
     5411#~ msgid "Warning: unable to contact the systray manager"
     5412#~ msgstr ""
     5413#~ "Предупреждение: Не удалось соединиться с менеджером области уведомлений"
     5414
     5415#~ msgid "Hide systray icon"
     5416#~ msgstr "Спрятать значок статуса"
     5417
     5418#~ msgid "System tray icon disabled."
     5419#~ msgstr "Выключен значок-индикатор статуса в области уведомлений."
     5420
     5421#~ msgid "Systray integration"
     5422#~ msgstr "Интеграция в область уведомлений"
     5423
     5424#~ msgid ""
     5425#~ "On the windows platform, there is a small application to sit in the "
     5426#~ "system tray, allowing you to view the router's status"
     5427#~ msgstr ""
     5428#~ "Если Вы работаете под Windows, у Вас есть возможность отслеживать статус "
     5429#~ "маршрутизатора через значок в области уведомлений"
     5430
     5431#~ msgid ""
     5432#~ "(later on, I2P client applications will be able to integrate their own "
     5433#~ "functionality into the system tray as well)."
     5434#~ msgstr "(когда-нибудь и клиентские приложения для I2P будут там доступны)."
     5435
     5436#~ msgid ""
     5437#~ "If you are on windows, you can either enable or disable that icon here."
     5438#~ msgstr ""
     5439#~ "Если Вы пользуетесь I2P под Windows, то здесь Вы можете настроить "
     5440#~ "отображение этого значка."
    54365441
    54375442#~ msgid ""
  • core/java/src/net/i2p/data/DateAndFlags.java

    r84990d9 rbec1b4a  
    3737     *  @param flags 0 - 65535
    3838     */
    39     public DateAndFlags(int flags, long date) {
     39    public DateAndFlags(long date, int flags) {
    4040        _flags = flags;
    4141        _date = date;
     
    4545     *  @param flags 0 - 65535
    4646     */
    47     public DateAndFlags(int flags, Date date) {
     47    public DateAndFlags(Date date, int flags) {
    4848        _flags = flags;
    4949        _date = date.getTime();
  • core/java/src/net/i2p/util/Executor.java

    r84990d9 rbec1b4a  
    66
    77class Executor implements Runnable {
    8     private I2PAppContext _context;
     8    private final I2PAppContext _context;
    99    private Log _log;
    1010    private final List _readyEvents;
    11     private SimpleStore runn;
     11    private final SimpleStore runn;
    1212
    1313    public Executor(I2PAppContext ctx, Log log, List events, SimpleStore x) {
     
    3232                    evt.timeReached();
    3333                } catch (Throwable t) {
    34                     log("wtf, event borked: " + evt, t);
     34                    log("Executing task " + evt + " exited unexpectedly, please report", t);
    3535                }
    3636                long time = _context.clock().now() - before;
     37                // FIXME _log won't be non-null unless we already had a CRIT
    3738                if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
    3839                    _log.warn("wtf, event execution took " + time + ": " + evt);
  • core/java/src/net/i2p/util/SimpleScheduler.java

    r84990d9 rbec1b4a  
    3131    private static final int MIN_THREADS = 2;
    3232    private static final int MAX_THREADS = 4;
    33     private I2PAppContext _context;
    34     private Log _log;
    35     private ScheduledThreadPoolExecutor _executor;
    36     private String _name;
     33    private final I2PAppContext _context;
     34    private final Log _log;
     35    private final ScheduledThreadPoolExecutor _executor;
     36    private final String _name;
    3737    private int _count;
    3838    private final int _threads;
     
    4343        _log = _context.logManager().getLog(SimpleScheduler.class);
    4444        _name = name;
    45         _count = 0;
    4645        long maxMemory = Runtime.getRuntime().maxMemory();
    4746        _threads = (int) Math.max(MIN_THREADS, Math.min(MAX_THREADS, 1 + (maxMemory / (32*1024*1024))));
     
    140139                _timedEvent.timeReached();
    141140            } catch (Throwable t) {
    142                 _log.log(Log.CRIT, _name + " wtf, event borked: " + _timedEvent, t);
     141                _log.log(Log.CRIT, _name + ": Scheduled task " + _timedEvent + " exited unexpectedly, please report", t);
    143142            }
    144143            long time = System.currentTimeMillis() - before;
  • core/java/src/net/i2p/util/SimpleTimer.java

    r84990d9 rbec1b4a  
    1515 * they b0rk the timer).
    1616 *
     17 * WARNING - Deprecated.
     18 * This is an inefficient mess. Use SimpleScheduler or SimpleTimer2 if possible.
    1719 */
    1820public class SimpleTimer {
  • core/java/src/net/i2p/util/SimpleTimer2.java

    r84990d9 rbec1b4a  
    3030    private static final int MIN_THREADS = 2;
    3131    private static final int MAX_THREADS = 4;
    32     private I2PAppContext _context;
     32    private final I2PAppContext _context;
    3333    private static Log _log; // static so TimedEvent can use it
    34     private ScheduledThreadPoolExecutor _executor;
    35     private String _name;
     34    private final ScheduledThreadPoolExecutor _executor;
     35    private final String _name;
    3636    private int _count;
    3737    private final int _threads;
     
    224224                timeReached();
    225225            } catch (Throwable t) {
    226                 _log.log(Log.CRIT, _pool + " wtf, event borked: " + this, t);
     226                _log.log(Log.CRIT, _pool + ": Timed task " + this + " exited unexpectedly, please report", t);
    227227            }
    228228            long time = System.currentTimeMillis() - before;
  • history.txt

    r84990d9 rbec1b4a  
     12011-02-15 zzz
     2    * i2psnark: Details link shuffle, mostly restore 0.8.3 behavior
     3    * Profiles: Punish rejections more, in an attempt to spread the
     4                load more through the network
     5    * Timers: Log cleanup
     6
     72011-02-14 Mathiasdm
     8    * Fix headless issue without reboot
     9
    1102011-02-13 zzz
    211    * Connect Client: Minor NPE fix cleanup
    3     * JobQueue: Prevet NPE at shutdown (thanks liberty)
     12    * JobQueue: Prevent NPE at shutdown (thanks liberty)
    413    * GeoIP: Prevent startup NPE (ticket #413, thanks RN)
    514    * NetDB: Prevent ExpireLeaseJob NPE (thanks sponge)
     
    1928            when closed by the client, was causing massive memory leak
    2029            for internal clients using lots of sessions (thanks sponge)
     30            (ticket #397)
    2131    * i2psnark:
    2232      - Improved magnet link parsing, use tr parameter if present
  • router/java/src/net/i2p/router/RouterVersion.java

    r84990d9 rbec1b4a  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 10;
     21    public final static long BUILD = 12;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/peermanager/CapacityCalculator.java

    r84990d9 rbec1b4a  
    1212   
    1313    /** used to adjust each period so that we keep trying to expand the peer's capacity */
    14     static long GROWTH_FACTOR = 5;
     14    static final long GROWTH_FACTOR = 5;
    1515   
    1616    /** the calculator estimates over a 1 hour period */
     
    8484     * Let A = accects, R = rejects, F = fails
    8585     * @return estimated and adjusted accepts per hour, for the given period
    86      *         which is, more or less, max(0, 5 + (A * (A / (A + R))) - (4 * F))
     86     *         which is, more or less, max(0, 5 + (A * (A / (A + 2R))) - (4 * F))
    8787     */
    8888    private static double estimateCapacity(RateStat acceptStat, RateStat rejectStat, RateStat failedStat, int period) {
     
    9191        Rate curFailed = failedStat.getRate(period);
    9292
    93         long eventCount = 0;
    94         if (curAccepted != null)
     93        double eventCount = 0;
     94        if (curAccepted != null) {
    9595            eventCount = curAccepted.getCurrentEventCount() + curAccepted.getLastEventCount();
    96         // Punish for rejections.
    97         // We don't want to simply do eventCount -= rejected or we get to zero with 50% rejection,
    98         // and we don't want everybody to be at zero during times of congestion.
    99         if (eventCount > 0) {
    100             long rejected = curRejected.getCurrentEventCount() + curRejected.getLastEventCount();
    101             eventCount = eventCount * eventCount / (eventCount + rejected);
     96            // Punish for rejections.
     97            // We don't want to simply do eventCount -= rejected or we get to zero with 50% rejection,
     98            // and we don't want everybody to be at zero during times of congestion.
     99            if (eventCount > 0 && curRejected != null) {
     100                long rejected = curRejected.getCurrentEventCount() + curRejected.getLastEventCount();
     101                if (rejected > 0)
     102                    eventCount *= eventCount / (eventCount + (2 * rejected));
     103            }
    102104        }
     105
    103106        double stretch = ((double)ESTIMATE_PERIOD) / period;
    104107        double val = eventCount * stretch;
    105         long failed = 0;
     108
    106109        // Let's say a failure is 4 times worse than a rejection.
    107110        // It's actually much worse than that, but with 2-hop tunnels and a 8-peer
    108111        // fast pool, for example, you have a 1/7 chance of being falsely blamed.
    109112        // We also don't want to drive everybody's capacity to zero, that isn't helpful.
    110         if (curFailed != null)
    111             failed = (long) (0.5 + (4.0 * (curFailed.getCurrentTotalValue() + curFailed.getLastTotalValue()) / 100.0));
    112         if (failed > 0) {
    113             //if ( (period <= 10*60*1000) && (curFailed.getCurrentEventCount() > 0) )
    114             //    return 0.0d; // their tunnels have failed in the last 0-10 minutes
    115             //else
    116             val -= failed * stretch;
     113        if (curFailed != null) {
     114            double failed = curFailed.getCurrentTotalValue() + curFailed.getLastTotalValue();
     115            if (failed > 0) {
     116                //if ( (period <= 10*60*1000) && (curFailed.getCurrentEventCount() > 0) )
     117                //    return 0.0d; // their tunnels have failed in the last 0-10 minutes
     118                //else
     119                // .04 = 4.0 / 100.0 adjustment to failed
     120                val -= 0.04 * failed * stretch;
     121            }
    117122        }
    118123       
Note: See TracChangeset for help on using the changeset viewer.