echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates after review:

Browse Source 
Fix logic error in snark warning
Change Java 9 log warning to Java 10
Fix fallback tunnel pool stat name
Don't include geoip in this release
Update Russian translations
This commit is contained in:
zzz
2018-04-10 12:42:44 +00:00
parent db72f87b34
commit 3c7898160e
8 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -712,7 +712,7 @@ public class I2PSnarkServlet extends BasicServlet {
out.write(_t("Not a directory") + ": " + DataHelper.escapeHTML(dd.toString()));
} else if (!dd.canRead()) {
out.write(_t("Unreadable") + ": " + DataHelper.escapeHTML(dd.toString()));
} else if (canWrite) {
} else if (!canWrite) {
out.write(_t("No write permissions for data directory") + ": " + DataHelper.escapeHTML(dd.toString()));
} else {
out.write(_t("No torrents loaded."));

8
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -330,8 +330,8 @@ public class RouterConsoleRunner implements RouterApp {
boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
!FileUtil.isPack200Supported();
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK();
boolean isJava9 = SystemVersion.isJava9();
if (noJava7 || noPack200 || openARM || isJava9) {
boolean isJava10 = SystemVersion.isJava10();
if (noJava7 || noPack200 || openARM || isJava10) {
String s = "Java version: " + System.getProperty("java.version") +
" OS: " + System.getProperty("os.name") + ' ' +
System.getProperty("os.arch") + ' ' +
@ -354,8 +354,8 @@ public class RouterConsoleRunner implements RouterApp {
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
if (isJava9) {
s = "Java 9 support is beta, and not recommended for general use";
if (isJava10) {
s = "Java 10 support is beta, and not recommended for general use";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}

8
apps/routerconsole/locale/messages_ru.po
View File

@ -44,8 +44,8 @@ msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-28 22:55+0000\n"
"PO-Revision-Date: 2018-03-28 23:48+0000\n"
"Last-Translator: yume\n"
"PO-Revision-Date: 2018-04-07 21:39+0000\n"
"Last-Translator: ValdikSS <iam@valdikss.org.ru>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -1749,7 +1749,7 @@ msgstr "Управление скрытыми сервисами"
#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:227
msgid "Identification Image Generator"
msgstr ""
msgstr "Генератор идентификационных изображений"
#: ../java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java:229
#: ../java/src/net/i2p/router/web/helpers/HomeHelper.java:37
@ -2305,7 +2305,7 @@ msgstr "бит в секунду"
#: ../java/src/net/i2p/router/web/helpers/ConfigNetHelper.java:275
#, java-format
msgid "{0}Bytes per month maximum"
msgstr ""
msgstr "{0}байт в месяц максимум"
#: ../java/src/net/i2p/router/web/helpers/ConfigPeerHandler.java:21
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:552

36
apps/susidns/locale/messages_ru.po
View File

@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-28 22:55+0000\n"
"PO-Revision-Date: 2018-03-29 16:18+0000\n"
"PO-Revision-Date: 2018-04-07 21:34+0000\n"
"Last-Translator: ValdikSS <iam@valdikss.org.ru>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@ -790,7 +790,7 @@ msgid ""
"If SusiDNS is configured to publish your Router address book, the entries "
"will appear in your Published address book and saved to a hosts.txt file for"
" sharing."
msgstr ""
msgstr "Если в SusiDNS настроена публикация адресной книги маршрутизатора, записи будут добавлены опубликованную адресную книгу и сохранены в общедоступном файле hosts.txt."
#: build/HowSVG.java:6
msgid "Published Addressbook"
@ -806,7 +806,7 @@ msgstr "Чтобы настроить копирование адресной к
msgid ""
"All hosts derived from subscriptions will appear in this address book, in "
"addition to any you manually add here or to your Master address book."
msgstr ""
msgstr "В этой адресной книге появятся все записи из всех подписок, а также все записи, добавленные вручную здесь или в основной адресной книге."
#: build/HowSVG.java:9
msgid "Router Addressbook"
@ -816,7 +816,7 @@ msgstr "Адресная книга маршрутизатора"
msgid ""
"Hosts you manually add here will never be published. You can also add "
"aliases to hosts in other address books here."
msgstr ""
msgstr "Узлы, которые вы добавите здесь вручную, не будут опубликованы. Здесь также можно добавить альтернативные адреса (alias) для узлов из других адресных книг."
#: build/HowSVG.java:11
msgid "Private Addressbook"
@ -830,71 +830,71 @@ msgstr "Локальные записи"
msgid ""
"I2P applications (including the HTTP proxy) use the hosts in your local "
"address books to resolve .i2p hostnames."
msgstr ""
msgstr "Приложения I2P (включая HTTP-прокси) используют узлы из вашей локальной адресной книги для разрешения доменов .i2p."
#: build/HowSVG.java:14
msgid ""
"Additional subscriptions can be found in the FAQ section of the Router help "
"page."
msgstr ""
msgstr "Дополнительные подписки можно найти в секции FAQ на странице помощи маршрутизатора."
#: build/HowSVG.java:16
msgid ""
"Hosts sourced from your subscriptions are added to your Router address book,"
" and are automatically synced (by default every 12 hours)."
msgstr ""
msgstr "Узлы из ваших подписок добавляются в адресную книгу маршрутизатора и периодически обновляются (по умолчанию — раз в 12 часов)."
#: build/HowSVG.java:17
msgid "Configure Subscriptions"
msgstr ""
msgstr "Настроить подписки"
#: build/HowSVG.java:18
msgid ""
"If you manually add hosts here, they will be included your Published address"
" book (if configured)."
msgstr ""
msgstr "Если вы добавите узлы сюда, они также попадут в публикуемую адресную книгу (если она настроена)."
#: build/HowSVG.java:19
msgid "Master Addressbook"
msgstr ""
msgstr "Основная адресная книга"
#: build/HowSVG.java:20
msgid "Searchable by"
msgstr ""
msgstr "Ищется по"
#: build/HowSVG.java:21
msgid "I2P applications"
msgstr ""
msgstr "Приложения I2P"
#: build/HowSVG.java:22
msgid ""
"The Master, Router and Private address books collectively serve as the DNS "
"authority for I2P applications."
msgstr ""
msgstr "Основная и приватная адресные книги, а также адресная книга маршрутизатора работают в качестве авторитетного DNS для приложений I2P."
#: build/HowSVG.java:23
msgid "Optional,"
msgstr ""
msgstr "Опционально,"
#: build/HowSVG.java:24
msgid "for websites"
msgstr ""
msgstr "для веб-сайтов"
#: build/HowSVG.java:25
msgid ""
"If you configure SusiDNS to publish your Router address book, it will export"
" a hosts.txt file containing all the hosts (by default to the root of your "
"eepsite)."
msgstr ""
msgstr "Если в SusiDNS настроена публикация адресной книги маршрутизатора, он будет экспортировать файл hosts.txt, содержащий все узлы (по умолчанию в корень вашего eepsite)."
#: build/HowSVG.java:26
msgid ""
"Addresses manually added to your Master address book will merge with your "
"Router address book."
msgstr ""
msgstr "Адреса, добавленные в основную адресную книгу вручную, будут объединены с адресной книгой маршрутизатора."
#: build/HowSVG.java:27
msgid ""
"Hosts you receive from your subscriptions will merge with your Router "
"address book."
msgstr ""
msgstr "Узлы из подписок будут объединены с адресной книгой маршрутизатора."

14
apps/susimail/locale/messages_ru.po
View File

@ -15,8 +15,8 @@ msgstr ""
"Project-Id-Version: I2P\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-28 22:55+0000\n"
"PO-Revision-Date: 2018-03-28 23:49+0000\n"
"Last-Translator: zzzi2p\n"
"PO-Revision-Date: 2018-04-07 21:38+0000\n"
"Last-Translator: ValdikSS <iam@valdikss.org.ru>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -215,7 +215,7 @@ msgstr "Логин"
#: src/src/i2p/susi/webmail/WebMail.java:2058
#: src/src/i2p/susi/webmail/WebMail.java:2532
msgid "Loading emails, please wait..."
msgstr ""
msgstr "Загружается почта, пожалуйста, подождите…"
#. mailbox.getNumMails() forces a connection, don't use it
#. Not only does it slow things down, but a failure causes all our messages to
@ -249,7 +249,7 @@ msgstr "SusiMail"
#: src/src/i2p/susi/webmail/WebMail.java:2062
msgid "Checking for new emails on server"
msgstr ""
msgstr "Проверка новых писем на сервере"
#: src/src/i2p/susi/webmail/WebMail.java:2072
#, java-format
@ -267,7 +267,7 @@ msgstr "Нет новых сообщений"
#: src/src/i2p/susi/webmail/WebMail.java:2080
#: src/src/i2p/susi/webmail/WebMail.java:2534
msgid "Refresh the page for updates"
msgstr ""
msgstr "Обновите страницу для получения свежей информации"
#: src/src/i2p/susi/webmail/WebMail.java:2261
#: src/src/i2p/susi/webmail/WebMail.java:2621
@ -554,11 +554,11 @@ msgstr "Нет ответа от сервера"
#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:778
msgid "Mail server login failed, wrong username or password."
msgstr ""
msgstr "Не удалось войти к почтовый сервер, неправильное имя пользователя или пароль."
#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:780
msgid "Logout and then login again with the correct username and password."
msgstr ""
msgstr "Выйдите и войдите заново, с корректным именем пользователя и паролем."
#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1214
#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1216

4
build.xml
View File

@ -2021,9 +2021,9 @@
<!--
<target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
-->
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
-->
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
<echo message="New version number is ${release.number}" />
<copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
<copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />

1
installer/resources/blocklist.txt
View File

@ -96,6 +96,7 @@ Sybil:47.89.38.177
Sybil:47.90.1.15
Sybil:47.90.1.26
Sybil:47.90.120.30
Sybil:47.208.97.112
Sybil:104.156.254.54
Sybil:104.207.153.96
Sybil:108.61.251.143

2
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
View File

@ -75,7 +75,7 @@ public class TunnelPool {
if (name != null)
name = DataHelper.stripHTML(name);
else
name = _settings.getDestination().toBase32() + ".b32.i2p";
name = _settings.getDestination().toBase32();
}
_rateName = "tunnel.Bps." + name +
(_settings.isInbound() ? ".in" : ".out");