diff --git a/build.xml b/build.xml index c88bdd4b41..9480d4112f 100644 --- a/build.xml +++ b/build.xml @@ -1339,7 +1339,7 @@ - + diff --git a/debian-alt/jessie/i2p-router.links b/debian-alt/jessie/i2p-router.links index 347e03edfa..536c4082f0 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 c0dfed08a3..948253326b 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 2a4843a85e..3156d197c3 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 07bdf1036d..726f436ed9 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 30210f2dc2..c16168a484 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 1b3a650799..0201187a7d 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 22789eef0f..6e077b5012 100644 --- a/installer/resources/eepsite/docroot/help/index.html +++ b/installer/resources/eepsite/docroot/help/index.html @@ -17,11 +17,13 @@ Deutsch Español Français + Italian Nederlands Polish Português Русский Svenska + Turkish

I2P Anonymous Webserver

diff --git a/installer/resources/geoipv6.dat.gz b/installer/resources/geoipv6.dat.gz index 0ca2fa21b5..035426e3a4 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 082f77751f..d1b118cb0e 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 3c775e75ad..0e04b1445c 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";