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

* Services:

Browse Source 
- Move backup news to psi.i2p
   - Move default addressbook subscription to i2p-projekt.i2p
   - Remove www.i2p2.i2p from default update lists
   - Add psi.i2p to hosts.txt
   - Update links on help pages to avoid redirects on new website
     and select the correct language
 * SusiDNS: Fix whitespace issues
This commit is contained in:
zzz
2014-02-07 12:52:54 +00:00
parent 8ef3bb3d82
commit 090a790a9d
16 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
View File

@@ -253,7 +253,7 @@ public class Daemon {
List<String> defaultSubs = new LinkedList<String>(); List<String> defaultSubs = new LinkedList<String>();
// defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt"); // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
defaultSubs.add("http://www.i2p2.i2p/hosts.txt"); defaultSubs.add("http://i2p-projekt.i2p/hosts.txt");
SubscriptionList subscriptions = new SubscriptionList(subscriptionFile, SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings

10
apps/routerconsole/java/src/net/i2p/router/update/NewsHandler.java
View File

@@ -21,8 +21,14 @@ import static net.i2p.update.UpdateMethod.*;
*/ */
class NewsHandler extends UpdateHandler implements Checker { class NewsHandler extends UpdateHandler implements Checker {
/** @since 0.7.14 not configurable */ /**
private static final String BACKUP_NEWS_URL = "http://www.i2p2.i2p/_static/news/news.xml"; * Changed in 0.9.11 to the b32 for psi.i2p, run by psi.
* We may be able to change it to psi.i2p in a future release after
* the hostname propagates.
*
* @since 0.7.14 not configurable
*/
private static final String BACKUP_NEWS_URL = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.xml";
public NewsHandler(RouterContext ctx, ConsoleUpdateManager mgr) { public NewsHandler(RouterContext ctx, ConsoleUpdateManager mgr) {
super(ctx, mgr); super(ctx, mgr);

6
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@@ -67,7 +67,7 @@ public class ConfigUpdateHandler extends FormHandler {
"http://inr.i2p/i2p/i2pupdate.su2\r\n" + "http://inr.i2p/i2p/i2pupdate.su2\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" + "http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
"http://stats.i2p/i2p/i2pupdate.su2\r\n" + "http://stats.i2p/i2p/i2pupdate.su2\r\n" +
"http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" + // "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
"http://update.dg.i2p/files/i2pupdate.su2\r\n" + "http://update.dg.i2p/files/i2pupdate.su2\r\n" +
"http://update.killyourtv.i2p/i2pupdate.su2\r\n" + "http://update.killyourtv.i2p/i2pupdate.su2\r\n" +
"http://update.postman.i2p/i2pupdate.su2" ; "http://update.postman.i2p/i2pupdate.su2" ;
@@ -77,7 +77,7 @@ public class ConfigUpdateHandler extends FormHandler {
"http://inr.i2p/i2p/i2pupdate.sud\r\n" + "http://inr.i2p/i2p/i2pupdate.sud\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" + "http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
"http://stats.i2p/i2p/i2pupdate.sud\r\n" + "http://stats.i2p/i2p/i2pupdate.sud\r\n" +
"http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" + // "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
"http://update.dg.i2p/files/i2pupdate.sud\r\n" + "http://update.dg.i2p/files/i2pupdate.sud\r\n" +
"http://update.killyourtv.i2p/i2pupdate.sud\r\n" + "http://update.killyourtv.i2p/i2pupdate.sud\r\n" +
"http://update.postman.i2p/i2pupdate.sud" ; "http://update.postman.i2p/i2pupdate.sud" ;
@@ -111,7 +111,7 @@ public class ConfigUpdateHandler extends FormHandler {
"http://inr.i2p/i2p/i2pupdate.su3\r\n" + "http://inr.i2p/i2p/i2pupdate.su3\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" + "http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
"http://stats.i2p/i2p/i2pupdate.su3\r\n" + "http://stats.i2p/i2p/i2pupdate.su3\r\n" +
"http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" + // "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
"http://update.dg.i2p/files/i2pupdate.su3\r\n" + "http://update.dg.i2p/files/i2pupdate.su3\r\n" +
"http://update.killyourtv.i2p/i2pupdate.su3\r\n" + "http://update.killyourtv.i2p/i2pupdate.su3\r\n" +
"http://update.postman.i2p/i2pupdate.su3" ; "http://update.postman.i2p/i2pupdate.su3" ;

2
apps/routerconsole/jsp/configreseed.jsp
View File

@@ -26,7 +26,7 @@
<%=intl._("If reseeding has failed, you should first check your network connection.")%> <%=intl._("If reseeding has failed, you should first check your network connection.")%>
<p><b><%=intl._("The default settings will work for most people.")%></b> <p><b><%=intl._("The default settings will work for most people.")%></b>
<%=intl._("Change these only if HTTP is blocked by a restrictive firewall, reseed has failed, and you have access to an HTTP proxy.")%> <%=intl._("Change these only if HTTP is blocked by a restrictive firewall, reseed has failed, and you have access to an HTTP proxy.")%>
<%=intl._("See {0} for instructions on reseeding manually.", "<a href=\"http://www.i2p2.de/faq.html#manual_reseed\">" + intl._("the FAQ") + "</a>")%> <%=intl._("See {0} for instructions on reseeding manually.", "<a href=\"https://geti2p.net/faq#manual_reseed\">" + intl._("the FAQ") + "</a>")%>
</p> </p>
<div class="wideload"> <div class="wideload">
<table border="0" cellspacing="5"> <table border="0" cellspacing="5">

6
apps/routerconsole/jsp/help.jsi
View File

@@ -1,9 +1,9 @@
If you'd like to help improve or translate the documentation, or If you'd like to help improve or translate the documentation, or
help with other aspects of the project, please see the documentation for help with other aspects of the project, please see the documentation for
<a href="http://i2p-projekt.i2p/getinvolved.html">volunteers.</a> <a href="http://i2p-projekt.i2p/en/get-involved">volunteers.</a>
</p><p>Further assistance is available here:</p> </p><p>Further assistance is available here:</p>
<ul class="links"> <ul class="links">
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq.html">FAQ on i2p-projekt.i2p</a></li> <li class="tidylist"><a href="http://i2p-projekt.i2p/en/faq">FAQ on i2p-projekt.i2p</a></li>
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq_de.html">Deutsch FAQ</a>.</li></ul> <li class="tidylist"><a href="http://i2p-projekt.i2p/de/faq">Deutsch FAQ</a>.</li></ul>
<br>You may also try the <a href="http://forum.i2p/">I2P forum</a> <br>You may also try the <a href="http://forum.i2p/">I2P forum</a>
or IRC. or IRC.

12
apps/routerconsole/jsp/help_ar.jsp
View File

@@ -17,10 +17,10 @@
<div class="main" id="main" dir="rtl" lang="ar"><p> <div class="main" id="main" dir="rtl" lang="ar"><p>
اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله
<a href="http://i2p-projekt.i2p/getinvolved.html">تطوع</a> <a href="http://i2p-projekt.i2p/ar/get-involved">تطوع</a>
</p>المزيد من المساعدة هنا: </p>المزيد من المساعدة هنا:
<ul class="links"> <ul class="links">
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq.html">ابئلة شائعة i2p-projekt.i2p</a> <li class="tidylist"><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a>
<br>يمكن ايضا<a href="http://forum.i2p/">I2P منتدى</a> <br>يمكن ايضا<a href="http://forum.i2p/">I2P منتدى</a>
او بالدردشة على IRC.</li></ul> او بالدردشة على IRC.</li></ul>
@@ -151,7 +151,7 @@ Apache's javax.servlet (javax.servlet.jar) implementation.
This product includes software developed by the Apache Software Foundation This product includes software developed by the Apache Software Foundation
(http://www.apache.org/).</p> (http://www.apache.org/).</p>
<p>Another application you can see on this webpage is <a href="http://i2p-projekt.i2p/i2ptunnel">I2PTunnel</a> <p>Another application you can see on this webpage is <a href="http://i2p-projekt.i2p/ar/docs/api/i2ptunnel">I2PTunnel</a>
(your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that (your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy). There is also a lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy). There is also a
<a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on <a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on
@@ -159,15 +159,15 @@ the console, which is a GPL'ed application written by susi23. The addressbook a
<a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for <a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
more information).</p> more information).</p>
<p>The router by default also includes human's public domain <a href="http://i2p-projekt.i2p/sam">SAM</a> bridge, <p>The router by default also includes human's public domain <a href="http://i2p-projekt.i2p/ar/docs/api/sam">SAM</a> bridge,
which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use. which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.
There is also an optimized library for doing large number calculations - jbigi - which in turn uses the There is also an optimized library for doing large number calculations - jbigi - which in turn uses the
LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures. LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.
Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and
the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>. For the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>. For
details on other applications available, as well as their licenses, please see the details on other applications available, as well as their licenses, please see the
<a href="http://i2p-projekt.i2p/licenses">license policy</a>. Source for the I2P code and most bundled <a href="http://i2p-projekt.i2p/ar/get-involved/develop/licenses">license policy</a>. Source for the I2P code and most bundled
client applications can be found on our <a href="http://i2p-projekt.i2p/download">download page</a>. client applications can be found on our <a href="http://i2p-projekt.i2p/ar/download">download page</a>.
.</p> .</p>
<h2>Change Log</h2> <h2>Change Log</h2>

16
apps/routerconsole/jsp/help_fr.jsp
View File

@@ -13,15 +13,15 @@
<%@include file="summaryajax.jsi" %> <%@include file="summaryajax.jsi" %>
</head><body onload="initAjax()"> </head><body onload="initAjax()">
<%@include file="summary.jsi" %> <%@include file="summary.jsi" %>
Traduction de mars 2011 (magma@mail.i2p) <!-- Traduction de mars 2011 (magma@mail.i2p) -->
<h1>Aide et assistance du routeur I2P</h1> <h1>Aide et assistance du routeur I2P</h1>
<div class="main" id="main"><p> <div class="main" id="main"><p>
Si vous souhaitez améliorer ou traduire la documentation ou d'autres versants du projet, merci de vous reporter à Si vous souhaitez améliorer ou traduire la documentation ou d'autres versants du projet, merci de vous reporter à
la page consacrée aux <a href="http://i2p-projekt.i2p/getinvolved_fr.html">volontaires</a>. la page consacrée aux <a href="http://i2p-projekt.i2p/fr/get-involved">volontaires</a>.
</p>D'autres détails sont disponibles ici: </p>D'autres détails sont disponibles ici:
<ul class="links"> <ul class="links">
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq.html">FAQ en anglais sur i2p-projekt.i2p</a></li> <li class="tidylist"><a href="http://i2p-projekt.i2p/en/faq">FAQ en anglais sur i2p-projekt.i2p</a></li>
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq_fr.html">les FAQ en français</a>.</li></ul> <li class="tidylist"><a href="http://i2p-projekt.i2p/fr/faq">les FAQ en français</a>.</li></ul>
<br>Il y a aussi le <a href="http://forum.i2p/">forum I2P</a> <br>Il y a aussi le <a href="http://forum.i2p/">forum I2P</a>
et l'IRC. et l'IRC.
@@ -131,22 +131,22 @@ configuration), vous permettant de déployer dans votre routeur des applications
Jetty fait usage de l'implémentation javax.servlet d'Apache. Ce dispositif inclus du logiciel développé par la Jetty fait usage de l'implémentation javax.servlet d'Apache. Ce dispositif inclus du logiciel développé par la
fondation Apache Software (http://www.apache.org/).</p> fondation Apache Software (http://www.apache.org/).</p>
<p>Une autre application visible sur cette page: <a href="http://i2p-projekt.i2p/i2ptunnel">I2PTunnel</a> <p>Une autre application visible sur cette page: <a href="http://i2p-projekt.i2p/fr/docs/api/i2ptunnel">I2PTunnel</a>
(votre <a href="i2ptunnel/" target="_blank">interface web</a>) sous licence GPL écrite par mihi qui vous permet de (votre <a href="i2ptunnel/" target="_blank">interface web</a>) sous licence GPL écrite par mihi qui vous permet de
mettre en tunnels le trafic normal TCP/IP sur I2P (comme les proxy eep et le proxy irc). Il y a aussi un client webmail mettre en tunnels le trafic normal TCP/IP sur I2P (comme les proxy eep et le proxy irc). Il y a aussi un client webmail
<a href="http://susi.i2p/">susimail</a> <a href="susimail/susimail">disponible</a> dans la console, qui est sous <a href="http://susi.i2p/">susimail</a> <a href="susimail/susimail">disponible</a> dans la console, qui est sous
licence GPL et écrit par susi23. L'application carnet d'adresses, écrite par licence GPL et écrit par susi23. L'application carnet d'adresses, écrite par
<a href="http://ragnarok.i2p/">Ragnarok</a> gère votre fichier hosts.txt (voir ./addressbook/ pour plus de détails).</p> <a href="http://ragnarok.i2p/">Ragnarok</a> gère votre fichier hosts.txt (voir ./addressbook/ pour plus de détails).</p>
<p>Le routeur inclu aussi par défaut le pont <a href="http://i2p-projekt.i2p/sam">SAM</a> du domaine public de l'humanité, <p>Le routeur inclu aussi par défaut le pont <a href="http://i2p-projekt.i2p/fr/docs/api/sam">SAM</a> du domaine public de l'humanité,
que les autres applications clientes (comme le <a href="http://duck.i2p/i2p-bt/">portage bittorrent</a>) peuvent à leur que les autres applications clientes (comme le <a href="http://duck.i2p/i2p-bt/">portage bittorrent</a>) peuvent à leur
tour utiliser. Il y a aussi une bibliothèque optimisée pour les calculs sur les grand nombres - jbigi - qui de son tour utiliser. Il y a aussi une bibliothèque optimisée pour les calculs sur les grand nombres - jbigi - qui de son
côté utilise la bibliothèque sous licence LGPL <a href="http://swox.com/gmp/">GMP</a>, adaptée à diverses architectures côté utilise la bibliothèque sous licence LGPL <a href="http://swox.com/gmp/">GMP</a>, adaptée à diverses architectures
PC. Les lanceurs pour Windows sont faits avec <a href="http://launch4j.sourceforge.net/">Launch4J</a>, et l'installeur PC. Les lanceurs pour Windows sont faits avec <a href="http://launch4j.sourceforge.net/">Launch4J</a>, et l'installeur
avec <a href="http://www.izforge.com/izpack/">IzPack</a>. Les détails sur les autres applications disponibles comme sur avec <a href="http://www.izforge.com/izpack/">IzPack</a>. Les détails sur les autres applications disponibles comme sur
leurs licences respectives, référez-vous à notre <a href="http://i2p-projekt.i2p/licenses">politique de licences</a>. leurs licences respectives, référez-vous à notre <a href="http://i2p-projekt.i2p/fr/get-involved/develop/licenses">politique de licences</a>.
Les sources du code I2P et de la plupart des applications jointes est sur notre page de Les sources du code I2P et de la plupart des applications jointes est sur notre page de
<a href="http://i2p-projekt.i2p/download_fr">téléchargements</a>. <a href="http://i2p-projekt.i2p/fr/download">téléchargements</a>.
.</p> .</p>
<h2>Historique des évolutions</h2> <h2>Historique des évolutions</h2>

12
apps/routerconsole/jsp/help_nl.jsp
View File

@@ -17,10 +17,10 @@
<div class="main" id="main"><p> <div class="main" id="main"><p>
Als je wilt helpen om de documentatie te verbeteren of vertalen, of wilt helpen Als je wilt helpen om de documentatie te verbeteren of vertalen, of wilt helpen
met andere aspecten van het project, zie dan de documentatie voor met andere aspecten van het project, zie dan de documentatie voor
<a href="http://i2p-projekt.i2p/getinvolved.html">vrijwilligers.</a> <a href="http://i2p-projekt.i2p/nl/get-involved">vrijwilligers.</a>
</p>Verdere ondersteuning is hier beschikbaar: </p>Verdere ondersteuning is hier beschikbaar:
<ul class="links"> <ul class="links">
<li class="tidylist"><a href="http://i2p-projekt.i2p/faq.html">FAQ op i2p-projekt.i2p</a></li> <li class="tidylist"><a href="http://i2p-projekt.i2p/nl/faq">FAQ op i2p-projekt.i2p</a></li>
</ul> </ul>
<br>Je kunt ook het <a href="http://forum.i2p/">I2P forum</a> <br>Je kunt ook het <a href="http://forum.i2p/">I2P forum</a>
of IRC proberen. of IRC proberen.
@@ -168,7 +168,7 @@ Dit product bevat software ontwikkeld door de Apache Software Foundation
(http://www.apache.org/).</p> (http://www.apache.org/).</p>
<p>Een andere applicatie op deze webpagina is <a <p>Een andere applicatie op deze webpagina is <a
href="http://i2p-projekt.i2p/i2ptunnel">I2PTunnel</a> (je <a href="i2ptunnel/" href="http://i2p-projekt.i2p/nl/docs/api/i2ptunnel">I2PTunnel</a> (je <a href="i2ptunnel/"
target="_blank">web interface</a>) - een GPL applicatie geschreven door mihi target="_blank">web interface</a>) - een GPL applicatie geschreven door mihi
die normaal TCP/IP verkeer over I2P laat tunnelen (zoals de eepproxy en de irc die normaal TCP/IP verkeer over I2P laat tunnelen (zoals de eepproxy en de irc
proxy). Er is ook een <a href="http://susi.i2p/">susimail</a> web based mail proxy). Er is ook een <a href="http://susi.i2p/">susimail</a> web based mail
@@ -178,7 +178,7 @@ GPL applicatie geschreven door susi23. De adresboek applicatie, geschreven door
hosts.txt bestanden (zie ./addressbook/ voor meer informatie).</p> hosts.txt bestanden (zie ./addressbook/ voor meer informatie).</p>
<p>De router bevat ook standaard human's public domain <a <p>De router bevat ook standaard human's public domain <a
href="http://i2p-projekt.i2p/sam">SAM</a> brug, welke andere client applicaties href="http://i2p-projekt.i2p/nl/docs/api/sam">SAM</a> brug, welke andere client applicaties
(zoals de <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) kan gebruiken. (zoals de <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) kan gebruiken.
Er is ook een geoptimaliseerde library voor het uitvoeren van berekeningen met Er is ook een geoptimaliseerde library voor het uitvoeren van berekeningen met
grote getallen - jbigi - deze gebruikt de LGPL licensed <a grote getallen - jbigi - deze gebruikt de LGPL licensed <a
@@ -187,9 +187,9 @@ architecturen. Opstarters voor windows gebruikers zijn gemaakt met <a
href="http://launch4j.sourceforge.net/">Launch4J</a>, en de installer is href="http://launch4j.sourceforge.net/">Launch4J</a>, en de installer is
gemaakt met <a href="http://www.izforge.com/izpack/">IzPack</a>. Voor details gemaakt met <a href="http://www.izforge.com/izpack/">IzPack</a>. Voor details
over andere beschikbare applicaties, en hun licenties, zie het <a over andere beschikbare applicaties, en hun licenties, zie het <a
href="http://i2p-projekt.i2p/licenses">licentie beleid</a>. Broncode voor I2P en href="http://i2p-projekt.i2p/nl/get-involved/develop/licenses">licentie beleid</a>. Broncode voor I2P en
de meeste gebundelde client applicaties kan gevonden worden op onze <a de meeste gebundelde client applicaties kan gevonden worden op onze <a
href="http://i2p-projekt.i2p/download">download pagina</a>.</p> href="http://i2p-projekt.i2p/nl/download">download pagina</a>.</p>
<h2>Release geschiedenis</h2> <h2>Release geschiedenis</h2>
<jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />

8
apps/routerconsole/jsp/help_ru.jsp
View File

@@ -19,9 +19,9 @@
<div class="main" id="main"> <div class="main" id="main">
<p> Если Вы хотите помочь в улучшении или переводе документации, если у Вас есть идеи, как еще помочь проекту, пожалуйста, загляните в раздел документации <p> Если Вы хотите помочь в улучшении или переводе документации, если у Вас есть идеи, как еще помочь проекту, пожалуйста, загляните в раздел документации
<a href="http://i2p-projekt.i2p/getinvolved.html">как стать участником</a>. </p> <a href="http://i2p-projekt.i2p/ru/get-involved">как стать участником</a>. </p>
<p>Дальнейшие инструкции доступны в <a href="http://i2p-projekt.i2p/faq.html">FAQ на i2p-projekt.i2p</a> <p>Дальнейшие инструкции доступны в <a href="http://i2p-projekt.i2p/ru/faq">FAQ на i2p-projekt.i2p</a>
<br>Также, имеет смысл зайти на <a href="http://forum.i2p/">форум I2P</a> и IRC-каналы проекта.</p> <br>Также, имеет смысл зайти на <a href="http://forum.i2p/">форум I2P</a> и IRC-каналы проекта.</p>
@@ -161,9 +161,9 @@
<p>Поверх I2P маршрутизатора работают различные приложения-клиенты, каждое со своим набором лицензий и зависимостей. Например, эта страница входит в приложение консоли маршрутизатора, которое сделано из усеченной версии <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a> (в сборку не включены демонстрационные приложения и прочие дополнения, настройки упрощены). Jetty позволяет запускать в составе маршрутизатора стандартные JSP/сервлеты. Jetty использует javax.servlet.jar разработанный в составе проекта Apache (http://www.apache.org/). <p>Поверх I2P маршрутизатора работают различные приложения-клиенты, каждое со своим набором лицензий и зависимостей. Например, эта страница входит в приложение консоли маршрутизатора, которое сделано из усеченной версии <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a> (в сборку не включены демонстрационные приложения и прочие дополнения, настройки упрощены). Jetty позволяет запускать в составе маршрутизатора стандартные JSP/сервлеты. Jetty использует javax.servlet.jar разработанный в составе проекта Apache (http://www.apache.org/).
</p> </p>
<p>Ещё одно приложение на этой странице — <a href="http://i2p-projekt.i2p/i2ptunnel">I2PTunnel</a> (а тут <a href="i2ptunnel/" target="_blank">его вебинтерфейс</a>). Автор mihi, лицензия GPL. I2PTunnel занимается туннелированнием обычного TCP/IP трафика через I2P (может применяться для eepproxy и irc-прокси). <a href="http://susi.i2p/">susimail</a> — почтовый клиент с <a href="susimail/susimail">вебинтерфейсом</a>, автор susi23, лицензия GPL. Адресная книга помогает управлять содержимым Ваших hosts.txt файлов (подробнее см. ./addressbook/), автор <a href="http://ragnarok.i2p/">Ragnarok</a>.</p> <p>Ещё одно приложение на этой странице — <a href="http://i2p-projekt.i2p/ru/docs/api/i2ptunnel">I2PTunnel</a> (а тут <a href="i2ptunnel/" target="_blank">его вебинтерфейс</a>). Автор mihi, лицензия GPL. I2PTunnel занимается туннелированнием обычного TCP/IP трафика через I2P (может применяться для eepproxy и irc-прокси). <a href="http://susi.i2p/">susimail</a> — почтовый клиент с <a href="susimail/susimail">вебинтерфейсом</a>, автор susi23, лицензия GPL. Адресная книга помогает управлять содержимым Ваших hosts.txt файлов (подробнее см. ./addressbook/), автор <a href="http://ragnarok.i2p/">Ragnarok</a>.</p>
<p>В поставку маршрутизатора включен <a href="http://i2p-projekt.i2p/sam">SAM</a> интерфейс, автор human, приложение в общественном достоянии. SAM предназначен для использования приложениями-клиентами, такими как <a href="http://duck.i2p/i2p-bt/">bittorrent-клиенты</a>. Маршрутизатором используется оптимизированная под разные PC-архитектуры библиотека для вычислений с большими числами – jbigi, которая в свою очередь использует библиотеку <a href="http://swox.com/gmp/">GMP</a> (LGPL лицензия). Вспомогательные приложения для Windows созданы с использованием <a href="http://launch4j.sourceforge.net/">Launch4J</a>, а инсталлятор собран при помощи <a href="http://www.izforge.com/izpack/">IzPack</a>. Подробнее о других доступных приложениях и их лицензиях смотрите на странице <a href="http://i2p-projekt.i2p/licenses">I2P Software Licenses</a>. Исходный код I2P маршрутизатора и идущих в комплекте приложений можно найти на нашей <a href="http://i2p-projekt.i2p/download">странице загрузки</a>. </p> <p>В поставку маршрутизатора включен <a href="http://i2p-projekt.i2p/ru/docs/api/sam">SAM</a> интерфейс, автор human, приложение в общественном достоянии. SAM предназначен для использования приложениями-клиентами, такими как <a href="http://duck.i2p/i2p-bt/">bittorrent-клиенты</a>. Маршрутизатором используется оптимизированная под разные PC-архитектуры библиотека для вычислений с большими числами – jbigi, которая в свою очередь использует библиотеку <a href="http://swox.com/gmp/">GMP</a> (LGPL лицензия). Вспомогательные приложения для Windows созданы с использованием <a href="http://launch4j.sourceforge.net/">Launch4J</a>, а инсталлятор собран при помощи <a href="http://www.izforge.com/izpack/">IzPack</a>. Подробнее о других доступных приложениях и их лицензиях смотрите на странице <a href="http://i2p-projekt.i2p/ru/get-involved/develop/licenses">I2P Software Licenses</a>. Исходный код I2P маршрутизатора и идущих в комплекте приложений можно найти на нашей <a href="http://i2p-projekt.i2p/ru/download">странице загрузки</a>. </p>
<h2>История версий</h2> <h2>История версий</h2>

5
apps/susidns/src/java/src/i2p/susi/dns/Messages.java
View File

@@ -20,6 +20,11 @@ public class Messages {
return Translate.getString(key, _context, BUNDLE_NAME); return Translate.getString(key, _context, BUNDLE_NAME);
} }
/** @since 0.9.11 */
public String _(String key, Object o) {
return Translate.getString(key, o, _context, BUNDLE_NAME);
}
public static String getString(String s) { public static String getString(String s) {
return Translate.getString(s, I2PAppContext.getGlobalContext(), BUNDLE_NAME); return Translate.getString(s, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
} }

1
apps/susidns/src/jsp/config.jsp
View File

@@ -31,7 +31,6 @@
%> %>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html" %> <%@ page contentType="text/html" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application"/> <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application"/>

3
apps/susidns/src/jsp/index.jsp
View File

@@ -31,7 +31,6 @@
%> %>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%> <%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" /> <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
@@ -70,7 +69,7 @@
<%=intl._("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%> <%=intl._("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%>
</p> </p>
<p> <p>
<%=intl._("In the default configuration, the address book is only subscribed to www.i2p2.i2p.")%> <%=intl._("In the default configuration, the address book is only subscribed to {0}.", "i2p-projekt.i2p")%>
<%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions\">subscriptions</a> file.")%> <%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions\">subscriptions</a> file.")%>
</p> </p>
<p> <p>

5
apps/susidns/src/jsp/subscriptions.jsp
View File

@@ -31,7 +31,6 @@
%> %>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<%@page trimDirectiveWhitespaces="true"%>
<%@ page contentType="text/html"%> <%@ page contentType="text/html"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" /> <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
@@ -81,9 +80,9 @@
<%=intl._("The subscription file contains a list of i2p URLs.")%> <%=intl._("The subscription file contains a list of i2p URLs.")%>
<%=intl._("The addressbook application regularly checks this list for new eepsites.")%> <%=intl._("The addressbook application regularly checks this list for new eepsites.")%>
<%=intl._("Those URLs refer to published hosts.txt files.")%> <%=intl._("Those URLs refer to published hosts.txt files.")%>
<%=intl._("The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.")%> <%=intl._("The default subscription is the hosts.txt from {0}, which is updated infrequently.", "i2p-projekt.i2p")%>
<%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%> <%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%>
<a href="http://www.i2p2.i2p/faq.html#subscriptions" target="_top"><%=intl._("See the FAQ for a list of subscription URLs.")%></a> <a href="http://i2p-projekt.i2p/faq.html#subscriptions" target="_top"><%=intl._("See the FAQ for a list of subscription URLs.")%></a>
</p> </p>
</div> </div>
<div id="footer"> <div id="footer">

10
history.txt
View File

@@ -1,3 +1,13 @@
2014-02-07 zzz
* Services:
- Move backup news to psi.i2p
- Move default addressbook subscription to i2p-projekt.i2p
- Remove www.i2p2.i2p from default update lists
- Add psi.i2p to hosts.txt
- Update links on help pages to avoid redirects on new website
and select the correct language
* SusiDNS: Fix whitespace issues
2014-02-06 kytv 2014-02-06 kytv
* Brazilian Portuguese, Danish, French, Japanese, Polish, Russian, Ukrainian * Brazilian Portuguese, Danish, French, Japanese, Polish, Russian, Ukrainian
translation updates translation updates

1
installer/resources/hosts.txt
View File

@@ -351,3 +351,4 @@ open4you.i2p=kvx2~4uxYZRqvfzfgT5i5JdXpk~d9HFc7l-pH4aH5yFdlSgolgW2Nekt6tVLqlpkIzz
salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq5YMho9klEgK~Ep8LIWBZ6owbB~bj5NETD2GZgGKyqN0TkwymzUFTfmqGqRxkMdTrK0poCajdTTCq5ukrmpXFz2-~twJFlQoMufaZBPcG-NqKs10c2aehUl7UbOmzr5zYHfjjtwOgf3acXnF8PRmA8tFHLD6DHA4k9YJCBVi1w6Eskeasb-sW~7DYoJc~je7xocpxJO~GziLz2fQO~2cdI5BOFmhPfOQaMhR1WFE3MRSbLEt2zNXhNlZWTCrS-Oj4c2p6qtRNRsDQvxzBZwOzRzvucB2K3WMFreY7qfS-WS5LWJxl95~DsHGwf~sqqAQF8q02gBw2Ap6kel-tijjAMXxrJw09XIQy0LbV7g1qYHG-quZRdWpEMe-LTstSmwN0C1v39QwOQhwgqYFz~OJ1HikINdf9H4Syz2HnaNDT-AOYztdUdB6z7Lwt6AAAA salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq5YMho9klEgK~Ep8LIWBZ6owbB~bj5NETD2GZgGKyqN0TkwymzUFTfmqGqRxkMdTrK0poCajdTTCq5ukrmpXFz2-~twJFlQoMufaZBPcG-NqKs10c2aehUl7UbOmzr5zYHfjjtwOgf3acXnF8PRmA8tFHLD6DHA4k9YJCBVi1w6Eskeasb-sW~7DYoJc~je7xocpxJO~GziLz2fQO~2cdI5BOFmhPfOQaMhR1WFE3MRSbLEt2zNXhNlZWTCrS-Oj4c2p6qtRNRsDQvxzBZwOzRzvucB2K3WMFreY7qfS-WS5LWJxl95~DsHGwf~sqqAQF8q02gBw2Ap6kel-tijjAMXxrJw09XIQy0LbV7g1qYHG-quZRdWpEMe-LTstSmwN0C1v39QwOQhwgqYFz~OJ1HikINdf9H4Syz2HnaNDT-AOYztdUdB6z7Lwt6AAAA
no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA
i2pjump.i2p=ouBpQCfwiBcdoZD3vMNT8HXB091kwgI766U6sdWhstY6~7Aixpo8JsNaSO1LV01I20kEzAgmWP8cf5469gSa-YeXAjhKSQPtUgQiKCoRhv2virj--~ecvv4OhyIzCiYoWMMFHV50c02Lg~EE8LGbEkIbRXUZaIWlYwnLC-MzPtuSXhFjHW03h0v~QGeIlYFr8nkpBayqdB8SLkieKygnlOgLRSehmHWZeA0yIz1aCpDuTrZAmAdb3ZwcNm0fxWl~AEpELZ-ax8x6Ibb0kHgPxP1lRr1J7MH~yYXrkymqIPEj-sNLavlAN5oEK6~A45hLd-IENfQ9v-AlntZMon~zeDvxDwHqyKy4OOCbHV7LmitYryEZTVoQNDPPHa6o0pnkBjaPWEnJoDqzU~s-alViTYwR7qkGZMxSp~tej~TngU8GUYEHn4kdTnni0~RTY~50ZyI~2~2ESUCIfFWHzYKQXclzt-uxmNsCL7npmD1-MKZUQ1ECwPR2xKv5vqJwO5ZKAAAA i2pjump.i2p=ouBpQCfwiBcdoZD3vMNT8HXB091kwgI766U6sdWhstY6~7Aixpo8JsNaSO1LV01I20kEzAgmWP8cf5469gSa-YeXAjhKSQPtUgQiKCoRhv2virj--~ecvv4OhyIzCiYoWMMFHV50c02Lg~EE8LGbEkIbRXUZaIWlYwnLC-MzPtuSXhFjHW03h0v~QGeIlYFr8nkpBayqdB8SLkieKygnlOgLRSehmHWZeA0yIz1aCpDuTrZAmAdb3ZwcNm0fxWl~AEpELZ-ax8x6Ibb0kHgPxP1lRr1J7MH~yYXrkymqIPEj-sNLavlAN5oEK6~A45hLd-IENfQ9v-AlntZMon~zeDvxDwHqyKy4OOCbHV7LmitYryEZTVoQNDPPHa6o0pnkBjaPWEnJoDqzU~s-alViTYwR7qkGZMxSp~tej~TngU8GUYEHn4kdTnni0~RTY~50ZyI~2~2ESUCIfFWHzYKQXclzt-uxmNsCL7npmD1-MKZUQ1ECwPR2xKv5vqJwO5ZKAAAA
psi.i2p=a11l91etedRW5Kl2GhdDI9qiRBbDRAQY6TWJb8KlSc0P9WUrEviABAAltqDU1DFJrRhMAZg5i6rWGszkJrF-pWLQK9JOH33l4~mQjB8Hkt83l9qnNJPUlGlh9yIfBY40CQ0Ermy8gzjHLayUpypDJFv2V6rHLwxAQeaXJu8YXbyvCucEu9i6HVO49akXW9YSxcZEqxK04wZnjBqhHGlVbehleMqTx9nkd0pUpBZz~vIaG9matUSHinopEo6Wegml9FEz~FEaQpPknKuMAGGSNFVJb0NtaOQSAocAOg1nLKh80v232Y8sJOHG63asSJoBa6bGwjIHftsqD~lEmVV4NkgNPybmvsD1SCbMQ2ExaCXFPVQV-yJhIAPN9MRVT9cSBT2GCq-vpMwdJ5Nf0iPR3M-Ak961JUwWXPYTL79toXCgxDX2~nZ5QFRV490YNnfB7LQu10G89wG8lzS9GWf2i-nk~~ez0Lq0dH7qQokFXdUkPc7bvSrxqkytrbd-h8O8AAAA

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10; public final static long BUILD = 11;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";