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

Console: Clean up help text, tag for translation (ticket #2298)

Browse Source
This commit is contained in:
zzz
2019-08-14 19:52:54 +00:00
parent 21ace66a46
commit 131a70057e
13 changed files with 149 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/i2ptunnel/jsp/index.jsp
View File

@ -35,10 +35,8 @@
</head><body id="tunnelListPage">
<div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>
<%=intl._t("These are the local services provided by your router.")%>
<%=intl._t("They may be clients started through the Tunnel Manager or external programs connecting through SAM, BOB, or directly to I2CP.")%>
<%=intl._t("By default, most of your client services (mail, http proxy, IRC) will share the same set of tunnels (for performance reasons) and be listed as \"Shared Clients\" and \"Shared Clients(DSA)\".")%>
<%=intl._t("However, if you experience a tunnel failure, all your services will go offline at the same time, so in some scenarios you may wish to configure client services to use their own set of tunnels.")%>
<%=intl._t("This can be done by unchecking the \"Share tunnels with other clients&hellip;\" option listed under \"Shared Clients\" on the configuration page of the relevant client service, after which you will need to restart the client service from this page.")%>
&nbsp;
<%=intl._t("By default, most of your client services (email, HTTP proxy, IRC) will share the same set of tunnels and be listed as \"Shared Clients\" and \"Shared Clients(DSA)\".")%>
</p></div>
<%
boolean isInitialized = indexBean.isInitialized();

3
apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
View File

@ -107,6 +107,9 @@ class NetDbRenderer {
StringBuilder buf = new StringBuilder(4*1024);
List<Hash> sybils = sybil != null ? new ArrayList<Hash>(128) : null;
if (".".equals(routerPrefix)) {
buf.append("<table><tr><td class=\"infohelp\">")
.append(_t("Never reveal your router identity to anyone, as it is uniquely linked to your IP address in the network database."))
.append("</td></tr></table>");
renderRouterInfo(buf, _context.router().getRouterInfo(), true, true);
} else {
StringBuilder ubuf = new StringBuilder();

4
apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java
View File

@ -76,7 +76,7 @@ class TunnelRenderer {
dname = DataHelper.escapeHTML(_t(name));
}
out.write("<h3 class=\"tabletitle\" id=\"" + b64
+ "\" >" + _t("Client tunnels for") + ' ' + dname);
+ "\" >" + _t("Client tunnels for {0}", dname));
if (isLocal) {
// links are set to float:right in CSS so they will be displayed in reverse order
out.write(" <a href=\"/configtunnels#" + b64 + "\" title=\"" + _t("Configure tunnels for session") + "\">[" + _t("configure") + "]</a>");
@ -97,7 +97,7 @@ class TunnelRenderer {
if (aname == null)
aname = ab64;
out.write("<h3 class=\"tabletitle\" id=\"" + ab64
+ "\" >" + _t("Client tunnels for") + ' ' + DataHelper.escapeHTML(_t(aname)));
+ "\" >" + _t("Client tunnels for {0}", DataHelper.escapeHTML(_t(aname))));
if (isLocal)
out.write(" <a href=\"/configtunnels#" + b64 + "\" title=\"" + _t("Configure tunnels for session") + "\">[" + _t("configure") + "]</a></h3>\n");
else

35
apps/routerconsole/jsp/configadvanced.jsp
View File

@ -24,11 +24,8 @@
<%@include file="formhandler.jsi" %>
<div class="configure">
<div class="wideload">
<p class="infohelp">The router configuration options listed below are not available in the user interface, usually because they are rarely used or provide access to advanced settings that most users will not need.
This is not a comprehensive list.
Some settings will require a restart of the router to take effect.
Note that all settings are case sensitive.
You will need to edit your <code>router.config</code> file to add options, or, once you have added <code>routerconsole.advanced=true</code> to the router.config file, you may edit settings within the console on the <a href="/configadvanced">Advanced Configuration page</a>.</p>
<p class="infohelp"><%=intl._t("Most of the router configuration options listed below are not available in the user interface, because they are rarely used or provide access to advanced settings that most users will not need.")%>
<%=intl._t("You must edit your <code>router.config</code> file to add options, or, if you have added <code>routerconsole.advanced=true</code> to the router.config file, you may edit settings within the console on this page.")%></p>
<h3 id="ffconf" class="tabletitle"><%=intl._t("Floodfill Configuration")%></h3>
<form action="" method="POST">
@ -97,30 +94,22 @@ You will need to edit your <code>router.config</code> file to add options, or, o
<h3 id="ffconf" class="tabletitle"><%=intl._t("Advanced Configuration Help")%></h3>
<table id="configinfo">
<tr><th>routerconsole.advanced={true|false}</th></tr>
<tr><td class="infowarn">Only set this to true if you know what you are doing!</td></tr>
<tr><td>When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on the <a href="/configadvanced">Advanced Configuration page</a>.
Extra display options are provided in the <a href="/netdb">Network Database section</a>, including the <a href="/netdb?f=3">Sybil Analysis tool</a>, and there are additional configuration options on the <a href="/configclients">Clients Configuration page</a>.
This will also enable the installation of unsigned updates, manual configuration of the news URL, and the installation of plugins.
You may also wish to enable the "Advanced" sidebar section on the <a href="/configsidebar">Sidebar Configuration page</a>.</td></tr>
<tr><td><%=intl._t("Only set this to true if you know what you are doing!")%></td></tr>
<tr><td><%=intl._t("When set to true, additional functionality will be enabled in the console and the user will be able to edit settings directly on this page")%>.
<%=intl._t("Extra display options are provided in the <a href=\"/netdb\">Network Database section</a>.")%>
<%=intl._t("This will also enable the installation of unsigned updates.")%>
<%=intl._t("You may also wish to enable the advanced sidebar section on the <a href=\"/configsidebar\">Sidebar Configuration page</a>.")%></td></tr>
<tr><th>routerconsole.browser={/path/to/browser}</th></tr>
<tr><td>This setting allows the manual selection of the browser which I2P will launch on startup (if the console is <a href="/configservice#browseronstart">configured</a> to launch a browser on startup), overriding the OS default browser.</td></tr>
<tr><th>router.updateUnsignedURL={url}</th></tr>
<tr><td>This setting allows you to configure the update url for the unsigned update feature, if enabled.
The url should end with <code>/i2pupdate.zip</code>.
Note: do not install unsigned updates unless you trust the source of the update!</td></tr>
<tr><td><%=intl._t("This setting allows the manual selection of the browser which I2P will launch on startup.")%></td></tr>
<tr><th>routerconsole.showSearch={true|false}</th></tr>
<tr><td>When set to true, a configurable search bar will appear on the <a href="/home">console homepage</a>.
Additional searches may then be added on the <a href="/confighome">home configuration page</a>.</td></tr>
<tr><th>router.hideFloodfillParticipant={true|false}</th></tr>
<tr><td>When set to true, if your router is serving as a floodfill for the network, your <a href="/configadvanced#ffconf">floodfill participation</a> will be hidden from other routers.</td></tr>
<tr><td><%=intl._t("When set to true, a configurable search bar will appear on the <a href=\"/home\">console home page</a>")%>.
<%=intl._t("Additional searches may then be added on the <a href=\"/confighome\">home configuration page</a>.")%></td></tr>
<tr><th>router.maxParticipatingTunnels={n}</th></tr>
<tr><td>Determines the maximum number of participating tunnels the router can build.
To disable participation completely, set to 0.</td></tr>
<tr><td><%=intl._t("Determines the maximum number of participating tunnels the router will accept.")%>
<%=intl._t("To disable participation completely, set to 0.")%></td></tr>
</table>
</div></div></div></body></html>

114
apps/routerconsole/jsp/help-faq.jsi
View File

@ -1,78 +1,70 @@
<h2>Abridged I2P FAQ</h2>
<h2><%=intl._t("Abridged I2P FAQ")%></h2>
<p class="infohelp"><%=intl._t("This is a shortened version of the official FAQ.")%>
<%=intl._t("For the full version, please visit {0} or {1}.",
"<a href=\"https://geti2p.net/faq\" target=\"_blank\">geti2p.net/faq</a>",
"<a href=\"http://i2p-projekt.i2p/faq\" target=\"_blank\">i2p-projekt.i2p/faq</a>")%>
<p class="infohelp">This is a shortened version of the official FAQ.
For the full version, please visit <a href="https://geti2p.net/faq" target="_blank">https://geti2p.net/faq</a> or <a href="http://i2p-projekt.i2p/faq" target="_blank">http://i2p-projekt.i2p/faq</a>.
<h3><%=intl._t("My router has been up for several minutes and has zero or very few connections")%></h3>
<p><%=intl._t("If after a few minutes of uptime your router is indicating 0 Active Peers and 0 Known Peers, with a notification in the sidebar that you need to check your network connection, verify that you can access the internet.")%>
<%=intl._t("If your internet connection is functional, you may need to unblock Java in your firewall.")%>
<%=intl._t("Otherwise, you may need to reseed your I2P router. Visit the <a href=\"/configreseed#reseedconfig\">Reseed Configuration page</a> and click the \"Save Changes and Reseed Now\" button.")%></p>
<h3>My router has been up for several minutes and has zero or very few connections</h3>
<h3><%=intl._t("My router has very few active peers, is this OK?")%></h3>
<p><%=intl._t("If your router has 10 or more active peers, everything is fine.")%>
<%=intl._t("The router should maintain connections to a few peers at all times.")%>
<%=intl._t("The best way to stay connected to the network is to <a href=\"/config\">share more bandwidth</a>.")%></p>
<p>If after a few minutes of uptime your router is indicating 0 Active Peers and 0 Known Peers, with a notification in the sidebar that you need to check your network connection, verify that you can access the internet.
If your internet connection is functional, you may need to unblock Java in your firewall.
Otherwise, you may need to reseed your I2P router. Visit the <a href="/configreseed#reseedconfig">Reseed Configuration page</a> and click the "Save Changes and Reseed Now" button.</p>
<h3>My router has very few active peers, is this OK?</h3>
<p>If your router has 10 or more active peers, everything is fine.
The router should maintain connections to a few peers at all times.
The best way to stay "better-connected" to the network is to <a href="/config">share more bandwidth</a>.</p>
<h3 id="addressbooksubs">I'm missing lots of hosts in my addressbook. What are some good subscription links?</h3>
<p>The default subscription is to <code>http://i2p-projekt.i2p/hosts.txt</code> which is seldom updated.
If you don't have another subscription, you may often have to use "jump" links which is much slower but ensures that your addressbook is only populated by sites you use (in addition to the default subscription addresses).
To speed up browsing on I2P, it's a good idea to add some addressbook subscriptions.</p>
<p>Here are some other public addressbook subscription links.
You may wish to add one or two to your <a href="/susidns/subscriptions">susidns subscription list</a>.
In the event that addresses conflict in the subscriptions, the lists placed at the top of your susidns configuration will take precedence over those placed further down.</p>
<h3 id="addressbooksubs"><%=intl._t("I am missing lots of hosts in my addressbook. What are some good subscription links?")%></h3>
<p><%=intl._t("The default subscription is to {0} which is seldom updated.", "<code>i2p-projekt.i2p</code>")%>
<%=intl._t("If you don't have another subscription, you may use \"jump\" links which are slower, but ensure that your addressbook only contains the default addresses and sites that you use.")%>
<%=intl._t("To speed up browsing on I2P, it's a good idea to add some addressbook subscriptions.")%></p>
<p><%=intl._t("Here are some other public addressbook subscription links.")%>
<%=intl._t("You may wish to add one or two to your <a href=\"/susidns/subscriptions\">subscription list</a>.")%>
<ul>
<li><code>http://stats.i2p/cgi-bin/newhosts.txt</code></li>
<li><code>http://no.i2p/export/alive-hosts.txt</code></li>
<li><code>http://identiguy.i2p/hosts.txt</code></li>
</ul>
<p>Note that subscribing to a hosts.txt service is an act of trust, as a malicious subscription could give you incorrect addresses, so be careful subscribing to lists from unknown sources.
The operators of these services may have various policies for listing hosts.
Presence on this list does not imply endorsement.</p>
<p><%=intl._t("Note that subscribing to a hosts.txt service is an act of trust, as a malicious subscription could give you incorrect addresses, so be careful subscribing to lists from unknown sources.")%>
<%=intl._t("The operators of these services may have various policies for listing hosts.")%>
<%=intl._t("Presence on this list does not imply endorsement.")%></p>
<h3>How do I access IRC, BitTorrent, or other services on the regular Internet?</h3>
<h3><%=intl._t("How do I access IRC, BitTorrent, or other services on the regular Internet?")%></h3>
<p><%=intl._t("Unless an outproxy has been set up for the service you want to connect to, this is not possible.")%>
<%=intl._t("There are only three types of outproxies running right now: HTTP, HTTPS, and email.")%>
<%=intl._t("Note that there is currently no public SOCKS outproxy.")%></p>
<p>Unless an outproxy has been set up for the service you want to connect to, this is not possible.
There are only three types of outproxies running right now: HTTP, HTTPS, and email.
Note that there is currently no publicly listed SOCKS outproxy.
If this type of service is required, try <a href="https://torproject.org/" target="_blank">Tor</a>.</p>
<h3><%=intl._t("How do I configure my browser to access I2P websites?")%></h3>
<p><%=intl._t("You will need to configure your browser to use the HTTP proxy server on host <code>127.0.0.1</code> port <code>4444</code>).")%>
<%=intl._t("See the {0} for a more detailed explanation.",
"<a href=\"https://geti2p.net/en/about/browser-config\" target=\"_blank\">" + intl._t("Browser Proxy Configuration Guide") + "</a>")%></p>
<h3>How do I configure my browser to access .i2p websites?</h3>
<p>You will need to configure your browser to use the HTTP proxy server (by default on host: <code>127.0.0.1</code> port: <code>4444</code>).
See the <a href="https://geti2p.net/en/about/browser-config" target="_blank">Browser Proxy Configuration Guide</a> for a more detailed explanation.</p>
<h3><%=intl._t("What is an eepsite?")%></h3>
<p><%=intl._t("An eepsite is a website that is hosted anonymously on the I2P network.")%>
<%=intl._t("You can access it by configuring your web browser to use I2P's HTTP proxy and browsing to the website.")%></p>
<h3>What is an eepsite?</h3>
<h3><%=intl._t("Most of the eepsites are down?")%></h3>
<p><%=intl._t("If you consider every eepsite that has ever been created, yes, most of them are down.")%>
<%=intl._t("People and eepsites come and go.")%>
<%=intl._t("A good way to get started in I2P is check out a list of eepsites that are currently up.")%>
<%=intl._t("{0} tracks active eepsites.",
"<a href=\"http://identiguy.i2p\" target=\"_blank\">identiguy.i2p</a>")%></p>
<p>An eepsite is a website that is hosted anonymously on the I2P network - you can access it by configuring your web browser to use I2P's HTTP proxy (see above) and browsing to the <code>.i2p</code> suffixed website (e.g. <a href="http://i2p-projekt.i2p" target="_blank">http://i2p-projekt.i2p</a>).
Also ensure your browser is configured to resolve DNS remotely when using the proxy to avoid DNS leaks.</p>
<h3><%=intl._t("How do I connect to IRC within I2P?")%></h3>
<p><%=intl._t("A tunnel to the main IRC server network within I2P, Irc2P, is automatically started when the I2P router starts.")%>
<%=intl._t("To connect to it, tell your IRC client to connect to server: <code>127.0.0.1</code> port: <code>6668</code>.")%></p>
<h3>Most of the eepsites are down?</h3>
<p>If you consider every eepsite that has ever been created, yes, most of them are down.
People and eepsites come and go.
A good way to get started in I2P is check out a list of eepsites that are currently up.
<a href="http://identiguy.i2p" target="_blank">http://identiguy.i2p</a> tracks active eepsites.</p>
<h3>How do I connect to IRC within I2P?</h3>
<p>A tunnel to the main IRC server network within I2P, Irc2P, is created when I2P is installed (see the <a href="/i2ptunnelmgr">I2P Tunnel Manager</a>), and is automatically started when the I2P router starts.
To connect to it, tell your IRC client to connect to server: <code>127.0.0.1</code> port: <code>6668</code>.</p>
<p>HexChat-like client users can create a new network with the server <code>127.0.0.1/6668</code> (remember to tick "Bypass proxy server" if you have a proxy server configured), or you can connect with the command <code>/server 127.0.0.1 6668</code>.
Different IRC clients may require a different command, consult your IRC client's manual for more information.</p>
<h3>What ports does I2P use?</h3>
<p><%=intl._t("HexChat-like client users can create a new network with the server <code>127.0.0.1/6668</code>, or you can connect with the command <code>/server 127.0.0.1 6668</code>.")%>
<%=intl._t("Different IRC clients may require a different command, consult the client documentation.")%></p>
<h3><%=intl._t("What ports does I2P use?")%></h3>
<table id="portfaq">
<tr><th colspan="3">LOCAL PORTS</th></tr>
<tr><td colspan="3" class="infohelp">These are the local I2P port mappings, listening only to local connections by default, except where noted.
Unless you require access from other machines, they should only be accessible from localhost.</td></tr>
<tr><th>Port</th><th>Function</th><th>Notes</th></tr>
<tr><th colspan="3"><%=intl._t("Local ports")%></th></tr>
<tr><td colspan="3" class="infohelp"><%=intl._t("These are the local I2P port mappings, listening only to local connections by default, except where noted.")%>
<%=intl._t("Unless you require access from other machines, they should only be accessible from localhost.")%></td></tr>
<tr><th><%=intl._t("Port")%></th><th><%=intl._t("Function")%></th><th><%=intl._t("Notes")%></th></tr>
<tr><td>1900</td>
<td>UPnP SSDP UDP multicast listener</td>
<td>Cannot be changed.
@ -149,9 +141,10 @@ To change, see the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-p
<tr><td>32000</td>
<td>Local control channel for the service wrapper</td>
<td>To change, see the <a href="http://wrapper.tanukisoftware.com/doc/english/prop-port.html" target="_blank">wrapper documentation</a>.</td></tr>
<tr><th colspan="3">INTERNET FACING PORTS</th></tr>
<tr><td colspan="3" class="infohelp">I2P selects a random port between 9000 and 31000 to communicate with other routers when the program is run for the first time, or when your external IP address changes when running in <a href="/confignet#ipchange">Laptop Mode</a>.
The <a href="/confignet#udpconfig">selected port</a> is shown on the <a href="/confignet">Network Configuration page</a>.</td></tr>
<tr><th colspan="3"><%=intl._t("Internet facing ports")%></th></tr>
<tr><td colspan="3" class="infohelp"><%=intl._t("I2P selects a random port to communicate with other routers when the program is run for the first time.")%>
<%=intl._t("The selected port is shown on the <a href=\"/confignet\">Network Configuration page</a>.")%></td></tr>
<tr><td colspan="3">Outbound UDP from the <a href="/confignet#udpconfig">random port</a> noted on the Network Configuration page to arbitrary remote UDP ports, allowing replies.</td></tr>
<tr><td colspan="3">Outbound TCP from random high ports to arbitrary remote TCP ports.</td></tr>
<tr><td colspan="3">Inbound UDP to the <a href="/confignet#udpconfig">port</a> noted on the Network Configuration page from arbitrary locations (optional, but recommended).</td></tr>
@ -159,4 +152,3 @@ The <a href="/confignet#udpconfig">selected port</a> is shown on the <a href="/c
<a href="/confignet#tcpconfig">Inbound TCP</a> may be disabled on the Network Configuration page.</td></tr>
<tr><td colspan="3">Outbound UDP on port 123, allowing replies: this is necessary for I2P's internal time sync (via SNTP - querying a random SNTP host in <code>pool.ntp.org</code> or another server you specify).</td></tr>
</table>

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

@ -70,3 +70,9 @@
<%=intl._t("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%>
</li>
</ul>
<h3><%=intl._t("Clock Skew")%></h3>
<%=intl._t("The skew (offset) of your computer's clock relative to the network-synced time.")%>
<%=intl._t("I2P requires your computer's time be accurate.")%>
<%=intl._t("If the skew is more than a few seconds, please correct the problem by adjusting your computer's time.")%>
<%=intl._t("If I2P cannot connect to the internet, a reading of 0ms may be indicated.")%>

96
apps/routerconsole/jsp/help-sidebar.jsi
View File

@ -1,69 +1,43 @@
<h2>Sidebar Information</h2>
<p>Many of the stats on the sidebar may be <a href="configstats">configured</a> to be <a href="graphs">graphed</a> for further analysis.
You may also customize the sections that appear on the Sidebar and their positioning on the <a href="configsidebar">Sidebar Configuration page</a>.
<h2><%=intl._t("Sidebar Information")%></h2>
<p><%=intl._t("Many of the stats on the sidebar may be <a href=\"configstats\">configured</a> to be <a href=\"graphs\">graphed</a> for further analysis.")%>
<%=intl._t("You may also customize the sections that appear on the Sidebar and their positioning on the <a href=\"configsidebar\">Sidebar Configuration page</a>.")%>
</p>
<h3>Router Info</h3>
<h3><%=intl._t("Bandwidth in/out")%></h3>
<p><%=intl._t("This section indicates your average bandwidth speeds and total usage for the session.")%>
<%=intl._t("All values are in bytes per second, not bits per second.")%>
<%=intl._t("You may change your bandwidth limits on the <a href=\"config\">Bandwidth Configuration page</a>.")%>
<%=intl._t("The more bandwidth you make available, the more you help the network and improve your own anonymity, so please take the time to review the settings.")%>
<%=intl._t("Your upstream share amount (KBps Out) will determine your overall contribution to the network.")%>
</p>
<h3><%=intl._t("Peers")%></h3>
<ul>
<li>
<b>Local Identity:</b>
If you hover over the "Router Info" heading, your truncated router identity will be shown (the first four characters (24 bits) of your 44-character (256-bit) Base64 router hash).
The full hash is shown on your <a href="netdb?r=.">Network Database entry</a>.
Never reveal this to anyone, as your router identity is uniquely linked to your IP address in the network database.</li>
<b><%=intl._t("Active")%>:</b> <%=intl._t("The first number is the number of peers your router has sent or received a message from in the last few minutes.")%>
<%=intl._t("This may range from 8-10 to several hundred, depending on your total bandwidth, shared bandwidth, and locally-generated traffic.")%>
<%=intl._t("The second number is the number of peers seen in the last hour or so.")%>
<%=intl._t("Do not be concerned if these numbers vary widely.")%>
</li>
<li>
<b>Clock Skew:</b>
The skew (offset) of your computer's clock relative to the network-synced time (if known).
I2P requires your computer's time be accurate.
If the skew is more than a few seconds, please correct the problem by adjusting your computer's time.
If I2P cannot connect to the internet, a reading of 0ms may be indicated.
<b>Note:</b> This is only displayed in the "Router Information (advanced)" section.
You may add this section to your Sidebar on the <a href="configsidebar">Sidebar Configuration page</a>.
<b><%=intl._t("Fast")%>:</b> <%=intl._t("This is the number of peers your router has available for building client tunnels.")%>
<%=intl._t("These peers are shown on the <a href=\"profiles\">profiles page</a>.")%>
</li>
<li><b><%=intl._t("High Capacity")%>:</b>
<%=intl._t("This is the number of peers your router has available for building your exploratory tunnels which are used to determine network performance.")%>
<%=intl._t("The fast peers are included in the high capacity tier.")%>
<%=intl._t("These peers are shown on the <a href=\"profiles\">profiles page</a>.")%>
</li>
<li>
<b><%=intl._t("Integrated")%>:</b> <%=intl._t("This is the number of peers your router will use for network database inquiries.")%>
<%=intl._t("These are usually the floodfill routers responsible for maintaining network integrity.")%>
<%=intl._t("These peers are shown on the <a href=\"profiles\">profiles page</a>.")%>
</li>
<li>
<b><%=intl._t("Known")%>:</b> <%=intl._t("This is the total number of peers that are known by your router.")%>
<%=intl._t("This may range from under 100 to several thousand.")%>
<%=intl._t("This number is not the total size of the network; it may vary widely depending on your total bandwidth, shared bandwidth, and locally-generated traffic.")%>
<%=intl._t("I2P does not require a router to know every other router in the network.")%>
</li>
</ul>
<h3>Peers</h3>
<ul>
<li>
<b>Active:</b> The first number is the number of peers your router has sent or received a message from in the last few minutes.
This may range from 8-10 to several hundred, depending on your total bandwidth, shared bandwidth, and locally-generated traffic.
The second number is the number of peers seen in the last hour or so.
Do not be concerned if these numbers vary widely.
<a href="configstats#router.activePeers">[Enable graphing]</a>.
</li>
<li>
<b>Fast:</b> This is the number of peers your router has available for building client tunnels.
It is generally in the range 8-30. Your fast peers are shown on the <a href="profiles">Profiles page</a>.
<a href="configstats#router.fastPeers">[Enable graphing]</a>
</li>
<li><b>High Capacity:</b>
This is the number of peers your router has available for building your exploratory tunnels which are used to determine network performance.
It is generally in the range 8-75.
The fast peers are included in the high capacity tier.
Your high capacity peers are shown on the <a href="profiles">Profiles page</a>.
<a href="configstats#router.highCapacityPeers">[Enable graphing]</a>
</li>
<li>
<b>Integrated:</b> This is the number of peers your router will use for network database inquiries.
These are usually the "floodfill" routers which are responsible for maintaining network integrity.
Your well integrated peers are shown on the bottom of the <a href="profiles">Profiles page</a>.
</li>
<li>
<b>Known:</b> This is the total number of peers that are known by your router.
They are listed on the <a href="netdb">Network Database page</a>.
This may range from under 100 to 1000 or more.
This number is not the total size of the network; it may vary widely depending on your total bandwidth, shared bandwidth, and locally-generated traffic.
I2P does not require a router to know every other router in the network.
</li>
</ul>
<p> This section indicates your average bandwidth speeds and total usage for the session.
All values are in bytes per second, not bits per second.
You may change your bandwidth limits on the <a href="config">Bandwidth Configuration page</a>.
The more bandwidth you make available, the more you help the network and improve your own anonymity, so please take the time to review the settings.
If you are unsure of your network's speed, using a service such as <a href="https://speedtest.net/">SpeedTest</a> or similar will give you a good indication of your bandwidth capability.
Your upstream share amount (KBps Out) will determine your overall contribution to the network.
Bandwidth is <a href="graphs">graphed</a> by default.</p>

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

@ -1,9 +1,10 @@
<h2>Further Assistance</h2>
<p>If you'd like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for <a href="http://i2p-projekt.i2p/en/get-involved" target="_blank">volunteers.</a></p>
<p>Further assistance is available here:</p>
<h2><%=intl._t("Further Assistance")%></h2>
<p><%=intl._t("If you would like to help improve or translate the documentation, or help with other aspects of the project, please see the documentation for <a href=\"http://i2p-projekt.i2p/en/get-involved\" target=\"_blank\">volunteers.</a>")%></p>
<p><%=intl._t("Further assistance is available here:")%></p>
<ul class="links">
<li><a href="http://i2p-projekt.i2p/en/faq" target="_blank">FAQ on i2p-projekt.i2p</a></li>
<li><a href="http://i2pwiki.i2p/" target="_blank">I2PWiki</a></li>
<li><a href="http://i2p-projekt.i2p/en/faq" target="_blank"><%=intl._t("FAQ on i2p-projekt.i2p")%></a></li>
<li><a href="http://i2pwiki.i2p/" target="_blank"><%=intl._t("I2P Wiki")%></a></li>
</ul>
<p>You may also try <a href="http://zzz.i2p/" target="_blank">zzz's developer forum</a>,
or <a href="irc://127.0.0.1:6668/i2p">I2P's IRC network</a>.</p>
<p><%=intl._t("You may also try {0} or {1}.",
"<a href=\"http://i2pforum.i2p/\" target=\"_blank\">" + intl._t("I2P Forum") + "</a>",
"<a href=\"irc://127.0.0.1:6668/i2p\">" + intl._t("I2P's IRC network") + "</a>")%></p>

22
apps/routerconsole/jsp/help.jsp
View File

@ -2,28 +2,22 @@
<%@page trimDirectiveWhitespaces="true"%>
<%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<%
/*
* Do not tag this file for translation - copy it to help_xx.jsp and translate inline.
*/
%>
<html><head><title>I2P Router Console - help</title>
<html><head>
<%@include file="css.jsi" %>
<%=intl.title("help")%>
<script src="/js/ajax.js" type="text/javascript"></script>
<%@include file="summaryajax.jsi" %>
</head><body onload="initAjax()">
<%@include file="summary.jsi" %>
<h1>I2P Router Help &amp; Support</h1>
<h1><%=intl._t("I2P Router Help and Support")%></h1>
<div class="main" id="help">
<div class="confignav">
<span class="tab"><a href="#sidebarhelp">Sidebar</a></span>
<span class="tab"><a href="#reachabilityhelp">Reachability</a></span>
<span class="tab"><a href="#faq">FAQ</a></span>
<span class="tab"><a href="/viewlicense">Legal</a></span>
<span class="tab"><a href="/viewhistory">Change Log</a></span>
<span class="tab"><a href="#sidebarhelp"><%=intl._t("Sidebar")%></a></span>
<span class="tab"><a href="#reachabilityhelp"><%=intl._t("Reachability")%></a></span>
<span class="tab"><a href="#faq"><%=intl._t("FAQ")%></a></span>
<span class="tab"><a href="/viewlicense"><%=intl._t("Legal")%></a></span>
<span class="tab"><a href="/viewhistory"><%=intl._t("Change Log")%></a></span>
</div>
<div id="volunteer"><%@include file="help.jsi" %></div>
<div id="sidebarhelp"><%@include file="help-sidebar.jsi" %></div>
<div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>

5
apps/routerconsole/jsp/jobs.jsp
View File

@ -14,6 +14,7 @@
<jsp:useBean class="net.i2p.router.web.helpers.JobQueueHelper" id="jobQueueHelper" scope="request" />
<jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=i2pcontextId%>" />
<% jobQueueHelper.storeWriter(out); %>
<%-- This page is hidden behind advanced config, don't bother translating --%>
<h2>Congestion</h2><div class="joblog">
<p>Some basic indications of router overload:</p>
<ul><li>
@ -21,16 +22,14 @@
Unfortunately, there are several other job queues in the router that may be congested, and their status is not available in the router console.
The job lag should generally be zero.
If it is consistently higher than 500ms, your computer is very slow, your network is experiencing connectivity issues, or the router has serious problems.
<a href="configstats#jobQueue.jobLag">[Enable graphing]</a>.
</li><li>
<b>Message Delay:</b> How long an outbound message waits in the queue.
This should generally be a few hundred milliseconds or less.
If it is consistently higher than 1000ms, your computer is very slow, or you should adjust your bandwidth limits, or your (Bittorrent?) clients may be sending too much data and should have their transmit bandwidth limit reduced.
<a href="configstats#transport.sendProcessingTime">[Enable graphing]</a> (transport.sendProcessingTime).
</li><li>
<b>Accepting/Rejecting:</b> Your router's status on accepting or rejecting requests from other routers to build a participating tunnel through your router.
Your router may accept all requests, accept or reject a percentage of requests, or reject all requests for a number of reasons, to control the bandwidth and CPU demands and maintain capacity for local clients.
<b>Note:</b> It will take at least 10 minutes from your router starting for it to accept building participating tunnels in order to ensure your router is stable and successfully bootstrapped to the network.
<b>Note:</b> It will take several minutes after startup to begin accepting participating tunnels. This ensures your router is stable and successfully bootstrapped to the network.
</li></ul></div>
<jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
</div></body></html>

23
apps/routerconsole/jsp/tunnels.jsp
View File

@ -15,24 +15,27 @@
<jsp:setProperty name="tunnelHelper" property="contextId" value="<%=i2pcontextId%>" />
<% tunnelHelper.storeWriter(out); %>
<p id="gatherstats">
This page shows tunnels built by and routed through your router.
<%=intl._t("This page shows tunnels built by and routed through your router.")%>
<ul>
<li>
<b>Exploratory:</b> Tunnels built by your router and used for communication with the floodfill peers, building new tunnels, and testing existing tunnels.
<b><%=intl._t("Exploratory tunnels")%>:</b>
<%=intl._t("Tunnels built by your router and used for communication with the floodfill peers, building new tunnels, and testing existing tunnels.")%>
</li>
<li>
<b>Client:</b> Tunnels built by your router for each client's use.
<b><%=intl._t("Client tunnels")%>:</b>
<%=intl._t("Tunnels built by your router for each client's use.")%>
</li>
<li>
<b>Participating:</b> Tunnels built by other routers through your router.
This may vary widely depending on network demand, your shared bandwidth, and amount of locally-generated traffic.
The recommended method for limiting participating tunnels is to change your share percentage on the <a href="config">Bandwidth Configuration page</a>.
You may also limit the total number by setting <code>router.maxParticipatingTunnels=nnn</code> on the <a href="configadvanced">Advanced configuration page</a>.
<a href="configstats#tunnel.participatingTunnels">[Enable graphing]</a>.
<b><%=intl._t("Participating tunnels")%>:</b>
<%=intl._t("Tunnels built by other routers through your router.")%>
<%=intl._t("The quantity may vary widely depending on network demand, your shared bandwidth, and amount of locally-generated traffic.")%>
<%=intl._t("The recommended method for limiting participating tunnels is to change your share percentage on the <a href=\"config\">Bandwidth Configuration page</a>.")%>
<%=intl._t("You may also limit the total number by setting <code>router.maxParticipatingTunnels=nnn</code> on the <a href=\"configadvanced\">Advanced configuration page</a>.")%>
</li>
<li>
<b>Share Ratio:</b> The number of participating tunnels you route for others, divided by the total number of hops in all your exploratory and client tunnels.
A number greater than 1.00 means you are contributing more tunnels to the network than you are using.
<b><%=intl._t("Share ratio")%>:</b>
<%=intl._t("The number of participating tunnels you route for others, divided by the total number of hops in all your exploratory and client tunnels.")%>
<%=intl._t("A number greater than 1.00 means you are contributing more tunnels to the network than you are using.")%>
</li>
</ul>
</p>

5
history.txt
View File

@ -1,4 +1,7 @@
2019-08-10 str4d:
2019-08-14 zzz
* Console: Clean up help text, tag for translation (ticket #2298)
2019-08-10 str4d
* EdDSA: Reduce diff between vendored code and upstream
* Jetty: Fix Gradle build
* Tests:

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

@ -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 = 7;
public final static long BUILD = 8;
/** for example "-test" */
public final static String EXTRA = "";