diff --git a/build.xml b/build.xml index c88bdd4b41ca2f8e54d464984e0070bf502915f1..9480d4112fe0519796f1739adaa312210f153d6a 100644 --- a/build.xml +++ b/build.xml @@ -1339,7 +1339,7 @@ <target name="copyflags-unlesspkg" unless="${with-famfamfam-flag-png}" > <copy todir="pkg-temp/eepsite/docroot/help/lib/" > - <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" /> + <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png tr.png us.png" /> </copy> <copy todir="pkg-temp/docs/icons/flags" > <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target --> diff --git a/debian-alt/jessie/i2p-router.links b/debian-alt/jessie/i2p-router.links index 347e03edfaf72f775fc67744942f949ae007c919..536c4082f03c027275c915993003687cdbabc5bb 100644 --- a/debian-alt/jessie/i2p-router.links +++ b/debian-alt/jessie/i2p-router.links @@ -85,11 +85,13 @@ usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png +usr/share/flags/countries/16x11/it.png usr/share/i2p/eepsite/docroot/help/lib/it.png usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png +usr/share/flags/countries/16x11/tr.png usr/share/i2p/eepsite/docroot/help/lib/tr.png usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png diff --git a/debian-alt/trusty/i2p-router.links b/debian-alt/trusty/i2p-router.links index c0dfed08a32feac301e0a3dc5fee731e674df665..948253326b2502bb530fe3b98b06642a8ddfa6c8 100644 --- a/debian-alt/trusty/i2p-router.links +++ b/debian-alt/trusty/i2p-router.links @@ -85,11 +85,13 @@ usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png +usr/share/flags/countries/16x11/it.png usr/share/i2p/eepsite/docroot/help/lib/it.png usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png +usr/share/flags/countries/16x11/tr.png usr/share/i2p/eepsite/docroot/help/lib/tr.png usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png diff --git a/debian-alt/xenial/i2p-router.links b/debian-alt/xenial/i2p-router.links index 2a4843a85e8e35a6d0ac9475a1d53792d54074f3..3156d197c3194582caf4c02ba750bd9929ba0dbd 100644 --- a/debian-alt/xenial/i2p-router.links +++ b/debian-alt/xenial/i2p-router.links @@ -85,11 +85,13 @@ usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png +usr/share/flags/countries/16x11/it.png usr/share/i2p/eepsite/docroot/help/lib/it.png usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png +usr/share/flags/countries/16x11/tr.png usr/share/i2p/eepsite/docroot/help/lib/tr.png usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png diff --git a/debian/i2p-router.links b/debian/i2p-router.links index 07bdf1036dcf6582fb9a5a7879342aea53147bfb..726f436ed948daf0a6e964177d72047f75975a73 100644 --- a/debian/i2p-router.links +++ b/debian/i2p-router.links @@ -91,11 +91,13 @@ usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png +usr/share/flags/countries/16x11/it.png usr/share/i2p/eepsite/docroot/help/lib/it.png usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png +usr/share/flags/countries/16x11/tr.png usr/share/i2p/eepsite/docroot/help/lib/tr.png usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png diff --git a/debian/i2p-router.manpages b/debian/i2p-router.manpages index 30210f2dc2c985102ce41ca03e875ae49b9368ef..c16168a484a209b83058079dc18d60a31a407fba 100644 --- a/debian/i2p-router.manpages +++ b/debian/i2p-router.manpages @@ -1,4 +1,5 @@ installer/resources/man/eepget.1 +installer/resources/man/eepget.az.1 installer/resources/man/eepget.de.1 installer/resources/man/eepget.es.1 installer/resources/man/eepget.fi.1 @@ -11,8 +12,10 @@ installer/resources/man/eepget.pt.1 installer/resources/man/eepget.pt_BR.1 installer/resources/man/eepget.ru.1 installer/resources/man/eepget.sv.1 +installer/resources/man/eepget.tr.1 installer/resources/man/eepget.zh.1 installer/resources/man/i2prouter-nowrapper.1 +installer/resources/man/i2prouter-nowrapper.az.1 installer/resources/man/i2prouter-nowrapper.de.1 installer/resources/man/i2prouter-nowrapper.es.1 installer/resources/man/i2prouter-nowrapper.fi.1 @@ -25,4 +28,5 @@ installer/resources/man/i2prouter-nowrapper.pt.1 installer/resources/man/i2prouter-nowrapper.pt_BR.1 installer/resources/man/i2prouter-nowrapper.ru.1 installer/resources/man/i2prouter-nowrapper.sv.1 +installer/resources/man/i2prouter-nowrapper.tr.1 installer/resources/man/i2prouter-nowrapper.zh.1 diff --git a/debian/i2p.manpages b/debian/i2p.manpages index 1b3a650799eec1f9e4a160c268a004e099365901..0201187a7dd4ff9f99b46aa6593f001ad0dd7af0 100644 --- a/debian/i2p.manpages +++ b/debian/i2p.manpages @@ -1,4 +1,5 @@ installer/resources/man/i2prouter.1 +installer/resources/man/i2prouter.az.1 installer/resources/man/i2prouter.de.1 installer/resources/man/i2prouter.es.1 installer/resources/man/i2prouter.fi.1 @@ -11,4 +12,5 @@ installer/resources/man/i2prouter.pt.1 installer/resources/man/i2prouter.pt_BR.1 installer/resources/man/i2prouter.ru.1 installer/resources/man/i2prouter.sv.1 +installer/resources/man/i2prouter.tr.1 installer/resources/man/i2prouter.zh.1 diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html index 22789eef0f07cd886a5bedd4aab53b7201b721ad..6e077b5012544d29a09f59b527618a6a003a5dad 100644 --- a/installer/resources/eepsite/docroot/help/index.html +++ b/installer/resources/eepsite/docroot/help/index.html @@ -17,11 +17,13 @@ <a href="index_de.html"><img src="lib/de.png" title="Deutsch" alt="Deutsch"></a> <a href="index_es.html"><img src="lib/es.png" title="Español" alt="Español"></a> <a href="index_fr.html"><img src="lib/fr.png" title="Français" alt="Français"></a> + <a href="index_pl.html"><img src="lib/it.png" title="Italian" alt="Italian"></a> <a href="index_nl.html"><img src="lib/nl.png" title="Nederlands" alt="Nederlands"></a> <a href="index_pl.html"><img src="lib/pl.png" title="Polish" alt="Polish"></a> <a href="index_pt.html"><img src="lib/pt.png" title="Português" alt="Português"></a> <a href="index_ru.html"><img src="lib/ru.png" title="РуÑÑкий" alt="РуÑÑкий"></a> <a href="index_sv.html"><img src="lib/se.png" title="Svenska" alt="Svenska"></a> + <a href="index_pl.html"><img src="lib/tr.png" title="Turkish" alt="Turkish"></a> </div> <h1>I2P Anonymous Webserver</h1> diff --git a/installer/resources/geoipv6.dat.gz b/installer/resources/geoipv6.dat.gz index 0ca2fa21b5f783c9addcf7e2a28efb4019b54c51..035426e3a40ccd42e6b1547a05988c2506c0cedd 100644 Binary files a/installer/resources/geoipv6.dat.gz and b/installer/resources/geoipv6.dat.gz differ diff --git a/installer/resources/man/eepget.ru.1 b/installer/resources/man/eepget.ru.1 index 082f77751ffcbf2f11460c4053899d1536d4d18e..d1b118cb0ec434030ccd15e69bec74dbb8c7a8eb 100644 --- a/installer/resources/man/eepget.ru.1 +++ b/installer/resources/man/eepget.ru.1 @@ -17,11 +17,12 @@ Eepget \- загрузчик I2P Ðеинтерактивное Ñкачивание файла через HTTP. ПоддерживаетÑÑ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð° как через I2P, так и через обычный Интернет. .P -Eepget is able to cope with slow or unstable network connections; if a -download is not successful because of a network problem, it will keep -retrying until the whole file has been retrieved (if the \-n option is set). -If supported by the remote server, eepget will instruct the server to -continue the download from the point of interruption. +Eepget ÑпоÑобна работать Ñ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ или неÑтабильными Ñетевыми +подключениÑми; в Ñлучае неудочной загрузки из\-за Ñетевых неполадок, будут +предприниматьÑÑ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐ¸ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾ тех пор, пока файл не будет +Ñкачан полноÑтью (еÑли уÑтановлен параметр \-n). Eepget отправит команду +Ñерверу на продолжение загрузки из точки прерываниÑ, еÑли удаленный Ñервер +поддерживает такую возможноÑть. .SH ОПЦИИ \fB\-c\fP @@ -31,32 +32,32 @@ Clearnet. Do not use a proxy. Same as \fB\-p\fP :0 . \fB\-e\fP etag .TP -Sets the etag value in the request headers. +УÑтанавливает значение etag в заголовке запроÑа. .TP -\fB\-h\fP name=value +\fB\-h\fPимÑ=значение .TP -Adds an arbitrary request header with the given name and value. +ДобавлÑет произвольный заголовок запроÑа Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¼ именем и значением. .TP \fB\-l\fP lineLen .TP -Controls the progress display. \fB\ lineLen \fP is the length of one progress line in characters. The default is 40. +Контролирует отображение прогреÑÑа. \fB\ lineLen \fP \- Ñто длина одной Ñтрочки прогреÑÑ\-бара в Ñимволах. По умолчанию равна 40. .TP \fB\-m\fP markSize .TP -Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' character represents. The default is 1024. +Контролирует отображение прогреÑÑа. \fB\ markSize \fP \- Ñто количеÑтво байт, которое означает один Ñимвол "#". По умолчанию равно 1024. .TP -\fB\-n\fP retries +\fB\-n\fP попыток .TP Укажите Ñколько раз нужно повторить попытку, еÑли загрузка не удалаÑÑŒ. ЕÑли значение не указано, то eepget не будет повторÑть попытку. .TP -\fB\-o\fP file +\fB\-o\fP файл .TP -Sets the output file to write to. If this option is not given, the output filename will be determined by the URL. +Задает выходной файл Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. ЕÑли Ñтот параметр не указан, то Ð¸Ð¼Ñ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð³Ð¾ файла определÑетÑÑ URL\-адреÑом. .TP \fB\-p\fP proxy_host[:port] @@ -64,19 +65,19 @@ Sets the output file to write to. If this option is not given, the output filena Specify an I2P proxy server (eeproxy) to use. If the port is not specified, eepget will use 4444. If this option is not specified, eepget will use 127.0.0.1:4444. Specify \fB\-c\fP or \fB\-p\fP :0 to disable the eeproxy. .TP -\fB\-t\fP seconds +\fB\-t\fP Ñекунд .TP -Sets the inactivity timeout. The default is 60 seconds. +УÑтанавливает тайм\-аут ÑоединениÑ. По умолчанию 60 Ñекунд. .TP -\fB\-u\fP username +\fB\-u\fP Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ .TP Задайте Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ прокÑи, еÑли требуетÑÑ. .TP -\fB\-x\fP password +\fB\-x\fP пароль .TP -Sets the password for proxy authorization, if required. If a username is specified but not a password, EepGet will prompt for the password. +УÑтанавливает пароль Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ на прокÑи, еÑли он требуетÑÑ. ЕÑли Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð·Ð°Ð´Ð°Ð½Ð¾, а пароль \- нет, EepGet будет запрашивать пароль. .SH "СТÐТУС ВЫХОДÐ" @@ -84,10 +85,12 @@ Sets the password for proxy authorization, if required. If a username is specifi there were problems with the download. .SH "СООБЩИТЬ ОБ ОШИБКÐÐ¥" -Please enter a ticket on +ПожалуйÑта, заведите тикет на .UR https://trac.i2p2.de/ -the I2P trac page +Ñтранице трекера +I2P .UE . +. .SH "СМ. ТÐКЖЕ" \fBi2prouter\fP(1) \fBcurl\fP(1) \fBwget\fP(1) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 3c775e75ad2f161a3cd3d0220581c16b99d09b93..0e04b1445cf7ad279d778bf1dbbb2a045fdd813e 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 25; + public final static long BUILD = 26; /** for example "-test" */ public final static String EXTRA = "-rc";