merge of '42bb0b558f03e9a0de9116377c2e229d57da8ef3'

and 'e14fbe535deef3e6b734ad65bfb4ea32b58b85fe'

apps/routerconsole/java/bundle-messages.sh

@@ -26,8 +26,9 @@ do
 	# extract strings from java and jsp files, and update messages.po files
 	# translate calls must be one of the forms:
 	# _("foo")
-	# cssHelper._("foo")
+	# _x("foo")
-	# cssHelper.title("foo")
+	# intl._("foo")
+	# intl.title("foo")
 	# handler._("foo")
 	# formhandler._("foo")
 	# In a jsp, you must use a helper or handler that has the context set.
@@ -35,7 +36,8 @@ do
 	# then ant distclean updater.
 	find src ../jsp/WEB-INF -name *.java > $TMPFILE
 	xgettext -f $TMPFILE -F -L java \
-                 --keyword=_ --keyword=cssHelper._ --keyword=cssHelper.title --keyword=handler._ --keyword=formhandler._ \
+                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
+                 --keyword=handler._ --keyword=formhandler._ \
 	         -o ${i}t
 	if [ $? -ne 0 ]
 	then

apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java

@@ -29,6 +29,11 @@ public class CSSHelper extends HelperBase {
             _context.router().setConfigSetting(Messages.PROP_LANG, lang);
     }
 
+    /** needed for conditional css loads for zh */
+    public String getLang() {
+        return Messages.getLanguage(_context);
+    }
+
     /** translate the title and display consistently */
     public String title(String s) {
          StringBuilder buf = new StringBuilder(128);

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

@@ -3,7 +3,7 @@ package net.i2p.router.web;
 public class ConfigUIHelper extends HelperBase {
     public ConfigUIHelper() {}
     
-    private static final String themes[] = {"classic", "dark", "light"};
+    private static final String themes[] = {_x("classic"), _x("dark"), _x("light")};
 
     public String getSettings() {
         StringBuilder buf = new StringBuilder(512);
@@ -12,7 +12,24 @@ public class ConfigUIHelper extends HelperBase {
             buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");
             if (theme.equals(current))
                 buf.append("checked=\"true\" ");
-            buf.append("value=\"").append(theme).append("\"/>").append(theme).append("<br>\n");
+            buf.append("value=\"").append(theme).append("\">").append(_(theme)).append("<br>\n");
+        }
+        return buf.toString();
+    }
+
+    private static final String langs[] = {"de", "en", "fr", "nl", "se", "zh"};
+    private static final String xlangs[] = {_x("German"), _x("English"), _x("French"),
+                                            _x("Dutch"), _x("Swedish"), _x("Chinese")};
+
+    public String getLangSettings() {
+        StringBuilder buf = new StringBuilder(512);
+        String current = Messages.getLanguage(_context);
+        for (int i = 0; i < langs.length; i++) {
+            // we use "lang" so it is set automagically in CSSHelper
+            buf.append("<input type=\"radio\" class=\"optbox\" name=\"lang\" ");
+            if (langs[i].equals(current))
+                buf.append("checked=\"true\" ");
+            buf.append("value=\"").append(langs[i]).append("\">").append(_(xlangs[i])).append("<br>\n");
         }
         return buf.toString();
     }

apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java

@@ -34,4 +34,14 @@ public abstract class HelperBase {
     public String _(String s) {
         return Messages.getString(s, _context);
     }
+
+    /**
+     *  Mark a string for extraction by xgettext and translation.
+     *  Use this only in static initializers.
+     *  It does not translate!
+     *  @return s
+     */
+    public static String _x(String s) {
+        return s;
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/Messages.java

@@ -54,7 +54,7 @@ public class Messages {
         }
     }
 
-    private static String getLanguage(I2PAppContext ctx) {
+    public static String getLanguage(I2PAppContext ctx) {
         String lang = ctx.getProperty(PROP_LANG);
         if (lang == null || lang.length() <= 0)
             lang = _localeLang;

apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

@@ -202,9 +202,9 @@ public class SummaryBarRenderer {
                     buf.append("<button type=\"submit\" name=\"updateAction\" value=\"Unsigned\" >")
                        .append(_("Download Unsigned"))
                        .append("<br>")
-                       .append(_helper.getUnsignedUpdateVersion())
-                       .append(' ')
                        .append(_("Update"))
+                       .append(' ')
+                       .append(_helper.getUnsignedUpdateVersion())
                        .append("</button>\n");
                 }
                 buf.append("</form>\n");

apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

@@ -357,7 +357,7 @@ public class SummaryHelper extends HelperBase {
         Collections.sort(clients, new AlphaComparator());
         
         StringBuilder buf = new StringBuilder(512);
-        buf.append("<h3><a href=\"i2ptunnel/index.jsp\" target=\"_blank\" title=\"Add/remove/edit &amp; control your client and server tunnels (local destinations).\"  title=\"View existing tunnels and tunnel build status.\">Local destinations</a></h3><hr><div class=\"tunnels\"><table>");
+        buf.append("<h3><a href=\"i2ptunnel/index.jsp\" target=\"_blank\" title=\"Add/remove/edit &amp; control your client and server tunnels\">Local Destinations</a></h3><hr><div class=\"tunnels\"><table>");
         
         for (Iterator iter = clients.iterator(); iter.hasNext(); ) {
             Destination client = (Destination)iter.next();
@@ -389,7 +389,7 @@ public class SummaryHelper extends HelperBase {
                 }
             } else {
                 // yellow light
-                buf.append("<td><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Building&hellip;\" title=\"Tunnel building in progress&hellip;\"></td></tr>\n");
+                buf.append("<td><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Building&hellip;\" title=\"Building tunnels&hellip;\"></td></tr>\n");
             }
         }
         buf.append("</table></div><hr>\n");

apps/routerconsole/jsp/config.jsp

@@ -1,16 +1,17 @@
 <%@page contentType="text/html" %>
+<%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - config networking</title>
 <%@include file="css.jsp" %>
+<%=intl.title("config networking")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
 <jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<h1>I2P Network Configuration</h1>
+<h1><%=intl._("I2P Network Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -25,10 +26,11 @@
     System.setProperty("net.i2p.router.web.ConfigNetHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
- <h3>Bandwidth limiter</h3><p>
+ <h3><%=intl._("Bandwidth limiter")%></h3><p>
- <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
+ <b><%=intl._("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b>
  </p>
-   <div class="wideload"><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps In
+   <div class="wideload"><p><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" />
+          <%=intl._("KBps In")%>
         </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
 <!-- let's keep this simple...
  bursting up to
@@ -36,7 +38,8 @@
     <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br>
 -->
     </tr><tr>
-        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBps Out
+        <td><input style="text-align: right; width: 5em;" name="outboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="outboundRate" />" />
+         <%=intl._("KBps Out")%>
         </td><td>(<jsp:getProperty name="nethelper" property="outboundRateBits" />)</td>
 <!-- let's keep this simple...
  bursting up to
@@ -46,18 +49,18 @@
     A negative rate sets the default.</i><br>
 -->
     </tr><tr>
-        <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> Share</td>
+        <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> <%=intl._("Share")%></td>
         <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
-</td></tr></table></div></p>
+</td></tr></table></p></div></p>
  <% int share = nethelper.getShareBandwidth();
     if (share < 12) {
-        out.print("<b>NOTE</b>: You have configured I2P to share only " + share + "KBps. ");
+        out.print("<p><b>"+intl._("NOTE")+"</b>: You have configured I2P to share only " + share + "KBps. ");
-        out.print("I2P requires at least 12KBps to enable sharing. ");
+        out.print(intl._("I2P requires at least 12KBps to enable sharing. "));
-        out.print("Please enable sharing (participating in tunnels) by configuring more bandwidth. ");
+        out.print(intl._("Please enable sharing (participating in tunnels) by configuring more bandwidth. "));
-        out.print("It improves your anonymity by creating cover traffic, and helps the network.<br>");
+        out.print(intl._("It improves your anonymity by creating cover traffic, and helps the network.")+"</p>");
     } else {
-        out.print("You have configured I2P to share<b> " + share + "KBps</b>. ");
+        out.print("<p>" + intl._("You have configured I2P to share") + "<b> " + share + "KBps</b>. ");
-        out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<hr>");
+        out.print(intl._("The higher the share bandwidth the more you improve your anonymity and help the network.")+"</p><hr>");
     }
  %>
 <div class="formaction">
@@ -72,27 +75,27 @@
  <a href="oldstats.jsp#test.rtt">test.rtt</a> and related stats.</p>
  <br>
 -->
- <h3>IP and Transport Configuration</h3><p>
+ <h3><%=intl._("IP and Transport Configuration")%></h3><p>
- <b>The default settings will work for most people. There is <a href="#chelp">help below</a>.</b>
+ <b><%=intl._("The default settings will work for most people.")%> There is <a href="#chelp">help below</a>.</b>
- </p><p><b>UPnP Configuration:</b><br>
+ </p><p><b><%=intl._("UPnP Configuration")%>:</b><br>
     <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
-    Enable UPnP to open firewall ports - <a href="peers.jsp#upnp">UPnP status</a>
+    <%=intl._("Enable UPnP to open firewall ports")%> - <a href="peers.jsp#upnp"><%=intl._("UPnP status")%></a>
- </p><p><b>IP Configuration:</b><br>
+ </p><p><b><%=intl._("IP Configuration")%>:</b><br>
- Externally reachable hostname or IP address:<br>
+ <%=intl._("Externally reachable hostname or IP address")%>:<br>
     <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> />
-    Use all auto-detect methods<br>
+    <%=intl._("Use all auto-detect methods")%><br>
     <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> />
-    Disable UPnP IP address detection<br>
+    <%=intl._("Disable UPnP IP address detection")%><br>
     <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> />
-    Ignore local interface IP address<br>
+    <%=intl._("Ignore local interface IP address")%><br>
     <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> />
-    Use SSU IP address detection only<br>
+    <%=intl._("Use SSU IP address detection only")%><br>
     <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> />
-    Specify hostname or IP:
+    <%=intl._("Specify hostname or IP")%>:
     <input name ="udpHost1" type="text" size="16" value="<jsp:getProperty name="nethelper" property="udphostname" />" />
     <% String[] ips = nethelper.getAddresses();
        if (ips.length > 0) {
-           out.print(" or <select name=\"udpHost2\"><option value=\"\" selected=\"true\">Select Interface</option>\n");
+           out.print(" " + intl._("or") + " <select name=\"udpHost2\"><option value=\"\" selected=\"true\">Select Interface</option>\n");
            for (int i = 0; i < ips.length; i++) {
                out.print("<option value=\"");
                out.print(ips[i]);
@@ -105,9 +108,9 @@
     %>
     <br>
     <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> />
-    Hidden mode - do not publish IP <i>(prevents participating traffic)</i><br>
+    <%=intl._("Hidden mode - do not publish IP")%> <i><%=intl._("(prevents participating traffic)")%></i><br>
- </p><p><b>UDP Configuration:</b><br>
+ </p><p><b><%=intl._("UDP Configuration:")%></b><br>
- UDP port:
+ <%=intl._("UDP port:")%>
  <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br>
 <!-- let's keep this simple...
 <input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
@@ -117,123 +120,118 @@
  Current External UDP address: <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br>
 -->
  </p><p>
- <b>TCP Configuration:</b><br>
+ <b><%=intl._("TCP Configuration")%>:</b><br>
- Externally reachable hostname or IP address:<br>
+ <%=intl._("Externally reachable hostname or IP address")%>:<br>
     <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> />
-    Use auto-detected IP address
+    <%=intl._("Use auto-detected IP address")%>
-    <i>(currently <jsp:getProperty name="nethelper" property="udpIP" />)</i>
+    <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
-    if we are not firewalled<br>
+    <%=intl._("if we are not firewalled")%><br>
     <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> />
-    Always use auto-detected IP address (Not firewalled)<br>
+    <%=intl._("Always use auto-detected IP address (Not firewalled)")%><br>
     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> />
-    Specify hostname or IP:
+    <%=intl._("Specify hostname or IP")%>:
     <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" /><br>
     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> />
-    Disable inbound (Firewalled)<br>
+    <%=intl._("Disable inbound (Firewalled)")%><br>
     <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> />
-    Completely disable <i>(select only if behind a firewall that throttles or blocks outbound TCP)</i><br>
+    <%=intl._("Completely disable")%> <i><%=intl._("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i><br>
  </p><p>
- Externally reachable TCP port:<br>
+ <%=intl._("Externally reachable TCP port")%>:<br>
     <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> />
-    Use the same port configured for UDP
+    <%=intl._("Use the same port configured for UDP")%>
-    <i>(currently <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
+    <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
     <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> />
-    Specify Port:
+    <%=intl._("Specify Port")%>:
     <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br>
- </p><p><b>Note: Changing these settings will restart your router.</b></p>
+ </p><p><b><%=intl._("Note")%>: <%=intl._("Changing these settings will restart your router.")%></b></p>
 <hr><div class="formaction">
  <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" />
-</div><h3><a name="chelp">Configuration Help:</a></h3><div align="justify"><p>
+</div><h3><a name="chelp"><%=intl._("Configuration Help")%>:</a></h3><div align="justify"><p>
- While I2P will work fine behind most firewalls, your speeds and network integration will generally improve
+ <%=intl._("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port (generally 8887) is forwarded for both UDP and TCP.")%>
- if the I2P port (generally 8887) is forwarded for both UDP and TCP.
  </p><p>
- If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach
+ <%=intl._("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%>
-    you.  If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching
+   <%=intl._("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%>
-    with "SSU introductions" to relay traffic. Most of the options above are for special situations,
+   <%=intl._("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%> 
-    for example where UPnP does not work correctly, or a firewall not under your control is doing
+   <%=intl._("Certain firewalls such as symmetric NATs may not work well with I2P.")%>
-    harm. Certain firewalls such as symmetric NATs may not work well with I2P.
  </p>
 <!-- let's keep this simple...
 <input type="submit" name="recheckReachability" value="Check network reachability..." />
 </p>
 -->
 <p>
- UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address
+ <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>
- and forward ports.
+   <%=intl._("UPnP support is beta, and may not work for any number of reasons")%>:
- UPnP support is beta, and may not work for any number of reasons:
 <ul>
-<li class="tidylist">No UPnP-compatible device present
+<li class="tidylist"><%=intl._("No UPnP-compatible device present")%>
-<li class="tidylist">UPnP disabled on the device
+<li class="tidylist"><%=intl._("UPnP disabled on the device")%>
-<li class="tidylist">Software firewall interference with UPnP
+<li class="tidylist"><%=intl._("Software firewall interference with UPnP")%>
-<li class="tidylist">Bugs in the device's UPnP implementation
+<li class="tidylist"><%=intl._("Bugs in the device's UPnP implementation")%>
-<li class="tidylist">Multiple firewall/routers in the internet connection path
+<li class="tidylist"><%=intl._("Multiple firewall/routers in the internet connection path")%>
-<li class="tidylist">UPnP device change, reset, or address change
+<li class="tidylist"><%=intl._("UPnP device change, reset, or address change")%>
-</ul><br>
+</ul></p><p>
  Reviewing the <a href="peers.jsp#upnp">UPnP status</a> may help.
- UPnP may be enabled or disabled above, but a change requires a router restart to take effect.
+<%=intl._("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%></p>
-<p>Hostnames entered above will be published in the network database.
+<p><%=intl._("Hostnames entered above will be published in the network database.")%>
     They are <b>not private</b>.
     Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.
-    If you specify the wrong IP address or
+    <%=intl._("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>
-    hostname, or do not properly configure your NAT or firewall, your network performance will degrade
+    <%=intl._("When in doubt, leave the settings at the defaults.")%>
-    substantially.  When in doubt, leave the settings at the defaults.
 </p>
-<h3><a name="help">Reachability Help:</a></h3><p>
+<h3><a name="help"><%=intl._("Reachability Help")%>:</a></h3><p>
- While I2P will work fine behind most firewalls, your speeds and network integration will generally improve
+ <%=intl._("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port (generally 8887) is forwarded for both UDP and TCP.")%>
- if the I2P port (generally 8887) to both UDP and TCP.
+ <%=intl._("If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers.")%>
- If you think you have opened up your firewall and I2P still thinks you are firewalled, remember
- that you may have multiple firewalls, for example both software packages and external hardware routers.
  If there is an error, the <a href="logs.jsp">logs</a> may also help diagnose the problem.
  <ul>
-<li class="tidylist"><b>OK</b> - Your UDP port does not appear to be firewalled.
+<li class="tidylist"><b><%=intl._("OK")%></b> - 
-<li class="tidylist"><b>Firewalled</b> - Your UDP port appears to be firewalled.
+     <%=intl._("Your UDP port does not appear to be firewalled.")%>
-     As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.
+<li class="tidylist"><b><%=intl._("Firewalled")%></b> - 
-     However, if it appears consistently, you should check whether both your external and internal
+     <%=intl._("Your UDP port appears to be firewalled.")%>
-     firewalls are open on port 8887. I2P will work fine when firewalled, there is no reason for concern.
+     <%=intl._("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%>
-     When firewalled, the router uses "introducers" to relay inbound connections.
+     <%=intl._("However, if it appears consistently, you should check whether both your external and internal firewalls are open on port 8887.")%> 
-     However, you will get more participating traffic and help the network more if you can open your
+     <%=intl._("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%>
-     firewall(s). If you think you have already done so, remember that you may have both a hardware
+     <%=intl._("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%>
-     and a software firewall, or be behind an additional, institutional firewall you cannot control.
+     <%=intl._("If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control.")%>
-     Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other
+     <%=intl._("Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P.")%>
-     limitations or bugs that prevent them from passing traffic through to I2P.
+<li class="tidylist"><b><%=intl._("Testing")%></b> - 
-<li class="tidylist"><b>Testing</b> - The router is currently testing whether your UDP port is firewalled.
+     <%=intl._("The router is currently testing whether your UDP port is firewalled.")%>
-<li class="tidylist"><b>Hidden</b> - The router is not configured to publish its address,
+<li class="tidylist"><b><%=intl._("Hidden")%></b> - 
-     therefore it does not expect incoming connections.
+     <%=intl._("The router is not configured to publish its address, therefore it does not expect incoming connections.")%>
-<li class="tidylist"><b>WARN - Firewalled and Fast</b> - You have configured I2P to share more than 128KBps of bandwidth,
+<li class="tidylist"><b><%=intl._("WARN - Firewalled and Fast")%></b> - 
-     but you are firewalled. While I2P will work fine in this configuration, if you really have
+     <%=intl._("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%>
-     over 128KBps of bandwidth to share, it will be much more helpful to the network if
+     <%=intl._("While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall.")%>
-     you open your firewall.
+<li class="tidylist"><b><%=intl._("WARN - Firewalled and Floodfill")%></b> - 
-<li class="tidylist"><b>WARN - Firewalled and Floodfill</b> - You have configured I2P to be a floodfill router, but
+     <%=intl._("You have configured I2P to be a floodfill router, but you are firewalled.")%> 
-     you are firewalled. For best participation as a floodfill router, you should open your firewall.
+     <%=intl._("For best participation as a floodfill router, you should open your firewall.")%>
-<li class="tidylist"><b>WARN - Firewalled with Inbound TCP Enabled</b> - You have configured inbound TCP, however
+<li class="tidylist"><b><%=intl._("WARN - Firewalled with Inbound TCP Enabled")%></b> - 
-     your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.
+     <%=intl._("You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.")%>
-     If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact
+     <%=intl._("If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network.")%> 
-     you via TCP, which will hurt the network. Please open your firewall or disable inbound TCP above.
+     <%=intl._("Please open your firewall or disable inbound TCP above.")%>
-<li class="tidylist"><b>WARN - Firewalled with UDP Disabled</b> -
+<li class="tidylist"><b><%=intl._("WARN - Firewalled with UDP Disabled")%></b> -
-     You have configured inbound TCP, however
+     <%=intl._("You have configured inbound TCP, however you have disabled UDP.")%> 
-     you have disabled UDP. You appear to be firewalled on TCP, therefore your router cannot
+     <%=intl._("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%>
-     accept inbound connections.
+     <%=intl._("Please open your firewall or enable UDP.")%>
-     Please open your firewall or enable UDP.
+<li class="tidylist"><b><%=intl._("ERR - Clock Skew")%></b> - 
-<li class="tidylist"><b>ERR - Clock Skew</b> - Your system's clock is skewed, which will make it difficult
+     <%=intl._("Your system's clock is skewed, which will make it difficult to participate in the network.")%> 
-     to participate in the network. Correct your clock setting if this error persists.
+     <%=intl._("Correct your clock setting if this error persists.")%>
-<li class="tidylist"><b>ERR - Private TCP Address</b> - You must never advertise an unroutable IP address such as
+<li class="tidylist"><b><%=intl._("ERR - Private TCP Address")%></b> - 
-     127.0.0.1 or 192.168.1.1 as your external address. Correct the address or disable inbound TCP above.
+     <%=intl._("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%> 
-<li class="tidylist"><b>ERR - SymmetricNAT</b> - I2P detected that you are firewalled by a Symmetric NAT.
+     <%=intl._("Correct the address or disable inbound TCP above.")%>
-     I2P does not work well behind this type of firewall. You will probably not be able to
+<li class="tidylist"><b><%=intl._("ERR - SymmetricNAT")%></b> - 
-     accept inbound connections, which will limit your participation in the network.
+     <%=intl._("I2P detected that you are firewalled by a Symmetric NAT.")%>
-<li class="tidylist"><b>ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart</b> -
+     <%=intl._("I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network.")%>
-     I2P was unable to bind to port 8887 or other configured port.
+<li class="tidylist"><b><%=intl._("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%></b> -
-     Check to see if another program is using port 8887. If so, stop that program or configure
+     <%=intl._("I2P was unable to bind to port 8887 or other configured port.")%>
-     I2P to use a different port. This may be a transient error, if the other program is no longer
+     <%=intl._("Check to see if another program is using port 8887. If so, stop that program or configure I2P to use a different port.")%> 
-     using the port. However, a restart is always required after this error.
+     <%=intl._("This may be a transient error, if the other program is no longer using the port.")%> 
-<li class="tidylist"><b>ERR - UDP Disabled and Inbound TCP host/port not set</b> -
+     <%=intl._("However, a restart is always required after this error.")%>
-     You have not configured inbound TCP with a hostname and port above, however
+<li class="tidylist"><b><%=intl._("ERR - UDP Disabled and Inbound TCP host/port not set")%></b> -
-     you have disabled UDP. Therefore your router cannot accept inbound connections.
+     <%=intl._("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%> 
-     Please configure a TCP host and port above or enable UDP.
+     <%=intl._("Therefore your router cannot accept inbound connections.")%>
-<li class="tidylist"><b>ERR - Client Manager I2CP Error - check logs</b> -
+     <%=intl._("Please configure a TCP host and port above or enable UDP.")%>
-     This is usually due to a port 7654 conflict. Check the logs to verify. Do you have another I2P instance running?
+<li class="tidylist"><b><%=intl._("ERR - Client Manager I2CP Error - check logs")%></b> -
-     Stop the conflicting program and restart I2P.
+     <%=intl._("This is usually due to a port 7654 conflict. Check the logs to verify.")%> 
- </ul><hr>
+     <%=intl._("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%>
+ </ul></p><hr>
       <!--
  <b>Dynamic Router Keys: </b>
  <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br>

apps/routerconsole/jsp/configadvanced.jsp

@@ -2,8 +2,9 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config advanced</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config advanced")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
@@ -11,7 +12,7 @@
 <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
 <jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 
-<h1>I2P Advanced Configuration</h1>
+<h1><%=intl._("I2P Advanced Configuration")%></h1>
 <div class="main" id="main">
 
  <%@include file="confignav.jsp" %>
@@ -28,10 +29,10 @@
     System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
- <h3>Advanced I2P Configuration</h3>
+ <h3><%=intl._("Advanced I2P Configuration")%></h3>
  <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr>
       <div class="formaction">
         <input type="submit" name="shouldsave" value="Apply" />
         <input type="reset" value="Cancel" /><br>
- <b>NOTE:</b> Some changes may require a restart to take effect.
+ <b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%>
  </div></form></div></div></div></body></html>

apps/routerconsole/jsp/configclients.jsp

@@ -2,8 +2,9 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config clients</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config clients")%>
 <style type='text/css'>
 button span.hide{
     display:none;
@@ -14,7 +15,7 @@ button span.hide{
 
 <jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<h1>I2P Client Configuration</h1>
+<h1><%=intl._("I2P Client Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -29,29 +30,23 @@ button span.hide{
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigClientsHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigClientsHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce")%>" />
- <h3>Client Configuration</h3><p>
+ <h3><%=intl._("Client Configuration")%></h3><p>
- The Java clients listed below are started by the router and run in the same JVM.
+ <%=intl._("The Java clients listed below are started by the router and run in the same JVM.")%>
  </p><div class="wideload">
  <p><jsp:getProperty name="clientshelper" property="form1" />
- </p><p><i>To change other client options, edit the file
+ </p><p><i><%=intl._("To change other client options, edit the file")%>
  <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>.
-All changes require restart to take effect.</i>
+ <%=intl._("All changes require restart to take effect.")%></i>
  </p><hr><div class="formaction">
  <input type="submit" name="action" value="Save Client Configuration" />
-</div></div><h3>WebApp Configuration</h3><p>
+</div></div><h3><%=intl._("WebApp Configuration")%></h3><p>
- The Java web applications listed below are started by the webConsole client and run in the same JVM as the router.
+ <%=intl._("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook).")%>
- They are usually web applications accessible through the router console.
- They may be complete applications (e.g. i2psnark),
- front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel),
- or have no web interface at all (e.g. addressbook).
  </p><p>
- A web app may also be disabled by removing the .war file from the webapps directory;
+ <%=intl._("A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method.")%>
- however the .war file and web app will reappear when you update your router to a newer version,
- so disabling the web app here is the preferred method.
  </p><div class="wideload"><p>
  <jsp:getProperty name="clientshelper" property="form2" />
  </p><p>
- <i>All changes require restart to take effect.</i>
+ <i><%=intl._("All changes require restart to take effect.")%></i>
  </p><hr><div class="formaction">
  <input type="submit" name="action" value="Save WebApp Configuration" />
  </div></div></form></div></div></body></html>

apps/routerconsole/jsp/configkeyring.jsp

@@ -2,12 +2,13 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config keyring</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config keyring")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1>I2P Keyring Configuration</h1>
+<h1><%=intl._("I2P Keyring Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -17,9 +18,9 @@
  <jsp:getProperty name="formhandler" property="allMessages" />
  <jsp:useBean class="net.i2p.router.web.ConfigKeyringHelper" id="keyringhelper" scope="request" />
  <jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<div class="configure"><h2>Keyring</h2>
+<div class="configure"><h2><%=intl._("Keyring")%></h2><p>
- The router keyring is used to decrypt encrypted leaseSets.
+ <%=intl._("The router keyring is used to decrypt encrypted leaseSets.")%>
- The keyring may contain keys for local or remote encrypted destinations.
+ <%=intl._("The keyring may contain keys for local or remote encrypted destinations.")%></p>
  <div class="wideload"><p>
  <jsp:getProperty name="keyringhelper" property="summary" />
 </p></div>
@@ -29,18 +30,18 @@
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigKeyringHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigKeyringHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" />
- <h3>Manual Keyring Addition</h3>
+ <h3><%=intl._("Manual Keyring Addition")%></h3><p>
- Enter keys for encrypted remote destinations here.
+ <%=intl._("Enter keys for encrypted remote destinations here.")%>
  Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
- <p>
+</p>
   <div class="wideload">
-      <table><tr>
+      <p><table><tr>
-          <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
+          <td class="mediumtags" align="right"><%=intl._("Dest. name, hash, or full key")%>:</td>
           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
         </tr><tr>
-          <td class="mediumtags" align="right">Encryption Key:</td>
+          <td class="mediumtags" align="right"><%=intl._("Encryption Key")%>:</td>
           <td><input type="text" size="55" name="key" /></td>
         </tr><tr>
           <td align="right" colspan="2"><input type="submit" name="action" value="Add key" />
              <input type="submit" name="action" value="Delete key" /> <input type="reset" value="Cancel" /></td>
-</tr></table></div></form></div></div></body></html>
+</tr></table></p></div></form></div></div></body></html>

apps/routerconsole/jsp/configlogging.jsp

@@ -3,14 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - config logging</title>
 <%@include file="css.jsp" %>
+<%=intl.title("config logging")%>
 </head><body>
 <jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" />
 <jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 
 <%@include file="summary.jsp" %>
-<h1>I2P Logging Configuration</h1>
+<h1><%=intl._("I2P Logging Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -25,26 +25,26 @@
     System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
- <h3>Configure I2P Logging Options</h3>
+ <h3><%=intl._("Configure I2P Logging Options")%></h3>
  <div class="wideload">
       <table border="0" cellspacing="5">
-        <tr><td class="mediumtags" align="right"><b>Logging filename:</b></td>
+        <tr><td class="mediumtags" align="right"><b><%=intl._("Logging filename")%>:</b></td>
           <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
-          <br><i>(the symbol '@' will be replaced during log rotation)</i></td>
+            <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td>
-        </tr><tr><td class="mediumtags" align="right"><b>Log record format:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td>
           <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
-            <br> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
+            <br> <i><%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
-            'm' = message)</i></td>
+            </i></td>
-        </tr><tr><td class="mediumtags" align="right"><b>Log date format:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log date format")%>:</b></td>
           <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
-            <br> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
+            <br> <i><%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
-            = second, 'SSS' = millisecond)</i></td>
+            </i></td>
-        </tr><tr><td class="mediumtags" align="right"><b>Max log file size:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Max log file size")%>:</b></td>
           <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br></td>
-        </tr><tr><td class="mediumtags" align="right"><b>Default log level:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Default log level")%>:</b></td>
-          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i>(DEBUG and INFO are not recommended defaults,
+          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i><%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
-            as they will drastically slow down your router)</i></td>
+          </i></td>
-        </tr><tr><td class="mediumtags" align="right"><b>Log level overrides:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log level overrides")%>:</b></td>
           <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
         </tr><tr><td colspan="2"><hr></td>
         </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction">

apps/routerconsole/jsp/confignav.jsp

@@ -2,11 +2,8 @@
 <center>
 <% if (request.getRequestURI().indexOf("config.jsp") != -1) {
  %>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
- String userAgent = request.getHeader("User-Agent");
- if (userAgent == null || !userAgent.contains("MSIE")) {
      if (request.getRequestURI().indexOf("configui.jsp") != -1) {
      %>UI | <% } else { %><a href="configui.jsp">UI</a> | <% }
- }
  if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
  %>Service | <% } else { %><a href="configservice.jsp">Service</a> | <% }
  if (request.getRequestURI().indexOf("configupdate.jsp") != -1) {

apps/routerconsole/jsp/configpeer.jsp

@@ -2,12 +2,13 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config peers</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config peers")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1>I2P Peer Configuration</h1>
+<h1><%=intl._("I2P Peer Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -34,11 +35,11 @@
  <a name="sh"> </a>
  <a name="unsh"> </a>
  <a name="bonus"> </a>
- <h2>Manual Peer Controls</h2>
+ <h2><%=intl._("Manual Peer Controls")%></h2>
- <div class="mediumtags">Router Hash:
+ <div class="mediumtags"><p><%=intl._("Router Hash")%>:
- <input type="text" size="55" name="peer" value="<%=peer%>" /></div>
+<input type="text" size="55" name="peer" value="<%=peer%>" /></p></div>
- <h3>Manually Ban / Unban a Peer</h3>
+ <h3><%=intl._("Manually Ban / Unban a Peer")%></h3>
- Banning will prevent the participation of this peer in tunnels you create.
+ <p><%=intl._("Banning will prevent the participation of this peer in tunnels you create.")%></p>
       <div class="formaction">
         <input type="submit" name="action" value="Ban peer until restart" />
         <input type="submit" name="action" value="Unban peer" />
@@ -47,21 +48,18 @@
         <% } %>
       </div>
 
- <h3>Adjust Profile Bonuses</h3>
+ <h3><%=intl._("Adjust Profile Bonuses")%></h3>
- Bonuses may be positive or negative, and affect the peer's inclusion in Fast
+ <p><%=intl._("Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. Current bonuses are displayed on the")%> <a href="profiles.jsp"><%=intl._("profiles page")%></a>.</p>
-      and High Capacity tiers. Fast peers are used for client tunnels, and High
-      Capacity peers are used for some exploratory tunnels. Current bonuses are
-      displayed on the <a href="profiles.jsp">profiles page</a>.<br>
  <% long speed = 0; long capacity = 0;
     if (! "".equals(peer)) {
         // get existing bonus values?
     }
  %>
- <div class="mediumtags">Speed:
+ <div class="mediumtags"><p><%=intl._("Speed")%>:
  <input type="text" size="8" name="speed" value="<%=speed%>" />
- Capacity:
+ <%=intl._("Capacity")%>:
  <input type="text" size="8" name="capacity" value="<%=capacity%>" />
- <input type="submit" name="action" value="Adjust peer bonuses" /></div>
+ <input type="submit" name="action" value="Adjust peer bonuses" /></p></div>
  </form>
  <a name="shitlist"> </a>
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
@@ -71,4 +69,4 @@
  <div class="wideload">
  <jsp:getProperty name="peerhelper" property="blocklistSummary" />
 
-</div></div><br></div></body></html>
+</div><hr></div></div></body></html>

apps/routerconsole/jsp/configservice.jsp

@@ -2,12 +2,13 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config service</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config service")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1>I2P Service Configuration</h1>
+<h1><%=intl._("I2P Service Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -21,63 +22,57 @@
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigServiceHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigServiceHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce")%>" />
- <h3>Shutdown the router</h3>
+ <h3><%=intl._("Shutdown the router")%></h3>
- <p>Graceful shutdown lets the router satisfy the agreements it has already made
+ <p><%=intl._("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%> 
- before shutting down, but may take a few minutes.  If you need to kill the
+    <%=intl._("If you need to kill the router immediately, that option is available as well.")%></p>
- router immediately, that option is available as well.</p>
   <hr><div class="formaction">
  <input type="submit" name="action" value="Shutdown gracefully" />
  <input type="submit" name="action" value="Shutdown immediately" />
  <input type="submit" name="action" value="Cancel graceful shutdown" />
  </div>
  <% if (System.getProperty("wrapper.version") != null) { %>
- <p>If you want the router to restart itself after shutting down, you can choose one of
+ <p><%=intl._("If you want the router to restart itself after shutting down, you can choose one of the following.")%> 
- the following.  This is useful in some situations - for example, if you changed
+    <%=intl._("This is useful in some situations")%> - 
- some settings that client applications only read at startup, such as the routerconsole password
+    <%=intl._("for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on.")%> 
- or the interface it listens on.  A graceful restart will take a few minutes (but your peers
+    <%=intl._("A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately.")%> 
- will appreciate your patience), while a hard restart does so immediately.  After tearing down
+    <%=intl._("After tearing down the router, it will wait 1 minute before starting back up again.")%></p>
- the router, it will wait 1 minute before starting back up again.</p>
  <hr><div class="formaction">
  <input type="submit" name="action" value="Graceful restart" />
  <input type="submit" name="action" value="Hard restart" />
  <% } %></div>
 
  <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>
- <h3>Systray integration</h3>
+ <h3><%=intl._("Systray integration")%></h3>
- <p>On the windows platform, there is a small application to sit in the system
+ <p><%=intl._("On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status")%> 
- tray, allowing you to view the router's status (later on, I2P client applications
+    <%=intl._("(later on, I2P client applications will be able to integrate their own functionality into the system tray as well).")%> 
- will be able to integrate their own functionality into the system tray as well).
+    <%=intl._("If you are on windows, you can either enable or disable that icon here.")%></p>
- If you are on windows, you can either enable or disable that icon here.</p>
  <hr><div class="formaction">
  <input type="submit" name="action" value="Show systray icon" />
  <input type="submit" name="action" value="Hide systray icon" />
-</div><h3>Run on startup</h3>
+</div><h3><%=intl._("Run on startup")%></h3>
- <p>You can control whether I2P is run on startup or not by selecting one of the
+ <p><%=intl._("You can control whether I2P is run on startup or not by selecting one of the following options")%> - 
- following options - I2P will install (or remove) a service accordingly.  You can
+    <%=intl._("I2P will install (or remove) a service accordingly.")%> 
- also run the <code>install_i2p_service_winnt.bat</code> (or
+    <%=intl._("If you prefer the command line, you can also run the ")%> <code>install_i2p_service_winnt.bat</code> (<%=intl._("or")%>
- <code>uninstall_i2p_service_winnt.bat</code>) from the command line, if you prefer.</p>
+ <code>uninstall_i2p_service_winnt.bat</code>).</p>
  <hr><div class="formaction">
  <input type="submit" name="action" value="Run I2P on startup" />
 <input type="submit" name="action" value="Don't run I2P on startup" /></div>
- <p><b>Note:</b> If you are running I2P as service right now, removing it will shut
+ <p><b><%=intl._("Note")%>:</b> <%=intl._("If you are running I2P as service right now, removing it will shut down your router immediately.")%> 
- down your router immediately.  You may want to consider shutting down gracefully, as
+    <%=intl._("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%></p>
- above, then running uninstall_i2p_service_winnt.bat.</p>
  <% } %>
 
  <% if (System.getProperty("wrapper.version") != null) { %>
- <h3>Debugging</h3>
+ <h3><%=intl._("Debugging")%></h3>
- <p>At times, it may be helpful to debug I2P by getting a thread dump.  To do so,
+ <p> At times, it may be helpful to debug I2P by getting a thread dump. 
- please select the following option and review the thread dumped to
+     To do so, please select the following option and review the thread dumped to
  <a href="logs.jsp#servicelogs">wrapper.log</a>.</p>
   <hr><div class="formaction">
  <input type="submit" name="action" value="Dump threads" />
 <% } %></div>
 
- <h3>Launch browser on router startup?</h3>
+ <h3><%=intl._("Launch browser on router startup?")%></h3>
- <p>I2P's main configuration interface is this web console, so for your convenience
+ <p><%=intl._("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%>
- I2P can launch a web browser pointing at
+ <a href="http://127.0.0.1:7657/index.jsp">http://127.0.0.1:7657/index.jsp</a> .</p>
- <a href="http://127.0.0.1:7657/index.jsp">http://127.0.0.1:7657/index.jsp</a> whenever
- the router starts up.</p>
  <hr><div class="formaction">
  <input type="submit" name="action" value="View console on startup" />
  <input type="submit" name="action" value="Do not view console on startup" />

apps/routerconsole/jsp/configstats.jsp

@@ -2,8 +2,9 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config stats</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config stats")%>
 <script type="text/javascript">
 function init()
 {
@@ -52,7 +53,7 @@ function toggleAll(category)
 </script>
 </head><body onLoad="init();">
 <%@include file="summary.jsp" %>
-<h1>I2P Stats Configuration</h1>
+<h1><%=intl._("I2P Stats Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -70,25 +71,25 @@ function toggleAll(category)
     System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="action" value="foo" />
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" />
- <h3>Configure I2P Stat Collection</h3>
+ <h3><%=intl._("Configure I2P Stat Collection")%></h3>
- <p>Enable full stats?
+ <p><%=intl._("Enable full stats?")%>
  <input type="checkbox" class="optbox" name="isFull" value="true" <%
  if (statshelper.getIsFull()) { %>checked="true" <% } %>/>
- (change requires restart to take effect)<br>
+ (<%=intl._("change requires restart to take effect")%>)<br>
- Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
+ <%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
-Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<br></p>
+<%=intl._("Filter")%>: (<a href="javascript: void(null);" onclick="toggleAll('*')"><%=intl._("toggle all")%></a>)<br></p>
  <div class="wideload">
- <table>
+ <p><table>
  <% while (statshelper.hasMoreStats()) {
       while (statshelper.groupRequired()) { %>
  <tr class="tablefooter">
      <td align="left" colspan="3">
      <b><%=statshelper.getCurrentGroupName()%></b>
-     (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
+     (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>)
      </td></tr>
  <tr class="tablefooter">
-    <td align="center"><b>Log</b></td>
+    <td align="center"><b><%=intl._("Log")%></b></td>
-    <td align="center"><b>Graph</b></td>
+    <td align="center"><b><%=intl._("Graph")%></b></td>
     <td></td></tr>
         <%
      } // end iterating over required groups for the current stat %>
@@ -105,7 +106,7 @@ Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</
     } // end iterating over all stats %>
  <tr><td colspan="3"></td></tr>
  <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" /></td>
-     <td colspan="2">Advanced filter:
+     <td colspan="2"><%=intl._("Advanced filter")%>:
      <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
      <tr class="tablefooter"><td colspan="3" align="right"><input type="submit" name="shouldsave" value="Save changes" /><input type="reset" value="Cancel" /></td></tr>
- </table></div></form></div></div></body></html>
+ </table></p></div></form></div></div></body></html>

apps/routerconsole/jsp/configtunnels.jsp

@@ -2,15 +2,16 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config tunnels</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config tunnels")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
 <jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<h1>I2P Tunnel Configuration</h1>
+<h1><%=intl._("I2P Tunnel Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
  <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
@@ -20,14 +21,14 @@
  <jsp:setProperty name="formhandler" property="nonce" value="<%=request.getParameter("nonce")%>" />
  <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />
- <div class="configure"><p><i>
+ <div class="configure"><p>
- NOTE: The default settings work for most people.
+ <%=intl._("NOTE")%>: 
- There is a fundamental tradeoff between anonymity and performance.
+ <%=intl._("The default settings work for most people.")%> 
- Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops),
+ <%=intl._("There is a fundamental tradeoff between anonymity and performance.")%>
- or a high quantity + backup quantity, may severely reduce performance or reliability.
+ <%=intl._("Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely reduce performance or reliability.")%>
- High CPU and/or high outbound bandwidth usage may result.
+ <%=intl._("High CPU and/or high outbound bandwidth usage may result.")%>
- Change these settings with care, and adjust them if you have problems.
+ <%=intl._("Change these settings with care, and adjust them if you have problems.")%>
- </i></p><div class="wideload">
+<div class="wideload">
 <form action="configtunnels.jsp" method="POST">
  <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.noncePrev", prev);
@@ -35,8 +36,8 @@
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
  <jsp:getProperty name="tunnelshelper" property="form" />
- <i>Note - Exploratory tunnel setting changes are stored in the router.config file.</i><br>
+ <%=intl._("Note")%>: <%=intl._("Exploratory tunnel setting changes are stored in the router.config file.")%>
- <i>Client tunnel changes are temporary and are not saved.</i><br>
+ <%=intl._("Client tunnel changes are temporary and are not saved.")%>
- <i>To make permanent client tunnel changes see the </i><a href="i2ptunnel/index.jsp">i2ptunnel page</a>.<br>
+<%=intl._("To make permanent client tunnel changes see the")%> <a href="i2ptunnel/index.jsp"><%=intl._("i2ptunnel page")%></a>.
  <hr><div class="formaction"><input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" /></div>
- </form></div></div></div></body></html>
+ </form></p></div></div></div></body></html>

apps/routerconsole/jsp/configui.jsp

@@ -2,8 +2,9 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - config UI</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("config UI")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
@@ -11,7 +12,7 @@
 <jsp:useBean class="net.i2p.router.web.ConfigUIHelper" id="uihelper" scope="request" />
 <jsp:setProperty name="uihelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 
-<h1>I2P UI Configuration</h1>
+<h1><%=uihelper._("I2P UI Configuration")%></h1>
 <div class="main" id="main">
 
  <%@include file="confignav.jsp" %>
@@ -20,23 +21,27 @@
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />
-<div class="configure"><div class="topshimten"><h3>Router Console Theme</h3></div>
+<div class="configure"><div class="topshimten"><h3><%=uihelper._("Router Console Theme")%></h3></div>
-<%
- // userAgent defined in confignav
- if (userAgent == null || !userAgent.contains("MSIE")) {
-%>
  <form action="configui.jsp" method="POST">
  <% String prev = System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigUIHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigUIHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce")%>" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce")%>" >
- <input type="hidden" name="action" value="blah" />
+ <input type="hidden" name="action" value="blah" >
+<%
+ String userAgent = request.getHeader("User-Agent");
+ if (userAgent == null || !userAgent.contains("MSIE")) {
+%>
  <jsp:getProperty name="uihelper" property="settings" />
-<hr><div class="formaction">
-<input type="submit" name="shouldsave" value="Apply" /> <input type="reset" value="Cancel" />
-</div></form></div>
 <% } else { %>
-Theme selection disabled for Internet Explorer, sorry.<hr>If you're not using IE, it's likely that
+<%=uihelper._("Theme selection disabled for Internet Explorer, sorry.")%>
-your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes.
+<hr>
+<%=uihelper._("If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes.")%>
 <% } %>
+<h3><%=uihelper._("Router Console Language")%></h3>
+<jsp:getProperty name="uihelper" property="langSettings" />
+<%=uihelper._("Please contribute to the router console translation project! Contact the developers on IRC #i2p to help.")%>
+<hr><div class="formaction">
+<input type="submit" name="shouldsave" value="Apply" > <input type="reset" value="Cancel" >
+</div></form></div>
 </div></body></html>

apps/routerconsole/jsp/configupdate.jsp

@@ -4,11 +4,11 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config update")%>
+<%=intl.title("config update")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1>I2P Update Configuration</h1>
+<h1><%=intl._("I2P Update Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -26,32 +26,32 @@
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
-      <h3>Check for I2P and news updates</h3>
+      <h3><%=intl._("Check for I2P and news updates")%></h3>
       <div class="wideload"><table border="0" cellspacing="5">
         <tr><td colspan="2"></tr>
-        <tr><td class= "mediumtags" align="right"><b>News &amp; I2P Updates:</b></td>
+        <tr><td class= "mediumtags" align="right"><b><%=intl._("News &amp; I2P Updates")%>:</b></td>
-          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i>Update In Progress</i><br> <% } else { %> <input type="submit" name="action" value="Check for updates" />
+          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=intl._("Update In Progress")%></i><br> <% } else { %> <input type="submit" name="action" value="Check for updates" />
             <% } %></td></tr>
         <tr><td colspan="2"><br></td></tr>
-        <tr><td class= "mediumtags" align="right"><b>News URL:</b></td>
+        <tr><td class= "mediumtags" align="right"><b><%=intl._("News URL")%>:</b></td>
           <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>Refresh frequency:</b>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Refresh frequency")%>:</b>
           <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" /></td><tr>
           <td class= "mediumtags" align="right"><b><%=formhandler._("Update policy")%>:</b></td>
           <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" /></td>
-        <tr><td class= "mediumtags" align="right"><b>Update through the eepProxy?</b></td>
+        <tr><td class= "mediumtags" align="right"><b><%=intl._("Update through the eepProxy?")%></b></td>
           <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" /></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>eepProxy host:</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("eepProxy host")%>:</b></td>
           <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>eepProxy port:</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("eepProxy port")%>:</b></td>
           <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>Update URLs:</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Update URLs")%>:</b></td>
           <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>Trusted keys:</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Trusted keys")%>:</b></td>
           <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>Update with unsigned development builds?</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Update with unsigned development builds?")%></b></td>
           <td><jsp:getProperty name="updatehelper" property="updateUnsigned" /></td>
-        </tr><tr><td class= "mediumtags" align="right"><b>Unsigned Build URL:</b></td>
+        </tr><tr><td class= "mediumtags" align="right"><b><%=intl._("Unsigned Build URL")%>:</b></td>
           <td><input type="text" size="60" name="zipURL" value="<jsp:getProperty name="updatehelper" property="zipURL" />"></td>
         </tr><tr class="tablefooter"><td colspan="2">
         <div class="formaction">

apps/routerconsole/jsp/css.jsp

@@ -23,10 +23,18 @@
 %>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="shortcut icon" href="/themes/console/images/favicon.ico">
-<jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
+<jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" />
-<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+<jsp:setProperty name="intl" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <%
-   cssHelper.setLang(request.getParameter("lang"));
+   intl.setLang(request.getParameter("lang"));
+%>
+<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
+<%
+   // make the fonts bigger for chinese
+   if (intl.getLang().equals("zh")) {
+%>
+<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_big.css" rel="stylesheet" type="text/css">
+<%
+   }
 %>
-<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
 <!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->

apps/routerconsole/jsp/error.jsp

@@ -12,8 +12,9 @@
     }
     // If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
 %>
-<html><head><title>I2P Router Console - Page Not Found</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("Page Not Found")%>
 </head><body>
 <%
 if (System.getProperty("router.consoleNonce") == null) {
@@ -23,6 +24,6 @@ if (System.getProperty("router.consoleNonce") == null) {
 <%@include file="summary.jsp" %>
 <h1><%=ERROR_CODE%> <%=ERROR_MESSAGE%></h1>
 <div class="sorry" id="warning">
-Sorry! You appear to be requesting a non-existent Router Console page or resource.<hr>
+<%=intl._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%><hr>
-Error 404: <%=ERROR_URI%> not found.
+<%=intl._("Error 404")%>: <%=ERROR_URI%> <%=intl._("not found")%>.
 </div></body></html>

apps/routerconsole/jsp/graphs.jsp

@@ -2,12 +2,13 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - graphs</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("graphs")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1>I2P Performance Graphs</h1>
+<h1><%=intl._("I2P Performance Graphs")%></h1>
 <div class="main" id="main">
  <div class="graphspanel">
  <div class="widepanel">

apps/routerconsole/jsp/index.jsp

@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<title>I2P Router Console - home</title>
+<%=intl.title("home")%>
 </head><body>
 <%
 if (System.getProperty("router.consoleNonce") == null) {
@@ -12,7 +12,7 @@ if (System.getProperty("router.consoleNonce") == null) {
 }
 %>
 
-<%@include file="summary.jsp" %><h1>I2P Router Console</h1>
+<%@include file="summary.jsp" %><h1><%=intl._("I2P Router Console")%></h1>
 <div class="news" id="news">
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %>

apps/routerconsole/jsp/jobs.jsp

@@ -2,13 +2,14 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - job queue</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("job queue")%>
 </head><body>
-<%@include file="summary.jsp" %><h1>I2P Router Job Queue</h1>
+<%@include file="summary.jsp" %><h1><%=intl._("I2P Router Job Queue")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
  <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:setProperty name="jobQueueHelper" property="writer" value="<%=out%>" /><hr>
+ <jsp:setProperty name="jobQueueHelper" property="writer" value="<%=out%>" />
  <jsp:getProperty name="jobQueueHelper" property="jobQueueSummary" />
-</div></body></html>
+<hr></div></body></html>

apps/routerconsole/jsp/logs.jsp

@@ -2,14 +2,15 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - logs</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("logs")%>
 </head><body>
 <%@include file="summary.jsp" %>
-<h1>I2P Router Logs</h1>
+<h1><%=intl._("I2P Router Logs")%></h1>
 <div class="main" id="main">
- <div class="joblog"><h3>I2P Version & Running Environment</h3><a name="version"> </a>
+ <div class="joblog"><h3><%=intl._("I2P Version & Running Environment")%></h3><a name="version"> </a>
- <i>Please include this information in bug reports:</i>
+ <i><%=intl._("Please include this information in bug reports")%>:</i>
  <p>
 <b>I2P version:</b> <jsp:getProperty name="helper" property="version" /><br>
 <b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%><br>
@@ -20,9 +21,9 @@
  <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" />
  <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <h3>Critical Logs</h3><a name="criticallogs"> </a>
- <jsp:getProperty name="logsHelper" property="criticalLogs" /><br>
+ <jsp:getProperty name="logsHelper" property="criticalLogs" />
  <h3>Router Logs [<a href="configlogging.jsp">configure</a>]</h3>
- <jsp:getProperty name="logsHelper" property="logs" /><br>
+ <jsp:getProperty name="logsHelper" property="logs" />
  <h3>Service (Wrapper) Logs</h3><a name="servicelogs"> </a>
  <jsp:getProperty name="logsHelper" property="serviceLogs" />
-</div></div></body></html>
+</div><hr></div></body></html>

apps/routerconsole/jsp/netdb.jsp

@@ -3,11 +3,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - network database summary</title>
 <%@include file="css.jsp" %>
+<%=intl.title("network database summary")%>
 </head><body>
 <%@include file="summary.jsp" %>
- <h1>I2P Network Database Summary</h1>
+ <h1><%=intl._("I2P Network Database Summary")%></h1>
 <div class="main" id="main">
  <div class="wideload">
  <jsp:useBean class="net.i2p.router.web.NetDbHelper" id="netdbHelper" scope="request" />

apps/routerconsole/jsp/oldstats.jsp

@@ -2,14 +2,15 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - statistics</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("statistics")%>
 </head><body>
 <%@include file="summary.jsp" %>
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
 <jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
- <h1>I2P Router Statistics</h1>
+ <h1><%=intl._("I2P Router Statistics")%></h1>
 <div class="main" id="main">
  <jsp:getProperty name="oldhelper" property="stats" />
 <hr></div></body></html>

apps/routerconsole/jsp/peers.jsp

@@ -2,11 +2,12 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - peer connections</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("peer connections")%>
 </head><body>
 <%@include file="summary.jsp" %>
-<h1>I2P Network Peers</h1>
+<h1><%=intl._("I2P Network Peers")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
  <jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

apps/routerconsole/jsp/profiles.jsp

@@ -2,10 +2,11 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - peer profiles</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("peer profiles")%>
 </head><body><%@include file="summary.jsp" %>
-<h1>I2P Network Peer Profiles</h1>
+<h1><%=intl._("I2P Network Peer Profiles")%></h1>
 <div class="main" id="main"><div class="wideload">
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

apps/routerconsole/jsp/tunnels.jsp

@@ -2,10 +2,11 @@
 <%@page pageEncoding="UTF-8"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
-<html><head><title>I2P Router Console - tunnel summary</title>
+<html><head>
 <%@include file="css.jsp" %>
+<%=intl.title("tunnel summary")%>
 </head><body>
-<%@include file="summary.jsp" %><h1>I2P Tunnel Summary</h1>
+<%@include file="summary.jsp" %><h1><%=intl._("I2P Tunnel Summary")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
  <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />

core/java/src/net/i2p/crypto/TrustedUpdate.java

@@ -414,8 +414,14 @@ D8usM7Dxp5yrDrCYZ5AIijc=
      *         data was moved, and an error <code>String</code> otherwise.
      */
     public String migrateVerified(String currentVersion, File signedFile, File outputFile) {
-        if (!isUpdatedVersion(currentVersion, signedFile))
+        if (!signedFile.exists())
+            return "File not found: " + signedFile.getAbsolutePath();
+        if (!isUpdatedVersion(currentVersion, signedFile)) {
+            if ("".equals(_newVersion))
+                return "Truncated or corrupt file: " + signedFile.getAbsolutePath();
+            else
                 return "Downloaded version is not greater than current version";
+        }
 
         if (!verify(signedFile))
             return "Unknown signing key or corrupt file";

core/java/src/net/i2p/data/Certificate.java

@@ -113,7 +113,7 @@ public class Certificate extends DataStructureImpl {
     
     public int readBytes(byte source[], int offset) throws DataFormatException {
         if (source == null) throw new DataFormatException("Cert is null");
-        if (source.length <= offset + 3)
+        if (source.length < offset + 3)
             throw new DataFormatException("Cert is too small [" + source.length + " off=" + offset + "]");
 
         int cur = offset;

core/java/src/net/i2p/util/FileUtil.java

@@ -143,6 +143,11 @@ public class FileUtil {
      * so we basically go through all the motions of extractZip() above,
      * unzipping everything but throwing away the data.
      *
+     * Todo: verify zip header? Although this would break the undocumented
+     * practice of renaming the i2pupdate.sud file to i2pupdate.zip and
+     * letting the unzip method skip over the leading 56 bytes of
+     * "junk" (sig and version)
+     *
      * @return true if ok
      */
     public static boolean verifyZip(File zipfile) {

history.txt

@@ -1,3 +1,18 @@
+2009-10-23 zzz
+    * Certificate: Fix the (apparently unused) readBytes(byte[], int) method
+      for a null certificate - http://zzz.i2p/topics/388 - thanks HungryHobo
+    * Console:
+      - Don't hide link to configui.jsp for IE any more
+      - Add lang selection on configui.jsp
+      - Tag strings in configui.jsp
+      - Load console_big.css if lang == zh
+      - Add _x() tag for static iniitializers
+      - HTML transitional input tags
+      - Rename cssHelper to intl for ease of tagging
+    * Update: Better error message when .sud file not found or truncated
+      http://forum.i2p/viewtopic.php?t=3979
+      The bug with the file going to the wrong place was fixed a couple months ago.
+
 2009-10-21 dr|z3d
     * Enhance index.jsp with "paperclips" for the main links
     * Tighten sidepanel layout to gain us some vertical screen real estate

installer/resources/themes/console/classic/console.css

@@ -172,7 +172,7 @@ div.routersummary h3 {
      font-size: 9.5pt;
      letter-spacing: 0.05em;
      margin: -7px 1px -7px 1px;
-     padding: 3px 0;
+     padding: 1px 0;
      background: #c5d5fb;
      text-transform: uppercase;
 }
@@ -183,7 +183,7 @@ div.routersummary h4 {
      font-size: 8.5pt;
      letter-spacing: 0.05em;
      margin: -7px 1px -7px 1px !important;
-     padding: 2px 3px;
+     padding: 1px 3px;
      background: #c1d1f7;
      text-transform: capitalize;
      text-decoration: none !important;
@@ -193,11 +193,11 @@ div.routersummary h4 {
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px 5px -5px 2px;
+     margin: -5px 4px -5px 3px;
      width: 180px !important;
      overflow: hidden;
      font-size: 8pt;
-     padding: 0px -10px;
+     padding: 0 -10px;
      background-image: none !important;
      background-color: transparent !important;
 }
@@ -208,12 +208,12 @@ div.routersummary tr {
      border: 0 !important;
 }
 
-.tunnels {
+div.tunnels table{
-     margin-top: 3px;
+     margin: 0 !important;
 }
 
 .tunnels tr {
-     padding: 4px 0 !important;
+     padding: 2px 0 !important;
      margin-left: -7px !important;
 }
      
@@ -242,21 +242,11 @@ div.routersummary a:hover {
 }
 
 div.routersummary td {
-     padding: 2px 4px;
+     padding: 0 4px;
      background-image: none !important;
      border: 0 !important;
 }
 
-div.routersummary tr:nth-child(even) {
-     background-color: #f60;
-     background-image: none !important;
-}
-
-div.routersummarytr:nth-child(odd) {
-     background-color: #f00;
-     background-image: none !important;
-}
-
 div.warning h3 {
      border-bottom: 5px solid #fb7;
      padding-bottom: 10px;
@@ -614,7 +604,7 @@ div.joblog p {
 }
 
 div.joblog h3 {
-     margin: 10px 0 10px 0;
+     margin: 10px 0 20px 0;
 }
 
 div.joblog h3:first-child {

installer/resources/themes/console/classic/console_big.css

@@ -0,0 +1,780 @@
+/* Optimised for less capable browsers and system specifications */
+
+body {
+     margin: 2px 0 0 2px;
+     padding: 0;
+     text-align: left;
+     background: #bbf;
+     color: #000;
+     font: 9pt/140%  Verdana, Tahoma, Helvetica, sans-serif;
+}
+
+.hide {
+     display: none;
+}
+
+img {
+     border: none;
+}
+
+pre {
+     overflow: auto;
+     font-size: 8pt !important;
+     width: 95%;
+     padding-top: 10px;
+}
+
+div.logo {
+     float: left;
+     position-relative: top 20px ;
+     width: 200px;
+     margin: 0 0 0 20px;
+     padding: 10px 5px;
+     text-align: center;
+     border: 5px solid #ddf;
+     background-color: #eef;
+     -moz-border-radius: 15px;
+     -moz-box-shadow: inset 0px 0px 0px 2px #99f;
+     -khtml-border-radius: 15px;
+     -khtml-box-shadow: inset 0px 0px 0px 2px #99f;
+}
+
+div.logo hr {
+     color: #ddf;
+     background: #ddf;
+     height: 5px;
+     border: 0px solid #ddf;
+     margin: 8px -3px;
+}
+
+div.logo a:link, div.logo a:visited {
+     text-shadow: 1px 1px 1px rgba(0, 0, 32, 0.5);
+}
+
+div.logo a:active {
+     text-shadow: 1px 1px 1px rgba(255, 96, 0, 0.7);
+     color: #f60;
+}
+
+div.logo a:hover {
+     text-shadow: 1px 1px 1px rgba(128, 0, 0, 0.7);
+     color: #900;
+}
+
+div.warning {
+     margin: 20px 20px 10px 260px;
+     padding: 0px 20px 20px 75px;
+     background: #ffd;
+     border: 5px solid #fb7;
+     text-align: left;
+     color: inherit;
+     background-image:url("../images/itoopie_sm.png");     
+     background-position: 12px center;
+     background-repeat:no-repeat;
+     -moz-border-radius: 15px;
+     -moz-box-shadow: inset 0px 0px 0px 2px #f60;
+     -kthml-border-radius: 15px;
+     -khtml-box-shadow: inset 0px 0px 0px 2px #f60;
+}
+
+div.warning a:link {
+     color: #f60;
+     text-shadow: 1px 1px 1px rgba(255, 96, 0, 0.5);
+}
+
+div.warning a:visited{
+     color: #f90;
+}
+
+div.warning a:hover{
+     color: #d30;
+  text-shadow: 1px 1px 1px rgba(255, 96, 0, 0.7);
+}
+
+div.warning a:active{
+     color: #900;
+}
+
+div.warning hr {
+     color: #fb7;
+     background: #fb7;
+     height: 5px;
+     border: 0px solid #fb7;
+     margin: 5px 0;
+}
+
+/* console error messages */
+
+div.sorry {
+     padding: 20px;
+     background: #ddf;
+     margin: -2px 1px 0 195px;
+     border: 5px solid #bbf;
+     text-align: justify;
+     -moz-box-shadow: inset 0px 0px 0px 1px #d00;
+     word-wrap: break-word;
+     font-weight: bold;
+     color: #001;
+}
+
+div.sorry hr {
+     color: #001;
+     background: #001;
+     height: 1px;
+     border: 1px solid #001;
+     margin: 10px 0;
+}
+
+div.toolbar {
+     margin: 0em 0em 2em 0em;
+     font-weight: bold;
+     display: none !important;
+}
+
+div.routersummaryouter {
+     float: left; 
+     width: 200px;
+     margin: 0;
+     padding: 0;
+     border: 0;
+     clear: left; /* fixes a bug in Opera */
+}
+
+div.routersummary {
+     background: #ddf;
+     width: 185px;
+     color: inherit;
+     margin: 0;
+     padding: 10px 1px 7px 1px;
+     text-align: center !important;
+     border: 5px solid #bbf;
+     font-size: 9pt;
+     word-wrap: break-word;
+     font: 9pt/125%;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+}
+
+div.routersummary input[type=text] {
+     text-align: right !important;
+}
+
+div.routersummary hr {
+     color: #eef;
+     background: #eef;
+     height: 2px;
+     border-bottom: 1px solid #eef;
+     margin: 8px 1px 7px 1px;
+     -moz-box-shadow: inset 0px 1px 1px 1px #99f;
+}
+
+div.routersummary h3 {
+     border: 0px solid #f00;
+     font-size: 12pt;
+     letter-spacing: 0.05em;
+     margin: -7px 1px -7px 1px;
+     padding: 1px 0;
+     background: #c5d5fb;
+     text-transform: uppercase;
+}
+
+div.routersummary h4 {
+     border: 0px solid #f00;
+     border-bottom: 0 !important;
+     font-size: 10pt;
+     letter-spacing: 0.05em;
+     margin: -7px 1px -7px 1px !important;
+     padding: 1px 3px;
+     background: #c1d1f7;
+     text-transform: capitalize;
+     text-decoration: none !important;
+     color: #2b2;
+}
+
+div.routersummary table {
+     border: 0;
+     text-align: center !important;
+     margin: -5px 4px -5px 3px;
+     width: 180px !important;
+     overflow: hidden;
+     font-size: 9pt;
+     padding: 0 -10px;
+     background-image: none !important;
+     background-color: transparent !important;
+}
+
+div.routersummary tr {
+     background-image: none !important;
+     background-color: transparent !important;
+     border: 0 !important;
+}
+
+div.tunnels table{
+     margin: 0 !important;
+}
+
+.tunnels tr {
+     padding: 2px 0 !important;
+     margin-left: -7px !important;
+}
+     
+div.routersummary form {
+     margin-top: -6px !important;
+     margin-bottom: -4px !important;     
+}
+
+div.refresh {
+     margin-top: 10px !important;
+     margin-bottom: 10px !important;
+     padding: 2px 0 !important;
+}
+
+div.routersummary p {
+     padding: 0;
+}     
+
+div.routersummary a:link, div.routersummary a:visited {
+     text-shadow: 1px 1px 1px rgba(0, 0, 32, 0.3);
+}
+
+div.routersummary a:hover {
+     text-shadow: 1px 1px 1px rgba(255, 96, 0, 0.7);
+     color: #f60;
+}
+
+div.routersummary td {
+     padding: 0 4px;
+     background-image: none !important;
+     border: 0 !important;
+}
+
+div.warning h3 {
+     border-bottom: 5px solid #fb7;
+     padding-bottom: 10px;
+}
+
+div.main {
+     margin: 0px 0px 0px 195px;
+     padding: 15px 15px 10px 15px;
+     background: #eef;
+     border: 5px solid #bbf;
+     border-top: 0;
+     text-align: left;
+     color: #001;
+     min-width: 570px;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+}
+
+div.main ul {
+     margin: -10px 0 -10px -10px;
+}
+
+div.main li {
+     padding: 0 0 5px 0;
+     list-style: square;
+     word-wrap: break-word;
+     margin-right: 20px;
+}
+
+div.main li:first-child {
+     padding-top: 15px;
+}
+
+div.main hr:last-child {
+     margin: 15px 0 10px 0;
+}
+
+div.main textarea {
+     width: 98% !important; 
+     margin: 2px 0 2px 5px;
+     min-height: 96px;
+}
+
+div.main h2 {
+     margin-top: 20px;
+     margin-bottom: -5px;
+}
+
+div.welcome {
+     margin-top: 5px;
+}
+
+div.main h2:first-child, div.main h3:first-child {
+     margin-top: 0px; 
+     margin-bottom: -5px;
+}
+
+div.wideload h2 {
+     margin-bottom: 0px !important;
+}
+
+div.wideload h3:first-child {
+     margin-top: 0 !important;
+}
+
+div.wideload h3 {
+     margin-top: 15px !important;      
+     margin-bottom: 0px !important;
+}
+
+div.wideload p !important {
+     margin-top: 5px;
+}
+
+div.news {
+     margin: -5px 0px 0 195px;
+     padding: -10px 0px 8px 0px;
+     background: #ffffc0;
+     border: 5px solid #bbf;
+     text-align: right;
+     color: #770;
+     min-width: 600px;
+     padding-bottom: 8px;
+     padding-left: 10px;
+     padding-right: 10px;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+     font-size: 7pt;
+}
+
+/* convert the list entry to our title */
+
+div.news li {
+     text-align: justify;
+     list-style: none;
+     margin: 15px 15px -10px -20px;
+     padding: 0px 0 15px 0;
+     border-bottom: 2px dotted #cc7;
+     border-top: 0px solid #cc7;     
+     padding: 3px 5px 5px 0;
+     font-size: 10pt;
+     color: #540;
+}
+
+div.news p {
+     color: #330;
+     font-size: 9pt;
+     margin-bottom: -10px;
+}
+/*
+div.news p:first-child {
+     padding-top: 15px !important;
+}
+
+ 
+div.news p:nth-child(2n) {
+     padding-top: 15px !important;
+}
+*/
+div.news p:last-child {
+     margin-bottom: 10px;
+}
+
+div.news a:link {
+     color: #663;
+     text-shadow: 1px 1px 1px rgba(128, 128, 48, 0.3);
+}
+
+div.news a:visited {
+     color: #773 !important;
+     text-shadow: 1px 1px 1px rgba(128, 128, 48, 0.3);
+}
+
+div.news hr {
+     color: #cc7;
+     background: #cc7;
+     height: 1px;
+     border: 0px solid #cccc77;
+     margin: 2px 0 0 0;
+}
+
+div.confignav {
+     padding: 12px 0 15px 0;
+     background: #cfc;
+     margin: -20px -20px 0 -20px;
+     border: 5px solid #bbf;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+}
+
+div.configure {
+     margin: 1px -20px 0 -20px;
+     padding: 0px 20px 0px 20px;
+}
+
+div.configure hr {
+     margin: 15px 0;
+}
+
+div.configure table {
+     font-size: 9pt;
+     font-weight: bold;
+     border: 1px solid #bbf;
+}
+
+div.configure tr, div.configure td {
+     padding: 10px 2px;
+}
+
+div.configure tr {
+     -moz-box-shadow: inset 0px 0px 1px 0px #bbf;
+}
+
+div.configure li:first-child, div.main li:first-child {
+     margin-top: -10px;
+}
+
+div.configure li:last-child {
+     margin-bottom: -5px;
+}
+
+div.configure h2:first-child {
+     margin-top: 15px;
+}
+
+.topshimten {
+     margin-top: 15px;
+     margin-bottom: 15px;
+} 
+
+div.messages {
+     padding: 0px 10px;
+     background: #fff;
+     border: 5px solid #bbf;
+     border-right: 0;
+     margin: -5px -15px 10px -20px;
+     text-align: center;
+     font-size: 9pt;
+     font-weight: bold;
+     color: #474;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+}
+
+div.messages li, div.messages ul {
+     padding: 10px 0 0 5px;
+     margin: -10px 0 0 0;
+}
+
+div.messages span.error {
+     color: #d00000;
+}
+
+div.messages span.notice {
+     font-style: italic;
+}
+
+h1 {
+     font-size: 18pt;
+     text-shadow: 1px 1px 1px rgba(0, 0, 32, 0.7);
+     text-align: center;
+     border: 5px solid #bbf;
+     padding: 13px 10px 12px 10px;
+     margin: 0 0px 0 195px;
+     line-height: 93%;
+     text-transform: uppercase;
+     letter-spacing: 0.3em;
+     background: #fff;
+     min-width: 600px;
+     -moz-box-shadow: inset 0px 0px 0px 1px #99f;
+}
+
+h2 {
+     font-size: 14pt;
+     padding: 0px 10px 10px 10px;
+     border-bottom: 3px solid #aaf;
+     border-top: 0px solid #aaf;
+     letter-spacing: 0.04em;
+}
+
+h3 {
+     font-size: 12pt;
+     font-family:<EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
+     padding: 0 10px 10px 10px;
+     border-bottom: 3px solid #aaf;
+     border-top: 0px solid #aaf;
+     letter-spacing: 0.04em;
+     margin-bottom: 10px;
+}
+
+.proxyfooter{
+     font-size: 7pt;
+     display: none !important;
+}
+
+table {
+     border-collapse: collapse; 
+     border: 1px solid #bbf;
+     margin: 0 0 5px 0;
+     cell-padding: 1px;
+     font-size: 7.5pt;
+     background: #fff;
+     width: 100%;
+}
+
+table hr {
+     padding: 0px 0;
+     color: #bbf;
+     background: #bbf;
+     border: 0px solid #bbf;
+     margin: 0px -5px;
+     height: 1px;
+}
+
+table tt {
+     font-size: 7.5pt;
+}
+
+th {
+     background-color: #fff;
+     padding: 8px 2px;
+     text-align: center;
+     border-bottom: 1px solid #bbf;
+}
+
+tt {
+     font-size: 8pt;
+}
+
+tt, pre {
+     font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+}
+     
+td {
+     padding: 4px;
+}
+
+tr:nth-child(even) {
+     background-color: #eef;
+}
+
+tr:nth-child(odd) {
+     background-color: #ddf;
+}
+
+hr {
+     color: #aaf;
+     background: #aaf;
+     height: 3px;
+     border: 0px solid #aaf;
+     margin: 3px 0;
+}
+
+.statusnotes {
+     font-style: italic;
+     font-size: 8pt;
+     color: #001;
+     text-align: center;
+     margin: -7px 0 7px 0; 
+     background: #bbf;
+     border: 5px solid #bbf;
+     border-top: 0;
+     padding: 4px 0 2px 0;
+}
+
+div.joblog {
+     margin: 10px 0;
+     line-height: 130% !important;
+}
+
+div.joblog:li {
+     word-wrap: break-word !important;
+     text-align: justify !important;
+     line-height: 80% !important;
+}
+
+div.joblog:ul {
+     word-wrap: break-word !important;
+     text-align: justify;
+}
+
+div.joblog li:first-child {
+     margin-top: -10px;
+}
+
+div.joblog li:last-child {
+     margin-bottom: -10px;
+}
+
+div.joblog form:first-child {
+     margin-top: 10px;
+}
+
+div.joblog table {
+     margin-top: 15px;
+}
+
+div.joblog p {
+     line-height: 130%;
+}
+
+div.joblog h3 {
+     margin: 10px 0 10px 0;
+}
+
+div.joblog h3:first-child {
+     margin: 5px 0 15px 0;
+}
+
+div.joblog hr {
+     margin: 15px 0 15px;
+}
+
+div.joblog ol {
+     margin-bottom: 0px;
+}
+ 
+input {
+     margin: 3px 5px 3px 0;
+     vertical-align: middle;
+}
+
+input[type=text] {
+     margin: 3px 5px 3px 5px;
+     vertical-align: middle;
+}
+select {
+     margin: 3px 5px 3px 5px;
+     vertical-align: middle;
+}
+
+submit {
+     margin: 3px 5px 3px 5px;
+     padding: 2px 0;
+     font: 8pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+}
+
+table td b{
+      font-weight:normal;
+}
+
+p {
+     padding: 5px 20px 0px 20px;
+     text-align: justify;
+}
+
+.formaction {
+     text-align: right;
+     margin: -10px -5px;
+}
+
+.langbox {
+     margin: 10px -20px 0px 5px;
+     color: #001;
+     font-size: 7pt;
+     width: 220px;
+     text-align: center;
+     float: right;
+     valign: middle;
+}
+
+.langbox img {
+     padding: 0 2px; /* Ignored by IE8 */
+}
+
+.links {
+     padding-bottom: -2px;
+     text-align: justify;
+     margin-top: 5px !important;
+}
+
+.links li {
+     list-style-image: url("../images/link.png") !important;
+}
+
+a{
+     white-space:nowrap; 
+}
+
+a:link{
+     color: #006;
+     text-decoration: none;
+}
+
+a:visited{
+     color: #448;
+     text-decoration: none;
+}
+
+a:hover{
+     color: #f60;
+     text-decoration: underline;
+}
+
+a:active{
+     color: #f93;
+     text-decoration: underline;
+     font-weight: bold;
+}
+
+pre {
+     font-size: 9pt;
+     margin: 0px 20px;
+}
+
+tt {
+     font-size: 9pt;
+     font-weight: bold;
+     color: darkgreen;
+}
+
+.tablefooter {
+     border: 1px solid #bbf;
+}
+
+.tablefooter tr, .tablefooter td {
+     background: #bbf;
+     font-size: 8pt;
+     font-weight: bold;
+     line-height: 150%;
+     word-wrap: nowrap;
+     padding: 8px 1px;
+     border-top: 2px solid #bbf;
+}
+
+.tidylist {
+     text-align: justify;
+     padding-right: 30px;
+     margin-right: 20px;
+}
+
+div.graphspanel {
+     padding: 15px 5px 20px 5px;
+     margin: -20px;
+     background: #ddf url('images/lightbluetile.png');
+     -moz-border-radius: 4px;
+     -khtml-border-radius: 4px;
+     border-radius: 4px;
+     border: 5px solid #bbf;
+     -moz-box-shadow: inset 0px 0px 1px 0px #002;
+     text-align: center !important;   
+}
+
+div.graphspanel img {
+     border: 1px solid #77f;
+     padding: 2px;
+     margin: 6px;
+     background: #ccf;
+     -moz-box-shadow: inset 0px 0px 0px 0px #002;
+     opacity: 0.9;
+}
+
+div.graphspanel img:hover {
+     border: 1px solid #003;
+     padding: 2px;
+     margin: 6px;
+     text-align: center !important;
+     background: #001;
+     -moz-box-shadow: inset 0px 0px 2px 1px #f60;
+     opacity: 1;
+}
+
+div.graphspanel hr {
+     margin: 10px 0;
+}
+
+div.graphspanel form:last-child {
+     text-align: left;
+     margin: 0 20px;
+}
+
+div.graphspanel h3 {
+     text-align: left;
+     margin: 10px 20px 10px 20px;
+}

installer/resources/themes/console/dark/console.css

@@ -126,8 +126,8 @@ div.routersummary h3 {
      border: 0;
      font-size: 9.5pt;
      letter-spacing: 0.04em;
-     margin: -7px -9px -10px -9px;
+     margin: -7px -9px -8px -9px;
-     padding: 3px 0 4px 0;
+     padding: 2px 0 3px 0 !important;
      background: #007;
      text-transform: uppercase;
      -moz-border-radius: 0;
@@ -143,7 +143,7 @@ div.routersummary h4 {
      font-size: 8.5pt;
      letter-spacing: 0.03em;
      margin: -7px -9px -10px -9px !important;
-     padding: 2px 3px 5px 3px;
+     padding: 1px 3px 4px 3px;
      background: #005;
      text-transform: capitalize;
      text-decoration: none !important;
@@ -154,11 +154,11 @@ div.routersummary h4 {
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -4px -4px -4px -5px !important;
+     margin: -5px -4px -5px -5px !important;
      width: 185px !important;
      overflow: hidden;
      font-size: 8pt;
-     padding: 0px -10px;
+     padding: 0 -10px;
      background-image: none !important;
      background-color: transparent !important;
 }
@@ -169,12 +169,6 @@ div.routersummary tr {
      border: 0 !important;
 }
 
-/*
-div.routersummary form {
-     margin-top: 8px;
-}
-*/
-
 div.routersummary form {
      margin: -6px 0 -7px;
 }
@@ -203,21 +197,29 @@ div.routersummary a:hover {
 }
 
 div.routersummary td {
-     padding: 2px 2px 1px 2px;
+     padding: 0px 2px 0px 2px;
      background-image: none !important;
      border: 0 !important;
 }
 
 div routersummary hr:last-child {
      margin-top: 5px;
-     margin-bottom: 0px !important;
+     margin-bottom: -5px !important;
 }
 
 div.tunnels {
-     padding-top: 2px !important;
+     padding-top: 3px !important;
      margin-left: -2px;
 }
 
+div.tunnels table {
+     margin: -3px 0 !important;
+}
+
+div.tunnels td {
+     padding: 1px 2px 1px 2px;
+}
+
 div.warning {
      margin: 5px 20px 10px 240px;
      padding: 5px 25px 20px 75px;
@@ -727,7 +729,7 @@ hr {
 
 hr:last-child {
      margin-top: 20px;
-     margin-bottom: 20px !important;
+     margin-bottom: 20px;
 }
 
 sidebarlogo {
@@ -886,8 +888,9 @@ div.joblog:ul {
 div.joblog li:first-child {
      margin-top: 10px;
 }
+
 div.joblog li:last-child {
-     margin-bottom: -15px;
+     margin-bottom: 0;
 }
 
 div.joblog form:first-child {

installer/resources/themes/console/light/console.css

@@ -119,12 +119,17 @@ div.routersummary hr {
      -moz-box-shadow: inset 0px 1px 1px 1px #001;
 }
 
+div routersummary hr:last-child {
+     margin-top: 5px;
+     margin-bottom: -5px !important;
+}
+
 div.routersummary h3 {
      border: 0;
      font-size: 9.5pt;
      letter-spacing: 0.04em;
      margin: -7px -9px -7px -9px;
-     padding: 3px 0;
+     padding: 1px 0;
      background: #c5d5fb;
      text-transform: uppercase;
      background-image: -moz-linear-gradient(top, bottom, from(#ddf), to(#c5d5fb), color-stop(25%, #c5d5fb), color-stop(100%, #ddf));
@@ -136,7 +141,7 @@ div.routersummary h4 {
      font-size: 8.5pt;
      letter-spacing: 0.02em;
      margin: -7px -9px -7px -9px !important;
-     padding: 2px 3px 3px 3px;
+     padding: 0px 3px 1px 3px;
      background: #c1d1f7;
      text-transform: capitalize;
      text-decoration: none !important;
@@ -146,7 +151,7 @@ div.routersummary h4 {
 div.routersummary table {
      border: 0;
      text-align: center !important;
-     margin: -5px -5px;
+     margin: -7px -5px -6px -5px;
      width: 185px !important;
      overflow: hidden;
      font-size: 8pt;
@@ -162,10 +167,10 @@ div.routersummary tr {
 }
 
 div.tunnels {
-     margin-top: 5px !important;
+     margin-top: 6px !important;
      margin-left: -2px !important;
      margin-bottom: 3px !important;
-     padding-top: 1px;
+     padding-top: 3px !important;
 }
 
 .tunnels tr {
@@ -177,8 +182,8 @@ div.routersummary form {
 }
 
 div.routersummary form:last-child {
-     margin: 4px 0 -12px 0 !important;
+     margin: 0 !important;
-     padding: 4px;
+     padding: 0;
 }
 
 div.routersummary p {
@@ -206,16 +211,6 @@ div.routersummary td {
      border: 0 !important;
 }
 
-div.routersummary tr:nth-child(even) {
-     background-color: #f60;
-     background-image: none !important;
-}
-
-div.routersummarytr:nth-child(odd) {
-     background-color: #f00;
-     background-image: none !important;
-}
-
 /* proxy error messages */
 
 div.warning {
@@ -904,22 +899,25 @@ div.joblog {
      overflow: auto;
  }
  
+ div.joblog:ul {
+     word-wrap: break-word !important;
+     text-align: justify;
+     line-height: 100% !important;
+}
+
  div.joblog:li {
      word-wrap: break-word !important;
      text-align: justify !important;
      line-height: 80% !important;
-}
+     padding: 0;
-
-div.joblog:ul {
-     word-wrap: break-word !important;
-     text-align: justify;
 }
 
 div.joblog li:first-child {
      margin-top: 10px;
+
 }
 div.joblog li:last-child {
-     margin-bottom: -15px;
+     margin-bottom: 5px;
 }
 
 div.joblog form:first-child {

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 = 5;
+    public final static long BUILD = 6;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;