Console: Split up /help page, prep for translation (ticket #2298) (WIP)

Summary bar -> sidebar Remove static translated help pages Add jsp for LICENSE.txt
2019-07-19 20:30:22 +00:00
parent d73058fd65
commit 365820172a
30 changed files with 189 additions and 1118 deletions
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@ -33,6 +33,13 @@
    <% }
  %>
 </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.")%>
 </p></div>
 <%
  boolean isInitialized = indexBean.isInitialized();
  String nextNonce = isInitialized ? net.i2p.i2ptunnel.web.IndexBean.getNextNonce() : null;
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNavHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNavHelper.java
@ -27,7 +27,7 @@ public class ConfigNavHelper extends HelperBase {
                                           "reseed", "advanced", "family" };
    private static final String titles[] =
-                                          {_x("Bandwidth"), _x("Network"), _x("UI"), _x("Summary Bar"), _x("Home Page"),
+                                          {_x("Bandwidth"), _x("Network"), _x("UI"), _x("Sidebar"), _x("Home Page"),
                                           _x("Service"), _x("Update"), _x("Tunnels"),
                                           _x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
                                           _x("I2CP"), _x("Plugins"), _x("Web Apps"),
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java
@ -65,9 +65,9 @@ public class ConfigReseedHandler extends FormHandler {
                    }
                    if (!addCheckerStatus(checker)) {
                        if (checker.inProgress()) {
-                            addFormNotice(_t("Reseed in progress, check summary bar for status"));
+                            addFormNotice(_t("Reseed in progress, check sidebar for status"));
                        } else {
-                            addFormNotice(_t("Reseed complete, check summary bar for status"));
+                            addFormNotice(_t("Reseed complete, check sidebar for status"));
                        }
                    }
                }
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java
@ -12,7 +12,7 @@ import net.i2p.router.web.FormHandler;
 /**
- *  Simple summary bar configuration.
+ *  Simple sidebar configuration.
 *
 *  @since 0.9.1
 */
@ -39,12 +39,12 @@ public class ConfigSummaryHandler extends FormHandler {
            }
        } else if (_action.equals(_t("Restore full default"))) {
            _context.router().saveConfig(SummaryHelper.PROP_SUMMARYBAR + "default", isAdvanced() ? SummaryHelper.DEFAULT_FULL_ADVANCED : SummaryHelper.DEFAULT_FULL);
-            addFormNotice(_t("Full summary bar default restored.") + " " +
+            addFormNotice(_t("Full sidebar default restored.") + " " +
-                          _t("Summary bar will refresh shortly."));
+                          _t("Sidebar will refresh shortly."));
        } else if (_action.equals(_t("Restore minimal default"))) {
            _context.router().saveConfig(SummaryHelper.PROP_SUMMARYBAR + "default", isAdvanced() ? SummaryHelper.DEFAULT_MINIMAL_ADVANCED : SummaryHelper.DEFAULT_MINIMAL);
-            addFormNotice(_t("Minimal summary bar default restored.") + " " +
+            addFormNotice(_t("Minimal sidebar default restored.") + " " +
-                          _t("Summary bar will refresh shortly."));
+                          _t("Sidebar will refresh shortly."));
        } else if (adding || deleting || saving || moving) {
            Map<Integer, String> sections = new TreeMap<Integer, String>();
            for (Object o : _settings.keySet()) {
@ -137,7 +137,7 @@ public class ConfigSummaryHandler extends FormHandler {
            }
            SummaryHelper.saveSummaryBarSections(_context, "default", sections);
            addFormNotice(_t("Saved order of sections.") + " " +
-                          _t("Summary bar will refresh shortly."));
+                          _t("Sidebar will refresh shortly."));
        } else {
            //addFormError(_t("Unsupported"));
        }
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
@ -150,6 +150,22 @@ public class PeerHelper extends HelperBase {
            out.write(buf.toString());
        } else if ("upnp".equals(_transport)) {
            // UPnP Status
            StringBuilder buf = new StringBuilder(512);
            buf.append("<h3>").append(_t("UPnP Overview"))
               .append("</h3><div id=\"upnpoverview\"><p>")
               .append(_t("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports."))
               .append(' ')
               .append(_t("If UPnP is not working, it may be for one of the following reasons:"))
               .append("</p><ul id=\"upnphelp\"><li>").append(_t("No UPnP-compatible device present"))
               .append("</li>\n<li>").append(_t("UPnP disabled on the device"))
               .append("</li>\n<li>").append(_t("Software firewall interference with UPnP"))
               .append("</li>\n<li>").append(_t("Bugs in the device's UPnP implementation"))
               .append("</li>\n<li>").append(_t("Multiple firewall/routers in the internet connection path"))
               .append("</li>\n<li>").append(_t("UPnP device change, reset, or address change"))
               .append("</li>\n</ul><p>")
               .append(_t("UPnP may be enabled or disabled on the Network Configuration page, but a change requires a router restart to take effect."))
               .append("</p></div>");
            out.write(buf.toString());
            _context.commSystem().renderStatusHTML(_out, _urlBase, _sortFlags);
        }
        out.flush();
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
@ -152,22 +152,10 @@ class SummaryBarRenderer {
                   "<table id=\"sb_help\"><tr><td>" +
-                   "<a href=\"/help#advancedsettings\" target=\"_top\" title=\"")
+                   "<a href=\"/viewhistory\" target=\"_top\" title=\"")
           .append(_t("A guide to some of the less-used configuration settings"))
           .append("\">")
           .append(nbsp(_t("Advanced Settings")))
           .append("</a>\n" +
                   "<a href=\"/help#changelog\" target=\"_top\" title=\"")
           .append(_t("Recent development changes to the router"))
           .append("\">")
           .append(nbsp(_t("Changelog")))
           .append("</a>\n" +
                   "<a href=\"/help#configurationhelp\" target=\"_top\" title=\"")
           .append(_t("An introduction to configuring your router"))
           .append("\">")
           .append(nbsp(_t("Configuration")))
           .append("</a>\n" +
                   "<a href=\"/help#faq\" target=\"_top\" title=\"")
@ -176,7 +164,7 @@ class SummaryBarRenderer {
           .append(nbsp(_t("FAQ")))
           .append("</a>\n" +
-                   "<a href=\"/help#legal\" target=\"_top\" title=\"")
+                   "<a href=\"/viewlicense\" target=\"_top\" title=\"")
           .append(_t("Information regarding software and licenses used by I2P"))
           .append("\">")
           .append(nbsp(_t("Legal")))
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@ -28,8 +28,13 @@
 <h3 id="bwlimiter" class="tabletitle"><%=intl._t("Bandwidth Limiter")%>&nbsp;<a href="confignet">[<%=intl._t("Advanced Network Configuration")%>]</a></h3>
 <table id="bandwidthconfig" class="configtable">
 <tr><td class="infohelp" colspan="2">
- <b><%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b>
+ <b><%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b><p>
- </td></tr>
+<%=intl._t("All sidebar values are in bytes per second, not bits per second.")%>
 <%=intl._t("You may change your bandwidth limits here.")%>
 <%=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("If you are unsure of your network's speed, use the <a href=\"/welcome?page=3\">Bandwidth Test</a>.")%>
 <%=intl._t("Your upstream share amount (KBps Out) will determine your overall contribution to the network.")%>
 </p></td></tr>
 <%-- display burst, set standard, handler will fix up --%>
   <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" >
          <%=intl._t("KBps In")%>
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@ -24,6 +24,11 @@
 <%@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>
 <h3 id="ffconf" class="tabletitle"><%=intl._t("Floodfill Configuration")%></h3>
 <form action="" method="POST">
@ -55,7 +60,7 @@
 </table>
 </form>
-<h3 id="advancedconfig" class="tabletitle"><%=intl._t("Advanced I2P Configuration")%>&nbsp;<a title="Help with additional configuration settings" href="/help#advancedsettings">[Additional Options]</a></h3>
+<h3 id="advancedconfig" class="tabletitle"><%=intl._t("Advanced I2P Configuration")%></h3>
 <%
  String advConfig = advancedhelper.getSettings();
  if (advancedhelper.isAdvanced()) {
@ -88,4 +93,34 @@
 <% if (advancedhelper.isAdvanced()) { %>
 </form>
 <% }  // isAdvanced %>
 <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><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><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><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>
 </table>
 </div></div></div></body></html>
--- a/apps/routerconsole/jsp/confignet.jsp
+++ b/apps/routerconsole/jsp/confignet.jsp
@ -22,7 +22,7 @@
 <form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
 <input type="hidden" name="action" value="blah" >
- <h3 id="iptransport" class="tabletitle"><%=intl._t("IP and Transport Configuration")%>&nbsp;<a title="<%=intl._t("Help with router configuration")%>" href="/help#configurationhelp">[<%=intl._t("Configuration Help")%>]</a></h3>
+ <h3 id="iptransport" class="tabletitle"><%=intl._t("IP and Transport Configuration")%></h3>
 <table id="netconfig" class="configtable">
 <tr>
  <td class="infohelp">
@ -33,6 +33,20 @@
 <tr>
  <td class="infohelp">
   <b><%=intl._t("Do not reveal your port numbers to anyone, as they can be used to discover your IP address.")%></b>
 <p>
  <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%>&nbsp;
 </p>
 <p>
  <%=intl._t("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%>&nbsp;
  <%=intl._t("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%>&nbsp;
  <%=intl._t("Most of the options on the Network Configuration page are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%>&nbsp;
  <%=intl._t("Certain firewalls such as symmetric NATs may not work well with I2P.")%>
 </p>
 <p>
  <%=intl._t("Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.")%>&nbsp;
  <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>&nbsp;
  <%=intl._t("When in doubt, leave the settings at the defaults.")%>&nbsp;
 </p>
  </td>
 </tr>
 <tr>
--- a/apps/routerconsole/jsp/configsidebar.jsp
+++ b/apps/routerconsole/jsp/configsidebar.jsp
@ -4,7 +4,7 @@
 <html><head>
 <%@include file="css.jsi" %>
-<%=intl.title("config summary bar")%>
+<%=intl.title("config sidebar")%>
 <style type='text/css'>
 input.default {
    width: 1px;
@ -17,7 +17,7 @@ input.default {
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
-<h1><%=intl._t("I2P Summary Bar Configuration")%></h1>
+<h1><%=intl._t("I2P Sidebar Configuration")%></h1>
 <div class="main" id="config_summarybar">
 <%@include file="confignav.jsi" %>
@ -46,7 +46,7 @@ input.default {
 </table>
 </form>
-<h3 class="tabletitle"><%=intl._t("Customize Summary Bar")%></h3>
+<h3 class="tabletitle"><%=intl._t("Customize Sidebar")%></h3>
 <form action="" method="POST">
 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
 <input type="hidden" name="group" value="2">
--- a/apps/routerconsole/jsp/help-advancedsettings.jsi
+++ b/apps/routerconsole/jsp/help-advancedsettings.jsi
@ -1,60 +0,0 @@
 <h2>Advanced Router Configuration</h2>
 <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>
 <table id="configinfo"> <!-- sections separated for legibility -->
 <tr><th>i2p.vmCommSystem={true|false}</th></tr>
 <tr><td>When set to true, I2P runs without network connectivity, which is helpful if you are constantly restarting the router to test code updates as this prevents network disruption.</td></tr>
 <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">Summary Bar 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.updateUnsigned={true|false}</th></tr>
 <tr><td>If you wish to install unsigned (.zip) I2P updates, this should be added to your <code>router.config</code> file unless you have already configured <code>routerconsole.advanced=true</code>, in which case this option is already provisioned.</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><th>routerconsole.enablePluginInstall={true|false}</th></tr>
 <tr><td>When set to true, this enables plugin installation on the <a href="/configplugins">Plugin Configuration page</a>. 
 Setting <code>routerconsole.advanced=true</code> will also enable this feature. 
 [Enabled by default]</td></tr>
 <tr><th>routerconsole.allowUntrustedPlugins={true|false}</th></tr>
 <tr><td>Plugins signed with the cryptographic key of the developer are the recommended format, but if you wish to install unsigned plugins you can set this to true. 
 Note that you may still encounter issues attempting to install an unsigned plugin if the developer has included additional checks in the plugin build process.</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.buildHandlerThreads={n}</th></tr>
 <tr><td>Allocate number of processor threads for building tunnels. 
 If your processor supports hyperthreading or simultaneous multithreading, you may multiply the number of processor cores by 2 to get the maximum number of threads to allocate, otherwise number of processor cores = maximum number of threads available. 
 Note that you may wish to allocate less than the theoretical maximum to ensure you have headroom for other tasks.</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><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><th>router.networkDatabase.flat={true|false}</th></tr>
 <tr><td>When set to true, the router info files stored in your profile's netDB directory will not be split into 64 sub-directories. 
 </table>
--- a/apps/routerconsole/jsp/help-configuration.jsi
+++ b/apps/routerconsole/jsp/help-configuration.jsi
@ -1,33 +0,0 @@
 <h2><a name="confignet"><%=intl._t("Configuration Help")%></a></h2>
 <p>
  <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%>&nbsp;<a href="/confignet">[<%=intl._t("Network Configuration")%>]</a>.
 </p>
 <p>
  <%=intl._t("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%>&nbsp;
  <%=intl._t("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%>&nbsp;
  <%=intl._t("Most of the options on the Network Configuration page are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%>&nbsp;
  <%=intl._t("Certain firewalls such as symmetric NATs may not work well with I2P.")%>
 </p>
 <p>
  <%=intl._t("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>&nbsp;
  <%=intl._t("UPnP support is beta, and may not work for any number of reasons")%>:
 </p>
 <ul id="upnphelp">
  <li><%=intl._t("No UPnP-compatible device present")%></li>
  <li><%=intl._t("UPnP disabled on the device")%></li>
  <li><%=intl._t("Software firewall interference with UPnP")%></li>
  <li><%=intl._t("Bugs in the device's UPnP implementation")%></li>
  <li><%=intl._t("Multiple firewall/routers in the internet connection path")%></li>
  <li><%=intl._t("UPnP device change, reset, or address change")%></li>
 </ul>
 <p>
  <%=intl._t("UPnP may be enabled or disabled on the Network Configuration page, but a change requires a router restart to take effect.")%>&nbsp;
  <a href="peers#upnp">[<%=intl._t("Review the UPnP status here.")%>]</a>
 </p>
 <p>
  <%=intl._t("Hostnames entered on the Network Configuration page will be published in the network database.")%>&nbsp;
  <%=intl._t("They are <b>not private</b>.")%>&nbsp;
  <%=intl._t("Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.")%>&nbsp;
  <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>&nbsp;
  <%=intl._t("When in doubt, leave the settings at the defaults.")%>&nbsp;
 </p>
--- a/apps/routerconsole/jsp/help-legal.jsi
+++ b/apps/routerconsole/jsp/help-legal.jsi
@ -1,28 +0,0 @@
 <h2>Legal stuff</h2>
 <p>The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with a few notable exceptions:</p>
 <ul>
 <li>ElGamal and DSA code, under the BSD license, written by TheCrypto</li>
 <li>SHA256 and HMAC-SHA256, under the MIT license, written by the <a href="https://www.bouncycastle.org/" target="_blank">Legion of the Bouncycastle</a></li>
 <li>AES code, under the Cryptix (MIT) license, written by the <a href="http://www.cryptix.org/" target="_blank">Cryptix team</a></li>
 <li><a href="http://support.ntp.org/bin/view/Support/JavaSntpClient" target="_blank">SNTP code</a>, under the BSD license, written by Adam Buckley</li>
 <li>The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.</li>
 </ul>
 <p>On top of the I2P router are a series of client applications, each with their own set of licenses and dependencies:
 <ul>
 <li><a href="http://i2p-projekt.i2p/i2ptunnel" target="_blank">I2PTunnel</a> - a GPL'ed application written by mihi that lets you tunnel normal TCP/IP traffic over I2P (such as the http proxy and the irc proxy), with a <a href="/i2ptunnelmgr">browser-based front end.</a></li>
 <li><a href="/webmail">Susimail</a>, a GPL'ed browser based mail client written by susi23.</li>
 <li>The <a href="http://i2p-projekt.i2p/en/docs/naming#addressbook" target="_blank">addressbook application</a>, written by Ragnarok helps maintain your hosts.txt files, with a <a href="/dns">front end</a> written by susi23.</li>
 <li>The <a href="http://i2p-projekt.i2p/en/docs/api/samv3" target="_blank">SAM</a> bridge by human (public domain), an API which other client applications (such the <a href="http://i2pwiki.i2p/index.php?title=Tahoe-LAFS" target="_blank">I2P Tahoe-LAFS cloud filesystem</a>) can use to interface with I2P.</li>
 <li><a href="http://i2p-projekt.i2p/en/misc/jbigi" target="_blank">jbigi</a> - an optimized library for doing large number calculations which uses the LGPL licensed <a href="http://swox.com/gmp/" target="_blank">GMP</a> library, tuned for various PC architectures.</li>
 <li>Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/" target="_blank">Launch4J</a>, and the installer is built with  <a href="http://www.izforge.com/izpack/" target="_blank">IzPack</a>.</li>
 <li>The <a href="/">I2P Router Console</a>, built from a streamlined <a href="http://jetty.mortbay.com/jetty/index.html" target="_blank">Jetty Web Server</a> instance which allows you to deploy standard JSP/Servlet web applications in your router.</li>
 <li>Jetty makes use of Apache's <a href="https://docs.oracle.com/javaee/7/api/javax/servlet/package-summary.html" target="_blank">javax.servlet</a> (javax.servlet.jar) implementation. 
 This product includes software developed by the <a href="http://www.apache.org/" target="_blank">Apache Software Foundation</a>.</li>
 <li>Source for the I2P code and most bundled client applications can be found on our <a href="http://i2p-projekt.i2p/download" target="_blank">download page</a>.</li>
 </ul>
 <p>For details on other applications available, as well as their licenses, please see the <a href="http://i2p-projekt.i2p/licenses" target="_blank"> license policy</a>. 
 Additional licenses can be found in the <code>licenses</code> sub-directory of your I2P installation.</p>
--- a/apps/routerconsole/jsp/help-sidebar.jsi
+++ b/apps/routerconsole/jsp/help-sidebar.jsi
@ -1,7 +1,7 @@
-<h2>Summary Bar Information</h2>
+<h2>Sidebar Information</h2>
-<p>Many of the stats on the summary bar may be <a href="configstats">configured</a> to be <a href="graphs">graphed</a> for further analysis. 
+<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 Summary Bar and their positioning on the <a href="configsidebar">Summary Bar Configuration page</a>.
+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>
@ -12,14 +12,6 @@ You may also customize the sections that appear on the Summary Bar and their pos
 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>
 <li>
 <b>Version:</b>
 The version of the I2P software you are running. 
 If a new version is available, you will be notified in the Summary Bar. 
 It is recommended to keep your router up to date to ensure optimal performance and security. 
 Router updates are usually made available on average every 2-3 months.
 </li>
 <li>
 <b>Clock Skew:</b>
 The skew (offset) of your computer's clock relative to the network-synced time (if known). 
@ -27,26 +19,8 @@ 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 Summary Bar on the <a href="configsidebar">Summary Bar Configuration page</a>.
+You may add this section to your Sidebar on the <a href="configsidebar">Sidebar Configuration page</a>.
 </li>
 <li>
 <b>Memory:</b>
 This indicates the amount of RAM I2P is using, and the total amount available, allocated by Java. 
 The usage will likely vary considerably within a short timeframe, but if the usage is consistently high relative to the available RAM, this may indicate that you need to increase the ram allocated to the JVM. 
 You can allocate more RAM by editing your <code>wrapper.config</code> file which is normally located in the I2P application directory. 
 You will need to edit the <code>wrapper.java.maxmemory</code> parameter, which by default is set to 128(MB). 
 <b>Note:</b> Memory usage is only displayed in the "Router Information (advanced)" section or on the "Memory Usage Bar", both of which may be added to your Summary Bar on the <a href="configsidebar">Summary Bar Configuration page</a>.
 </li>
 <%
 /*
 <li>
 <b>Reachability:</b>
 The router's view of whether it can be contacted by other routers. See <a href="#confignet">below</a> for more information.</li>
 */
 %>
 </ul>
 <h3>Peers</h3>
@ -85,8 +59,6 @@ I2P does not require a router to know every other router in the network.
 </li>
 </ul>
 <h3>Bandwidth In/Out</h3>
 <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>. 
@ -95,74 +67,3 @@ If you are unsure of your network's speed, using a service such as <a href="http
 Your upstream share amount (KBps Out) will determine your overall contribution to the network. 
 Bandwidth is <a href="graphs">graphed</a> by default.</p>
 <h3>Local Destinations</h3>
 <p>These are the local services provided by your router. 
 They may be clients started through the <a href="i2ptunnelmgr">Tunnel Manager</a> or external programs connecting through SAM, BOB, or directly to I2CP. 
 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)". 
 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. 
 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 in the Tunnel Manager, after which you will need to restart the client service from the <a href="i2ptunnelmgr">main Tunnel Manager page</a>.</p>
 <h3>Tunnels</h3>
 <p>The actual tunnels are shown on the <a href="tunnels">Tunnels page</a>.</p>
 <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.
 </li>
 <li>
 <b>Client:</b> 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>.
 </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.
 </li>
 </ul>
 <h3>Congestion</h3>
 <p><b>Note:</b> This section is not enabled by default. 
 You may enable it on the <a href="configsidebar">Summary Bar Configuration page</a>.</p>
 <p>Some basic indications of router overload:</p>
 <ul>
 <li>
 <b>Job Lag:</b> How long jobs are waiting before execution. 
 The job queue is listed on the <a href="jobs">Jobs page</a>. 
 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>Tunnel lag:</b> This is the round trip time for a tunnel test, which sends a single message out a client tunnel and in an exploratory tunnel, or vice versa. It should usually be less than 5 seconds. If it is consistently higher than that, your computer is very slow, or you should adjust your bandwidth limits, or there are network problems. Problems may be indicated on the <a href="logs">Logs page</a>. <a href="configstats#tunnel.testSuccessTime">[Enable graphing]</a> (tunnel.testSuccessTime).
 </li>
 <li>
 <b>Handle backlog:</b> This is the number of pending requests from other routers to build a participating tunnel through your router. It should usually be close to zero. If it is consistently high, your computer is too slow, and you should reduce your share bandwidth limits.</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.
 </li>
 </ul>
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@ -18,30 +18,14 @@
 <div class="confignav">
 <span class="tab"><a href="#sidebarhelp">Sidebar</a></span>
 <span class="tab"><a href="#configurationhelp">Configuration</a></span>
 <span class="tab"><a href="#reachabilityhelp">Reachability</a></span>
 <span class="tab"><a href="#advancedsettings">Advanced Settings</a></span>
 <span class="tab"><a href="#faq">FAQ</a></span>
-<span class="tab"><a href="#legal">Legal</a></span>
+<span class="tab"><a href="/viewlicense">Legal</a></span>
-<span class="tab"><a href="#changelog">Change Log</a></span>
+<span class="tab"><a href="/viewhistory">Change Log</a></span>
 </div>
 <div id="volunteer"><%@include file="help.jsi" %></div>
 <div id="sidebarhelp"><%@include file="help-sidebar.jsi" %></div>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div>
 <div id="faq"><%@include file="help-faq.jsi" %></div>
 <div id="legal"><%@include file="help-legal.jsi" %></div>
 <div id="changelog">
 <h2>Change Log</h2>
 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
 <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
 <jsp:setProperty name="contenthelper" property="maxLines" value="512" />
 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
 <jsp:getProperty name="contenthelper" property="textContent" />
 <p id="fullhistory"><a href="/history.txt" target="_blank">View the full change log</a></p>
 </div>
 </div></body></html>
--- a/apps/routerconsole/jsp/help_ar.jsp
+++ b/apps/routerconsole/jsp/help_ar.jsp
@ -1,206 +0,0 @@
 <%@page contentType="text/html"%>
 <%@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 مساعدة لوحة التحكم</title>
 <%@include file="css.jsi" %>
 <script src="/js/ajax.js" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1>I2P مساعدة لوحة التحكم</h1>
 <div class="main" id="help" dir="rtl" lang="ar">
 <div class="confignav">
 <span class="tab"><a href="#sidebarhelp">Sidebar</a></span>
 <span class="tab"><a href="#configurationhelp">Configuration</a></span>
 <span class="tab"><a href="#reachabilityhelp">Reachability</a></span>
 <span class="tab"><a href="#advancedsettings">Advanced Settings</a></span>
 <span class="tab"><a href="#faq">FAQ</a></span>
 <span class="tab"><a href="#legal">Legal</a></span>
 <span class="tab"><a href="#changelog">Change Log</a></span>
 </div>
 <div id="volunteer">
 <h2>مساعدة إضافية</h2>
 <p>اذا رغبت في المساعدة أو ترجمة الوثائق، أو المساعدة في أشياء أخرى، انظر اسفله <a href="http://i2p-projekt.i2p/ar/get-involved">تطوع</a></p>
 <p>المزيد من المساعدة هنا:</p>
 <ul class="links">
 <li><a href="http://i2p-projekt.i2p/ar/faq">ابئلة شائعة i2p-projekt.i2p</a></li>
 <li>او بالدردشة على IRC.</li></ul>
 </div>
 <div id="sidebarhelp">
 <h2>شريط المعلومات</h2><p>
 يمكن للاحصائات أن
 <a href="configstats.jsp">تتغير</a> لكي تظهر على شكل
 <a href="graphs.jsp">رسم بياني</a> للمزيد من التحاليل
 </p><h3>عام</h3><ul>
 <li><b>:هوية</b>
 الحروف الأولى (24 bits) من 44-حرف (256-) Base64 hash.
 The full hash is shown on your <a href="netdb.jsp?r=.">صفحة معلومات الموجه</a>.
 هذا لا يكشف عن عنوان  IP الخاص بك لأحد.</li>
 <li><b>الاصدار</b>
 اصدار I2P المستعمل</li>
 <li><b>الآن</b>
 الوقت الحالي (UTC)والانحراف الممكن. يحتاج I2P الى ساعة مضبوطة. اذا كان انحراف الساعة اكثر من بضع ثواني، قم بتصحيح الخلل.</li>
 <li><b>إمكانية الوصول</b>
 امكانية الاتصال الخارجي بالموجه
 المزيد من التفاصيل في  <a href="confignet#help">صفحة الاعدادات</a>.</li>
 </ul><h3>النظائر</h3><ul>
 <li><b>مفعل</b>
 هذا هو عدد النظائر التي تم إرسال أو تلقيها رسالة  في الدقائق القليلة الماضية.
 قد يكون هذا النطاق 8-10 الى عدة مئات، اعتمادا على عرض النطاق الترددي الإجمالي ،
 تقاسم عرض النطاق الترددي ، وحركة المرور المولدة محليا.
 والرقم الثاني هو عدد من نظرائه ينظر في آخر ساعة أو نحو ذلك.
 لا تشعر بالقلق إذا كانت هذه الأرقام تختلف على نطاق واسع.
 <a href="configstats.jsp#router.activePeers">[تفعيل الرسم البياني]</a>.</li>
 <li><b>سريع</b>
 هذا هو عدد النظائر التي تستعملها لانشاء أنفاق جديدة. هي في نطاق 8-30. النظائر السريعة في 
 <a href="profiles.jsp">صفحة البروفايل</a>.
 <a href="configstats.jsp#router.fastPeers">[تفعيل الرسم البياني]</a>.</li>
 <li><b>قدرة عالية</b>
 هذا هو عدد النظائر التي تستعملها لانشاء أنفاق الاكتشاف. هي في نطاق 8-75. النظائر السريعة. النظائر القدرة عالية تظهر هنا.
 <a href="profiles.jsp">صفحة البروفايل</a>.
 <a href="configstats.jsp#router.highCapacityPeers">[تفعيل الرسم البياني]</a>.</li>
 <li><b>المندمجة جيدا</b>
 هذا هو عدد النظائر المستعملة في الاتصال بقاعدة البيانات. النظائر المندمجة جيدا موجودة في أسفل
 <a href="profiles.jsp">صفحة البروفايل</a>.</li>
 <li><b>المعروفة</b>
 هذا هو عدد الموجهات المعروفة.
 والظاهرة في صفحة <a href="netdb.jsp">قاعدة البيانات</a>
 هي مابين 100 الى 1000 او أكثر.
 هذا العدد ليس حجم الاجمالي للشبكة، 
 يمكنه ان بتغيير حسب سرعة الاتصال.
 </li>
 </ul>
 <h3>سرعة الاتصال الداخلي/خارجي</h3>
 <p>السرعة ب بايت في الثانية
 غير السرعة في <a href="confignet#help">صفحة الاعدادات</a>.
 السرعة <a href="graphs.jsp">مرسومة</a> </p>
 <h3>الوجهات الداخلية</h3>
 <p>الاتصالات الداخلية  البرامج المحلية المتصلة عبر الموجه <a href="i2ptunnel/index.jsp">I2PTunnel</a></p>
 <p>او برامج خارجية متصلة SAM, BOB, او مباشرة بـ I2CP.</p>
 <h3>الأنفاق الداخلة/خارجة</h3>
 <p>الأنفاق الحالية موجودة في <a href="tunnels.jsp">صفحة الأنفاق</a>.</p><ul>
 <li><b>تصفح</b>
 الأنفاق المستخدمة من طرف الموجه تستعمل في الاتصال مع النظائر، انشاء انفاق جديدة.
 </li>
 <li><b>المستخدمين</b>
 الأنفاق المستخدمة من طرف الموجه </li>
 <li><b>المشاركة</b>
 الأنفاق المنشئة من طرف موجهات أخرى عبر موجهك.
 هذا ينبني على درجة استخدام الشبكة، مقدار المشاركة...
 يمكنك تغيير درجة المشاركة بـ <a href="confignet#help">صفحة الاعدادات</a>.
 You may also limit the total number by setting <tt>router.maxParticipatingTunnels=nnn</tt> on
 the <a href="configadvanced.jsp">صفحة الاعدادات المتقدمة</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[تفعيل الرسم البياني]</a>.</li>
 <li><b>نسبة المشاركة</b>
 عدد الانفاق المشاركة، مقسوما على عدد اجمالي الانفاق.
 عدد أكبر من 1.00 يعني انك تساهم في الشبكة بعدد اكبر مما تستهلك.</li>
 </ul>
 <h3>ازدحام</h3>
 <p>بعض مشرات ازدحام الموجه</p>
 <ul>
 <li><b>Job lag:</b>
 How long jobs are waiting before execution. The job queue is listed on the <a href="jobs.jsp">jobs page</a>.
 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, or the
 router has serious problems.
 <a href="configstats.jsp#jobQueue.jobLag">[تفعيل الرسم البياني]</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.jsp#transport.sendProcessingTime">[تفعيل الرسم البياني]</a> (transport.sendProcessingTime).</li>
 <li><b>Tunnel lag:</b>
 This is the round trip time for a tunnel test, which sends a single message
 out a client tunnel and in an exploratory tunnel, or vice versa.
 It should usually be less than 5 seconds.
 If it is consistently higher than that, your computer is very slow,
 or you should adjust your bandwidth limits, or there are network problems.
 <a href="configstats.jsp#tunnel.testSuccessTime">[تفعيل الرسم البياني]</a> (tunnel.testSuccessTime).</li>
 <li><b>Handle backlog:</b>
 This is the number of pending requests from other routers to build a
 participating tunnel through your router.
 It should usually be close to zero.
 If it is consistently high, your computer is too slow,
 and you should reduce your share bandwidth limits.</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.</li></ul>
 </div>
 <% /* untranslated */ %>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
 <div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 <div id="legal">
 <h2>Legal stuff</h2><p>The I2P router (router.jar) and SDK (i2p.jar) are almost entirely public domain, with
 a few notable exceptions:</p><ul>
 <li>ElGamal and DSA code, under the BSD license, written by TheCrypto</li>
 <li>SHA256 and HMAC-SHA256, under the MIT license, written by the Legion of the Bouncycastle</li>
 <li>AES code, under the Cryptix (MIT) license, written by the Cryptix team</li>
 <li>SNTP code, under the BSD license, written by Adam Buckley</li>
 <li>The rest is outright public domain, written by jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, and others.</li>
 </ul>
 <p>On top of the I2P router are a series of client applications, each with their own set of
 licenses and dependencies.  This webpage is being served as part of the I2P routerconsole
 client application, which is built off a trimmed down <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a>
 instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration),
 allowing you to deploy standard JSP/Servlet web applications into your router.  Jetty in turn makes use of
 Apache's javax.servlet (javax.servlet.jar) implementation.
 This product includes software developed by the Apache Software Foundation
 (http://www.apache.org/).</p>
 <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
 lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).  There is also a
 web-based mail client <a href="/susimail/">available</a> on
 the console, which is a GPL'ed application written by susi23.  The addressbook application, written by
 <a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
 more information).</p>
 <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.
 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.  
 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
 details on other applications available, as well as their licenses, please see the
 <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/ar/download">download page</a>.
 .</p>
 </div>
 <div id="changelog">
 <h2>Change Log</h2>
 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
 <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
 <jsp:setProperty name="contenthelper" property="maxLines" value="512" />
 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
 <jsp:getProperty name="contenthelper" property="textContent" />
 <p id="fullhistory"><a href="/history.txt">View the full change log</a></p>
 </div>
 </div></body></html>
--- a/apps/routerconsole/jsp/help_fr.jsp
+++ b/apps/routerconsole/jsp/help_fr.jsp
@ -1,189 +0,0 @@
 <%@page contentType="text/html"%>
 <%@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>Console du routeur I2P - Aide</title>
 <%@include file="css.jsi" %>
 <script src="/js/ajax.js" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <!-- Traduction de mars 2011 (magma@mail.i2p) -->
 <h1>Aide et assistance du routeur I2P</h1>
 <div class="main" id="help">
 <div class="confignav">
 <span class="tab"><a href="#sidebarhelp">Barre latérale</a></span>
 <span class="tab"><a href="#configurationhelp">Configuration</a></span>
 <span class="tab"><a href="#reachabilityhelp">Joignabilité</a></span>
 <span class="tab"><a href="#advancedsettings">Réglages avancés</a></span>
 <span class="tab"><a href="#faq">FAQ</a></span>
 <span class="tab"><a href="#legal">Légal</a></span>
 <span class="tab"><a href="#changelog">Historique</a></span>
 </div>
 <div id="volunteer">
 <h2>Assistance Supplémentaire</h2>
 <p>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/fr/get-involved">volontaires</a>.
 </p>D'autres détails sont disponibles ici:
 <ul class="links">
 <li><a href="http://i2p-projekt.i2p/en/faq">FAQ en anglais sur i2p-projekt.i2p</a></li>
 <li><a href="http://i2p-projekt.i2p/fr/faq">les FAQ en français</a>.</li>
 </ul><br>
 </div>
 <div id="sidebarhelp">
 <h2>Informations du panneau de surveillance</h2><p>
 Plusieurs des statistiques affichées dans le panneau de surveillance peuvent être 
 <a href="configstats.jsp">configurées</a> pour être affichées sous forme de <a href="graphs.jsp">graphiques</a> pour 
 analyse sur la durée.
 </p><h3>GÉNÉRAL</h3><ul>
 <li><b>Identité locale:</b>
 Cliquez sur "Afficher" pour voir l'empreinte Base64 à 44 caractères (256 bits) de votre routeur. Le hachage 
 complet est affiché sur votre <a href="netdb.jsp?r=.">page d'infos routeur</a>. Ne la divulguez jamais à personne, 
 car l'info routeur contient votre adresse IP.</li>
 <li><b>Version:</b>
 La version d'I2P qui vous affiche actuellement cette page.</li>
 <li><b>Lancé depuis:</b>
 Indique depuis combien de temps le routeur tourne.</li>
 <li><b>Réseau:</b>
 Statut de joignabilité du routeur par les autres routeurs.
 Plus d'infos sur la page de <a href="confignet#help">configuration</a>.
 </li></ul><h3>Pairs</h3><ul>
 <li><b>Actifs:</b>
 le premier nombre est celui des routeurs avec qui le votre a communiqué dans les dernières minutes. Ça peut varier de 
 8-10 à plusieurs centaines, selon votre bande passante et son rapport de partage, et le trafic généré localement. Le 
 second est celui des pairs vus dans les dernières heures. Ces nombres penvent varier sensiblement sans conséquence.
 <a href="configstats.jsp#router.activePeers">[Activer le graphique]</a></li>
 <li><b>Rapides:</b>
 le nombre de pairs que vous mettez à contribution pour construire vos tunnels clients. En général dans une tranche de 
 8 à 30. Vos pairs rapides sont détaillés sur la page <a href="profiles.jsp">profils</a>.
 <a href="configstats.jsp#router.fastPeers">[Activer le graphique]</a>.</li>
 <li><b>Hautes capacités:</b>
 nombre des pairs que vous utilisez pour construire quelques uns de vos tunnels exploratoires. Habituellement de 8 à 75. 
 Les pairs rapides font partie du groupe des "Hautes capacités". Vos pairs à hautes capacités sont aussi listés sur 
 la page <a href="profiles.jsp">profils</a>.
 <a href="configstats.jsp#router.highCapacityPeers">[Activer le graphique]</a></li>
 <li><b>Bien intégrés:</b>
 vous utilisez ce groupe pour vos requêtes à la base de données du réseau. Ils sont souvent des pairs de remplissage par 
 diffusion ("floodfill"). Vos pairs "bien intégrés" sont affichés en bas de la même page 
 <a href="profiles.jsp">profils</a>.</li>
 <li><b>Connus:</b> c'est tous les routeurs dont vous connaissez l'existance. Il sont listés sur la
 page <a href="netdb.jsp">base de données du réseau</a>. De moins de 100 à 1000 ou plus. Ce nombre ne représente pas la 
 taille totale du réseau; il varie en fonction de votre bande passante totale et son rapport de partage, et du trafic 
 local. I2P n'a pas besoin que chaque routeur connaisse tous les autres.
 </li></ul><h3>Bande passante entrée/sortie</h3>
 <p>Ça parle tout seul. Toutes les valeurs sont en octets par seconde (o/s), pas en bits par seconde (b/s). Modifiez vos 
 limites de bande passante sur la page de <a href="confignet#help">configuration</a>.
 Le <a href="graphs.jsp">graphique de bande passante</a> est activé par défaut.</p>
 <h3>Destinations locales</h3>
 <p>C'est le nom I2P des applications qui se connectent par votre routeur. Elles peuvent être des clients lancés depuis 
 <a href="i2ptunnel/index.jsp">I2PTunnel</a> ou des programmes tiers qui se connectent via SAM, BOB ou directement à 
 I2CP.</p>
 <h3>TUNNELS:</h3>
 <p>Les tunnels actuels sont affichés sur la page <a href="tunnels.jsp">tunnels</a>.</p>
 <ul>
 <li><b>Exploratoires:</b> tunnels créés par votre routeur et utilisés avec les
 pairs diffuseurs pour la création des nouveaux tunnels et le test des tunnels existants.</li>
 <li><b>Clients:</b> tunnels créés par votre routeur pour chaque utilisation cliente.</li>
 <li><b>Participants:</b> les tunnels créés par d'autres routeurs et qui passent par le votre. Leur
 nombre dépend largement de la demande du réseau, de votre part de bande passante partagée, et du trafic local. 
 La méthode recommandée pour limiter leur nombre est de diminuer le rapport de bande passante partagée dans la 
 <a href="confignet#help">configuration</a>. Vous pouvez également limiter ce nombre en définissant la variable 
 <tt>router.maxParticipatingTunnels=nnn</tt> dans la <a href="configadvanced.jsp">configuration avancée</a>. 
 <a href="configstats.jsp#tunnel.participatingTunnels">[Activer le graphique]</a>.</li>
 <li><b>Rapport de partage:</b> le nombre de tunnels participants que vous routez pour les autres,
 divisé par le nombre total de sauts dans tous vos tunnels exploratoires et clients. S'il est supérieur à 1, cela 
 signifie que vous contribuez à plus de tunnels que vous n'en utilisez.
 </li>
 </ul>
 <h3>ENCOMBREMENT</h3>
 <p>Indications de base sur la charge du routeur:</p>
 <ul>
 <li><b>Retard de tâches:</b> temps d'attente des tâches avant exécution. La file d'attente est
 présentée la pages des <a href="jobs.jsp">tâches</a>. Malheureusement, il y a dans le routeur plusieurs autres files 
 d'attentes qui ne peuvent être affichées dans la console. Le retard de tâches devrait rester à zéro en permamence. s'il 
 régulièrement supérieur à 500ms, soit votre PC est très lent, soit le routeur a de sérieux problèmes.
 <a href="configstats.jsp#jobQueue.jobLag">[Activer le graphique]</a>.</li>
 <li><b>Retard de messages:</b> temps de rétention des messages en file d'attente d'envois, normalement
 quelques centaines de ms ou moins. Au dessus d'une seconde, votre PC est très lent, vous devriez fignoler vos réglages 
 de bande passante, ou vos clients (bittorrent, iMule...?) envoient trop de données et il faudrait voir à leur tenir 
 la bride. <a href="configstats.jsp#transport.sendProcessingTime">[Activer le graphique]</a> 
 (transport.sendProcessingTime).</li>
 <li><b>Retard de tunnels:</b> le temps d'aller-retour pour un test de tunnel (envoi d'un seul message
 par un tunnel client et dans un tunnel exploratoire ou vice versa. Normalement inférieur à 5s. Si c'est constamment 
 supérieur, votre PC est très lent, vous devriez retoucher vos limites de bande passante, ou il y a un problème réseau.
 <a href="configstats.jsp#tunnel.testSuccessTime">[Activer le graphique]</a> (tunnel.testSuccessTime).</li>
 <li><b>En attente:</b> nombre de requêtes de création de tunnels participants en attente provenant
 d'autres routeurs. Normalement proche de zéro. Sinon, votre ordinateur est trop lent et vous devriez diminuer votre 
 limite de bande passante partagée.</li>
 <li><b>Accepte/Refuse:</b> c'est le statut de votre routeur au regard de son comportement vis à vis
 des demandes de création de tunnels participants provenant d'autres routeurs. Votre routeur peut accepter ou refuser 
 tout ou partie des requêtes, ou les refuser en totalité pour des raisons prévues telles que le contrôle de la bande 
 passante et des ressources CPU en vue de préserver les performances des clients locaux.</li></ul>
 </div>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
 <div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 <div id="legal">
 <h2>Informations légales</h2><p>Le routeur I2P (router.jar) et le SDK (i2p.jar) sont presque entièrement dans le 
 domaine public, à quelques notobles exceptions près:</p><ul>
 <li>Le code ElGamal et DSA, sous licence BSD, écrits par TheCrypto</li>
 <li>SHA256 et HMAC-SHA256, sous licence MIT, écrits par the Legion of the Bouncycastle</li>
 <li>Le code AES, sous licence Cryptix (MIT), écrit pas l'équipe the Cryptix</li>
 <li>Le code SNTP, sous licence BSD, écrit par Adam Buckley</li>
 <li>Le reste, directement issu du domaine public, est écrit par jrandom, mihi, hypercubus, oOo,
    ugha, duck, shendaras, et d'autres.</li>
 </ul>
 <p>Au-dessus du routeur I2P on a une série d'applications clientes, ayant chacune ses particularités en termes de 
 licences et de dépendances. Cette page est affichée en tant qu'élément de l'application cliente console du routeur I2P, 
 qui est une version allégée d'une instance <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a> (allégée en 
 ce que nous n'avons pas inclus les applications de démo et autres compléments, et que nous avons simplifié la 
 configuration), vous permettant de déployer dans votre routeur des applications web JSP/Servlet standards. De son côté 
 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>
 <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 
 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="/susimail/">disponible</a> dans la console, qui est sous 
 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>
 <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 
 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
 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 
 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 
 <a href="http://i2p-projekt.i2p/fr/download">téléchargements</a>.
 .</p>
 </div>
 <div id="changelog">
 <h2>Historique des évolutions</h2>
 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
 <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
 <jsp:setProperty name="contenthelper" property="maxLines" value="512" />
 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
 <jsp:getProperty name="contenthelper" property="textContent" />
 <p id="fullhistory"><a href="/history.txt" target="_blank">Historique complet</a>
 </p>
 </div>
 </div></body></html>
--- a/apps/routerconsole/jsp/help_nl.jsp
+++ b/apps/routerconsole/jsp/help_nl.jsp
@ -1,229 +0,0 @@
 <%@page contentType="text/html"%>
 <%@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>
 <%@include file="css.jsi" %>
 <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>
 <div class="main" id="help">
 <div class="confignav">
 <span class="tab"><a href="#sidebarhelp">Summary Bar</a></span>
 <span class="tab"><a href="#configurationhelp">Configuratie</a></span>
 <span class="tab"><a href="#reachabilityhelp">Bereikbaarheid</a></span>
 <span class="tab"><a href="#advancedsettings">Geavanceerde Instellingen</a></span>
 <span class="tab"><a href="#faq">FAQ</a></span>
 <span class="tab"><a href="#legal">Juridische</a></span>
 <span class="tab"><a href="#changelog">Geschiedenis</a></span>
 </div>
 <div id="volunteer">
 <h2>Verdere Assistentie</h2>
 <p>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 
 <a href="http://i2p-projekt.i2p/nl/get-involved">vrijwilligers.</a>
 </p><p>Verdere ondersteuning is hier beschikbaar:</p>
 <ul class="links">
 <li><a href="http://i2p-projekt.i2p/nl/faq">FAQ op i2p-projekt.i2p</a></li>
 </ul><br>
 </div>
 <div id="sidebarhelp">
 <h2>Informatie over de Summary Bar</h2><p>
 Veel van de statistieken op de summary bar kunnen
 <a href="configstats.jsp">geconfigureerd</a> worden om te worden
 <a href="graphs.jsp">geplot</a> voor verdere analyse.
 </p>
 <h3>Algemeen</h3><ul>
 <li><b>Lokale Identiteit:</b>
 De eerste vier karakters (24 bits) van je 44-karakter (256-bit) Base64 router hash.
 De volledige hash is getoond op je <a href="netdb.jsp?r=.">router info pagina</a>.
 Vertel deze aan niemand, want de router info bevat je IP.</li>
 <li><b>Versie:</b>
 De versie van de I2P software die je nu gebruikt.</li>
 <li><b>Uptime:</b>
 Hoe lang je I2P router al draait.</li>
 <li><b>Netwerk Bereikbaarheid:</b>
 De bereikbaarheid van je router door andere routers.
 Meer informatie is te vinden op de <a href="confignet#help">configuratie pagina</a>.</li>
 </ul>
 <h3>Peers</h3><ul>
 <li><b>Actief:</b>
 Het eerste nummer is het aantal peers waar je in de laatste paar minuten
 berichten naar verzonden of van ontvangen hebt.  Dit kan vari&euml;ren van 8-10 tot
 een paar honderd, afhankelijk van je totale bandbreedte, gedeelde bandbreedte
 en lokaal gegenereerd verkeer.  Het tweede nummer is het aantal peers dat je in
 het laatste uur hebt gezien.  Wees niet ongerust wanneer deze aantallen erg
 vari&euml;ren.
 <a href="configstats.jsp#router.activePeers">[Grafieken inschakelen]</a>.</li>
 <li><b>Snel:</b>
 Dit is het aantal peers dat je gebruikt om client tunnels mee te bouwen. Het ligt over
 het algemeen tussen 8 en 30.
 Je snelle peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
 <a href="configstats.jsp#router.fastPeers">[Grafieken inschakelen]</a>.</li>
 <li><b>Grote capaciteit:</b>
 Dit is het aantal peers dat je gebruikt om sommige van de onderzoekende tunnels mee te maken.
 Het ligt over het algemeen tussen de 8 en 75. De snelle peers zijn inbegrepen in de categorie grote capaciteit.
 De grote capaciteits peers worden getoond op de <a href="profiles.jsp">profielen pagina</a>.
 <a href="configstats.jsp#router.highCapacityPeers">[Grafieken inschakelen]</a>.</li>
 <li><b>Ge&iuml;ntegreerd:</b>
 Dit is het aantal peers dat je gebruikt bij het opzoeken in de network database.
 Dit zijn gebruikelijk de "floodfill" peers.
 Je goed ge&iuml;ntegreerde peers worden getoond aan de onderkant van de <a href="profiles.jsp">profielen pagina</a>.</li>
 <li><b>Bekend:</b>
 Dit is het aantal routers dat bekend is bij je router.
 Ze worden getoond op de <a href="netdb.jsp">netwerk database pagina</a>.
 Dit kan liggen tussen onder de 100 en 1000 of meer.
 Dit aantal is niet de totale grootte van het netwerk;
 het kan erg vari&euml;ren afhankelijk van je totale bandbreedte,
 gedeelde bandbreedte en lokaal gegenereerd verkeer.
 Voor I2P is het niet nodig dat een router alle andere routers kent.
 </li></ul>
 <h3>Bandbreedte in/out</h3>
 <p>Dit zou zichzelf moeten verklaren. Alle waarden zijn in bytes per seconde, niet in bits per seconde.
 Wijzig je bandbreedte limieten op de <a href="confignet#help">configuratie pagina</a>.
 Bandbreedte wordt standaard <a href="graphs.jsp">geplot</a>.</p>
 <h3>Tunnels</h3>
 <p>De tunnels zelf worden getoond op de <a href="tunnels.jsp">tunnels pagina</a>.</p>
 <ul>
 <li><b>Onderzoekend:</b>
 Tunnels gebouwd door je router en gebruikt om te communiceren met de floodfill peers,
 voor het bouwen van nieuwe tunnels en testen van bestaande tunnels.</li>
 <li><b>Client:</b>
 Tunnels gebouwd door je router voor het gebruik door elke client.</li>
 <li><b>Deelnemend:</b>
 Tunnels gebouwd door andere routers die door je eigen router heen lopen.
 Dit kan erg vari&euml;ren afhankelijk van de vraag vanuit het netwerk,
 je gedeelde bandbreedte en hoeveelheid lokaal gegenereerd verkeer.
 De aanbevolen methode om het aantal deelnemende tunnels te beperken
 is door het share percentage te wijzigen op de <a href="confignet#help">configuratie pagina</a>.
 Je kan het totale aantal ook beperken met de instelling <tt>router.maxParticipatingTunnels=nnn</tt> op
 de <a href="configadvanced.jsp">geavanceerde configuratie pagina</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Grafieken inschakelen]</a>.</li>
 <li><b>Share rato:</b>
 Het aantal deelnemende tunnels dat je voor andere routeert, gedeeld door het totale aantal hops in al je onderzoekende en client tunnels.
 Een aantal groter dan 1.00 betekent dat je meer tunnels aan het netwerk bijdraagt dan je gebruikt.
 </li>
 </ul>
 <h3>Verstopping</h3>
 <p>Een aantal basis indicatoren voor een router overbelasting:</p>
 <ul>
 <li><b>Taak vertraging:</b>
 Hoe lang taken moeten wachten voordat ze uitgevoerd worden. De taak wachtrij wordt getoond op de <a href="jobs.jsp">taken pagina</a>.
 Helaas zijn er ook verschillende andere taak wachtrijen in de router die verstopt kunnen raken,
 hun status is niet beschikbaar in de router console.
 De taak vertraging zou over het algemeen nul moeten zijn.
 Indien dit consequent hoger is dan 500ms, dan is of je computer erg traag of
 heeft de router een serieus probleem.
 <a href="configstats.jsp#jobQueue.jobLag">[Grafieken inschakelen]</a>.</li>
 <li><b>Bericht vertraging:</b>
 Hoe lang een uitgaand bericht wacht in de wachtrij.
 Dit zou over het algemeen een aantal honderd milliseconden of minder moeten zijn.
 Indien dit consequent hoger is dan 1000ms, dan is of je computer erg traag
 of moet je je bandbreedte instellingen aanpassen, of je (bittorrent?) clients
 versturen mogelijk teveel data en moeten hun transmissie bandbreedte beperkt hebben.
 <a href="configstats.jsp#transport.sendProcessingTime">[Grafieken inschakelen]</a> (transport.sendProcessingTime).</li>
 <li><b>Tunnel vertraging:</b>
 Dit is de rondgangstijd voor een tunnel test, welke een enkel bericht verstuurt
 vanuit een client tunnel dat dan bij een onderzoekende tunnel naar binnen gaat, of omgekeerd.
 Dit zou over het algemeen minder dan 5 seconden moeten zijn.
 Indien dit consequent hoger is, dan is of je computer erg traag of
 moet je je bandbreedte instellingen aanpassen of zijn er netwerk problemen.
 <a href="configstats.jsp#tunnel.testSuccessTime">[Grafieken inschakelen]</a> (tunnel.testSuccessTime).</li>
 <li><b>Achterstand:</b>
 Dit is het aantal wachtende aanvragen van andere routers om een deelnemende
 tunnel door je eigen router te bouwen.
 Dit zou over het algemeen dicht bij de nul moeten zijn.
 Indien dit consequent hoog is, dan is of je computer te traag of
 moet je je bandbreedte instellingen aanpassen.</li>
 <li><b>Accepteren / Weigeren:</b>
 De status van de router voor het accepteren of weigeren
 van verzoeken van andere routers om een deelnemende tunnel door je router te bouwen.
 Je router kan alle aanvragen accepteren, een percentage accepteren of weigeren,
 of alle aanvragen weigeren om verschillende redenen, om de bandbreedte en CPU
 gebruik te beheren en capaciteit te houden voor lokale clients.</li></ul>
 <h3>Lokale bestemmingen</h3>
 <p>De lokale applicaties die door je router verbinden. 
 Dit kunnen clients zijn die gestart zijn door <a href="i2ptunnel/index.jsp">I2PTunnel</a>
 of externe programma's die verbinden via SAM, BOB of direct met I2CP.</p>
 </div>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
 <div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 <div id="legal">
 <h2>Juridische zaken</h2>
 <p>De I2P router (router.jar) en SDK (i2p.jar) zijn bijna geheel in het publieke domein, met een aantal noemenswaardige uitzonderingen:</p>
 <ul>
 <li>ElGamal en DSA code, valt onder de BSD licentie, geschreven door TheCrypto</li>
 <li>SHA256 en HMAC-SHA256, valt onder de MIT licentie, geschreven door the Legion of the Bouncycastle</li>
 <li>AES code, valt onder de MIT licentie, geschreven door het Cryptix team</li>
 <li>SNTP code, valt onder de BSD licentie, geschreven door Adam Buckley</li>
 <li>De rest is helemaal public domain, geschreven door jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, en anderen.</li>
 </ul>
 <p>Bovenop de I2P router zijn een aantal client applicaties gemaakt, elk met
 hun eigen set aan licenties en afhankelijkheden.  Deze webpagine is aangeboden
 als onderdeel van de I2P routerconsole client applicatie, gebouwd op basis van
 een afgeslankte <a href="http://jetty.mortbay.com/jetty/index.html">Jetty</a>
 instantie (afgeslankt, als in, we voegen geen demo applicaties of andere add-ons bij,
 en hebben de configuratie eenvoudiger gemaakt),
 welke je standaard JSP/Servlet web applicaties laat deployen in je router.
 Jetty maakt gebruik van Apache's javax.servlet (javax.servlet.jar) implementatie.
 Dit product bevat software ontwikkeld door de Apache Software Foundation
 (http://www.apache.org/).</p>
 <p>Een andere applicatie op deze webpagina is <a
 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
 die normaal TCP/IP verkeer over I2P laat tunnelen (zoals de eepproxy en de irc
 proxy). Er is ook een web based mail
 client <a href="/susimail/">beschikbaar</a> op de console, dit is een
 GPL applicatie geschreven door susi23. De adresboek applicatie, geschreven door
 <a href="http://ragnarok.i2p/">Ragnarok</a> helpt je met het beheren van je
 hosts.txt bestanden (zie ./addressbook/ voor meer informatie).</p>
 <p>De router bevat ook standaard human's public domain <a
 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.
 Er is ook een geoptimaliseerde library voor het uitvoeren van berekeningen met
 grote getallen - jbigi - deze gebruikt de LGPL licensed <a
 href="http://swox.com/gmp/">GMP</a> library, aangepast voor verschillende PC
 architecturen.  Opstarters voor windows gebruikers zijn gemaakt met <a
 href="http://launch4j.sourceforge.net/">Launch4J</a>, en de installer is
 gemaakt met <a href="http://www.izforge.com/izpack/">IzPack</a>.  Voor details
 over andere beschikbare applicaties, en hun licenties, zie het <a
 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
 href="http://i2p-projekt.i2p/nl/download">download pagina</a>.</p>
 </div>
 <div id="changelog">
 <h2>Release geschiedenis</h2>
 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
 <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
 <jsp:setProperty name="contenthelper" property="maxLines" value="512" />
 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
 <jsp:getProperty name="contenthelper" property="textContent" />
 <p id="fullhistory"><a href="/history.txt" target="_blank">Completere lijst met wijzigingen</a></p>
 </div>
 </div></body></html>
--- a/apps/routerconsole/jsp/help_ru.jsp
+++ b/apps/routerconsole/jsp/help_ru.jsp
@ -1,198 +0,0 @@
 <%@page contentType="text/html"%>
 <%@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 - справка</title>
 <%@include file="css.jsi" %>
 <script src="/js/ajax.js" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
 </head><body onload="initAjax()">
 <%@include file="summary.jsi" %>
 <h1>Справка маршрутизатора I2P</h1>
 <div class="main" id="help">
 <div class="confignav">
 <span class="tab"><a href="#sidebarhelp">Боковая панель</a></span>
 <span class="tab"><a href="#configurationhelp">Конфигурация</a></span>
 <span class="tab"><a href="#reachabilityhelp">Достижимость</a></span>
 <span class="tab"><a href="#advancedsettings">Расширенная конфигурация</a></span>
 <span class="tab"><a href="#faq">Вопросы-Ответы</a></span>
 <span class="tab"><a href="#legal">Юридический</a></span>
 <span class="tab"><a href="#changelog">История компании</a></span>
 </div>
 <div id="volunteer">
 <h2>дальнейшая помощь</h2>
 <p> Если Вы хотите помочь в улучшении или переводе документации, если у Вас есть идеи, как еще помочь проекту, пожалуйста, загляните в раздел документации 
 <a href="http://i2p-projekt.i2p/ru/get-involved">как стать участником</a>. </p>
 <p>Дальнейшие инструкции доступны в <a href="http://i2p-projekt.i2p/ru/faq">FAQ на i2p-projekt.i2p</a></p>
 </div>
 <div id="sidebarhelp">
 <h2>Описание статусной панели</h2>
 <p>
 Для большинства параметров на статусной панели можно <a href="configstats.jsp">настроить</a> построение <a href="graphs.jsp">графиков</a> в целях более подробного анализа. 
 </p>
 <h3>Общая информация</h3><ul>
 <li><b>Локальный идентификатор</b>
 Первые 4 символа (24 бита) из Вашего 44-символьного (256-битного) Base64 хеша маршрутизатора. Полный хеш показывается на странице <a href="netdb.jsp?r=.">информации о маршрутизаторе</a>. Никогда никому не показывайте хеш своего маршрутизатора, так как в нем содержится информация о Вашем IP-адресе.
 </li>
 <li><b>Версия:</b>
 Версия Вашего I2P маршрутизатора. </li>
 <li><b>Время:</b>
 Текущее время (UTC) и величина рассинхронизации времени (если есть). Для правильной работы I2P нужно точное системное время. Пожалуйста, поправьте системное время, если расхождение приближается к 1-ой минуте.
 </li>
 <li><b>Доступность:</b>
 Результат проверки Вашим маршрутизатором, насколько он открыт для входящих соединений от маршрутизаторов других пользователей. Подробнее смотрите на <a href="confignet#help">странице сетевых настроек</a>. 
 </li>
 </ul>
 <h3>Пиры</h3><ul>
 <li><b>Активные:</b>
 Первое число — это количество пиров, с которыми происходил обмен сообщениями за последние несколько минут. Значение может меняться от 8-10 до нескольких сотен в зависимости от Вашего общего трафика, доли транзитного трафика, локально создаваемого трафика. Второе число — это количество пиров, наблюдавшихся за последний час. Не волнуйтесь, если эти числа сильно меняются. Это нормально.  <a href="configstats.jsp#router.activePeers">[Включить построение графика]</a>. 
 </li>
 <li><b>Быстрые:</b>
 Количество пиров, которые используются Вашим маршрутизатором для построения клиентских туннелей. В общем случае это значение будет в диапазоне 8-30. Список быстрых пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.fastPeers">[Включить построение графика]</a>. 
 </li>
 <li><b>Высокоёмкие:</b>
 Количество пиров, которые используются Вашим маршрутизатором для построения части зондирующих туннелей. В общем случае это значение будет в диапазоне 8-75. Быстрые пиры входят в группу высокоёмких. Список высокоёмких пиров можно посмотреть на странице <a href="profiles.jsp">профили</a>. <a href="configstats.jsp#router.highCapacityPeers">[Включить построение графика]</a>. 
 </li>
 <li><b>Хорошо интегрированные:</b>
 Количество пиров, которые используются Вашим маршрутизатором для запросов к сетевой базе данных. Обычно в таком качестве выступают «floodfill» пиры. Список хорошо интегрированных пиров можно посмотреть в конце страницы <a href="profiles.jsp">профили</a>. 
 </li>
 <li><b>Известные:</b>
 Это общее количество пиров известных Вашему маршрутизатору. Их список показывается на странице <a href="netdb.jsp">обзор сетевой базы данных</a>. Это значение может варьироваться от десятков до тысяч. Значение не соответствует реальному полному размеру сети, так как маршрутизатору в сети I2P достаточно знать лишь часть других маршрутизаторов. Значение зависит от Вашего общего трафика, доли транзитного трафика, локально создаваемого трафика. 
 </li>
 </ul>
 <h3>Трафик (входящий/исходящий)</h3>
 <p>Все значения показаны в байтах/секунду. Настроить ограничения трафика можно на странице <a href="config.jsp">сетевых настроек</a>.
 Для трафика по умолчанию включено <a href="graphs.jsp">построение графиков</a>.</p>
 <h3>Локальные туннели</h3>
 <p>Локальные приложения, выходящие в I2P сеть через Ваш маршрутизатор. Это могут быть клиенты, запущенные через <a href="i2ptunnel/index.jsp">менеджер туннелей</a>, внешние программы, подключающиеся через интерфейсы SAM, BOB или напрямую через I2CP.</p>
 <h3>Туннели (входящие/исходящие)</h3>
 <p>Список туннелей можно посмотреть на странице <a href="tunnels.jsp">обзор туннелей</a>.</p>
 <ul>
 <li><b>Зондирующие:</b>
 Туннели, созданные Вашим маршрутизатором для связи с floodfill-пирами, тестирования уже существующих туннелей и построения новых.
 </li>
 <li><b>Клиентские:</b>
 Туннели, созданные Вашим маршрутизатором для каждого локального клиента.
 </li>
 <li><b>Транзитные:</b>
 Туннели, построенные другими маршрутизаторами, проходящие через Ваш маршрутизатор. Их количество может сильно варьироваться в зависимости от потребностей сети, настроенной доли транзитного трафика и объема локально создаваемого трафика. Рекомендуемый способ ограничения количества транзитных туннелей — настроить долю транзитного трафика на странице <a href="confignet#help">сетевых настроек</a>. Также можно задать точный ограничитель количества через параметр <tt>router.maxParticipatingTunnels=nnn</tt> на странице <a href="configadvanced.jsp">дополнительных настроек</a>.
 <a href="configstats.jsp#tunnel.participatingTunnels">[Включить построение графика]</a>. 
 </li>
 <li><b>Доля транзита:</b>
 Количество транзитных туннелей, проходящих через Ваш маршрутизатор, поделенное на суммарное количество хопов в Ваших зондирующих и клиентских туннелях. Значение больше 1.00 означает, что Вы предоставляете для сети больше туннелей, чем используете сами.
 </li>
 </ul>
 <h3>Занятость</h3>
 <p>Некоторые базовые индикаторы перегруженности маршрутизатора:</p>
 <ul>
 <li><b>Задержка заданий:</b>
 Как долго задания ожидают выполнения. Содержимое очереди можно посмотреть на странице <a href="jobs.jsp">очередь заданий</a>.  К сожалению, есть ещё несколько внутренних очередей, статус которых в консоли не показывается. Задержка заданий в нормальной ситуации должна быть нулевой. Если она систематически выше 500ms, то либо Ваш компьютер слишком медленный, либо с Вашим маршрутизатором проблемы. 
 <a href="configstats.jsp#jobQueue.jobLag">[Включить построение графика]</a>.
 </li>
 <li><b>Задержка сообщений:</b>
 Как долго исходящие сообщения находятся в очереди. В нормальном случае эта задержка должна быть не выше нескольких сотен миллисекунд. Если она систематически выше 1000ms, то либо Ваш компьютер слишком медленный, либо Вам следует перенастроить ограничение скорости, либо локальные клиенты (чаще всего bittorrent) посылают слишком много данных. Для таких клиентов имеет смысл ограничить скорость. 
 <a href="configstats.jsp#transport.sendProcessingTime">[Включить построение графика]</a> (transport.sendProcessingTime). 
 </li>
 <li><b>Задержка туннелей:</b>
 Время прохождения сигнала при проверке туннеля (сообщение посылается от клиентского туннеля до зондирующего или в обратном направлении). Это значение в нормальном случае должно быть ниже 5 секунд. Если оно систематически выше, то либо Ваш компьютер слишком медленный, либо Вам следует перенастроить ограничение скорости, либо с сетью что-то не в порядке.  
 <a href="configstats.jsp#tunnel.testSuccessTime">[Включить построение графика]</a> (tunnel.testSuccessTime). 
 </li>
 <li><b>Очередь запросов:</b>
 Количество пока необработанных запросов от других маршрутизаторов о построении транзитных туннелей через Ваш маршрутизатор. В нормальном случае это значение должно быть около нуля. Если оно систематически выше, то Ваш компьютер слишком медленный и Вам следует настроить меньшую долю транзитного трафика.
 </li>
 <li><b>Принимаем/Не принимаем туннели:</b>
 Состояние Вашего маршрутизатора по приему или отклонению запросов от других маршрутизаторов о построении туннелей. Ваш маршрутизатор может принимать все запросы, принимать/отклонять часть запросов или отклонять все запросы, в зависимости от сетевой загрузки, нагрузки на процессор и необходимости резервировать полосу пропускания для локальных клиентов. 
 </li>
 </ul>
 </div>
 <div id="configurationhelp"><%@include file="help-configuration.jsi" %></div>
 <div id="reachabilityhelp"><%@include file="help-reachability.jsi" %></div>
 <div id="advancedsettings"><%@include file="help-advancedsettings.jsi" %></div> <% /* untranslated */ %>
 <div id="faq"><%@include file="help-faq.jsi" %></div> <% /* untranslated */ %>
 <div id="legal">
 <h2>Лицензии</h2>
 <p>Код I2P-маршрутизатора (router.jar) и его SDK (i2p.jar) находятся в общественном достоянии с некоторыми исключениями:</p>
 <ul>
 <li>Код для алгоритмов ElGamal и DSA — под лицензией BSD, автор: TheCrypto</li>
 <li>Код для алгоритмов SHA256 и HMAC-SHA256 — под лицензией MIT, автор: Legion из Bouncycastle</li>
 <li>Код для алгоритма AES — под лицензией Cryptix (MIT), авторы: Cryptix team</li>
 <li>Код для SNTP — под лицензией BSD, автор: Adam Buckley</li>
 <li>Всё остальное полностью в общественном достоянии, авторы: jrandom, mihi, hypercubus, oOo, ugha, duck, shendaras, и другие.</li>
 </ul>
 <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>Ещё одно приложение на этой странице — <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-прокси). SusiMail — почтовый клиент с <a href="/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/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> 
 </div>
 <div id="changelog">
 <h2>История версий</h2>
 <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
 <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
 <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
 <jsp:setProperty name="contenthelper" property="maxLines" value="512" />
 <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
 <jsp:getProperty name="contenthelper" property="textContent" />
 <p id="fullhistory"><a href="/history" target="_blank">Просмотр полной версии</a>
 </p>
 </div>
 </div></body></html>
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@ -28,7 +28,7 @@
 <%
    if (!intl.allowIFrame(request.getHeader("User-Agent"))) {
 %>
-  <a href="/summaryframe"><%=intl._t("Summary Bar")%></a>
+  <a href="/summaryframe"><%=intl._t("Sidebar")%></a>
 <%
    }
 %>
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@ -14,5 +14,23 @@
 <jsp:useBean class="net.i2p.router.web.helpers.JobQueueHelper" id="jobQueueHelper" scope="request" />
 <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=i2pcontextId%>" />
 <% jobQueueHelper.storeWriter(out); %>
 <h2>Congestion</h2><div class="joblog">
 <p>Some basic indications of router overload:</p>
 <ul><li>
 <b>Job Lag:</b> How long jobs are waiting before execution. 
 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.
 </li></ul></div>
 <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
 </div></body></html>
--- a/apps/routerconsole/jsp/summary.jsi
+++ b/apps/routerconsole/jsp/summary.jsi
@ -42,7 +42,7 @@
    } else {
        // Text browsers don't render the two divs side-by-side, so just provide a link
        out.print("<a href=\"/summaryframe\">");
-        out.print(intl._t("Summary Bar"));
+        out.print(intl._t("Sidebar"));
        out.print("</a>");
    }
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@ -10,7 +10,7 @@
 %>
 <html><head>
 <%@include file="css.jsi" %>
-<title>Summary Bar</title>
+<title>Sidebar</title>
 <%
    // try hard to avoid an error page in the iframe after shutdown
    String action = request.getParameter("action");
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@ -14,5 +14,27 @@
 <jsp:useBean class="net.i2p.router.web.helpers.TunnelHelper" id="tunnelHelper" scope="request" />
 <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.
 <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.
 </li>
 <li>
 <b>Client:</b> 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>.
 </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.
 </li>
 </ul>
 </p>
 <jsp:getProperty name="tunnelHelper" property="tunnelSummary" />
 </div></body></html>
--- a/apps/routerconsole/jsp/viewlicense.jsp
+++ b/apps/routerconsole/jsp/viewlicense.jsp
@ -0,0 +1,33 @@
 <%@page pageEncoding="UTF-8"%><%
 /*
 * USE CAUTION WHEN EDITING
 * Trailing whitespace OR NEWLINE on the last line will cause
 * IllegalStateExceptions !!!
 *
 * Do not tag this file for translation.
 */
 response.setContentType("text/plain");
 response.setHeader("X-Content-Type-Options", "nosniff");
 response.setHeader("Accept-Ranges", "none");
 response.setDateHeader("Expires", 0);
 response.addHeader("Cache-Control", "no-store, max-age=0, no-cache, must-revalidate");
 response.addHeader("Pragma", "no-cache");
 java.io.File base = net.i2p.I2PAppContext.getGlobalContext().getBaseDir();
 java.io.File file = new java.io.File(base, "LICENSE.txt");
 long length = file.length();
 if (length > 0)
    response.setHeader("Content-Length", Long.toString(length));
 try {
    net.i2p.util.FileUtil.readFile("LICENSE.txt", base.getAbsolutePath(), response.getOutputStream());
 } catch (java.io.IOException ioe) {
    // prevent 'Committed' IllegalStateException from Jetty
    if (!response.isCommitted()) {
        response.sendError(403, ioe.toString());
    }  else {
        // not an error, happens when the browser closes the stream
        net.i2p.I2PAppContext.getGlobalContext().logManager().getLog(getClass()).warn("Error serving license.txt", ioe);
        // Jetty doesn't log this
        throw ioe;
    }
 }
 %>
--- a/apps/routerconsole/jsp/web.xml
+++ b/apps/routerconsole/jsp/web.xml
@ -43,6 +43,11 @@
      <url-pattern>/history.txt</url-pattern>
    </servlet-mapping>
    <servlet-mapping> 
      <servlet-name>net.i2p.router.web.jsp.viewlicense_jsp</servlet-name>
      <url-pattern>/license.txt</url-pattern>
    </servlet-mapping>
    <servlet-mapping> 
      <servlet-name>net.i2p.router.web.jsp.viewrouterlog_jsp</servlet-name>
      <url-pattern>/router.log</url-pattern>
--- a/history.txt
+++ b/history.txt
@ -1,3 +1,9 @@
 2019-07-19 zzz
 * Console: Split up /help page, prep for translation (ticket #2298)
 2019-07-18 zzz
 * Data: Set LS2 flag bit when blinded
 2019-07-12 zzz
 * Build: Move SSU HMAC implementation from core to router
 * Test: Fix broken unit test build
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@ -7250,11 +7250,6 @@ td.optionsave {
     width: calc(100% - 22px) !important;
     overflow-y: hidden;
 }
 #help .confignav, #debug .confignav {
     position: sticky;
     top: 0;
 }
 }
@media screen and (min-width: 1460px) {
@ -7428,13 +7423,6 @@ table#permabanned {
     margin-bottom: -1px;
 }
 #help .confignav {
     padding: 0 !important;
     position: sticky;
     top: -1px;
     z-index: 999;
 }
 #help .tab {
     margin-top: -1px !important;;
 }
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@ -1743,14 +1743,6 @@ h1, .confignav {
     background: linear-gradient(to bottom, rgba(31, 43, 63, 0.7), rgba(31, 43, 63,.2) 50%, rgba(31, 43, 63, 0) 50%, rgba(31, 43, 63, 0.4) 50%, rgba(31, 43, 63, 0.5)), linear-gradient( to right, #6288cb, #7fadff, #6288cb);
 }
@media screen and (min-width: 1400px) {
 #help .confignav, #debug .confignav {
     position: sticky;
     top: -1px;
     z-index: 999;
 }
 }
 /* end topnav */
 .th_title a, .th_title a:hover {
--- 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 = 2;
+    public final static long BUILD = 3;
    /** for example "-test" */
    public final static String EXTRA = "";