diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index 629fc95f05b294dc8abd9c3ee9f758055889ef65..607b4b00a8a0294f0eaa10a060775c51f10c9e36 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/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")
- # cssHelper.title("foo")
+ # _x("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
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index 715c800931a7c1148ff248e76149a30bbc111ed7..d4f825a9a1acf400af350f2435f1239a9a1d1ed1 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/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);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 7815f5cba1e08b2f286156a2475b04357fc3d84f..96556b418af5a8f423baf10805545ad21254199e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/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();
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
index 63762ec14d8f1651db5c8f09e07cf8ac98c3002c..e5e640957d7fdbc2966ea15dc9c77d904c16fa51 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java
+++ b/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;
+ }
}
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java
index df7c5319f3fb0dc3fd090fa09c3bb8924d7242f5..a251f7e12466722918b5e8703c98a6bec70fc360 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java
+++ b/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;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index e7d6ee4126a09fce625028a2508f633d063d2276..7a9d91d5bdd14ac5c770de1df86598e32c555c16 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/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");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 20b7b77cd33165dec43417d70df68242ac6111e6..cffca854db5dcc571eaa4cf3bbe6f89c4eb10d6c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/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 & 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 & 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…\" title=\"Tunnel building in progress…\"></td></tr>\n");
+ buf.append("<td><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Building…\" title=\"Building tunnels…\"></td></tr>\n");
}
}
buf.append("</table></div><hr>\n");
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index d33bf38c9f318e1579bedfed8d9b5517b2203351..069818e1b3feb3fe61491d328ff84a01ad97ce1d 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/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>
- <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
+ <h3><%=intl._("Bandwidth limiter")%></h3><p>
+ <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("I2P requires at least 12KBps to enable sharing. ");
- out.print("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("<p><b>"+intl._("NOTE")+"</b>: You have configured I2P to share only " + share + "KBps. ");
+ out.print(intl._("I2P requires at least 12KBps to enable sharing. "));
+ out.print(intl._("Please enable sharing (participating in tunnels) by configuring more bandwidth. "));
+ 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("The higher the share bandwidth the more you improve your anonymity and help the network.<hr>");
+ out.print("<p>" + intl._("You have configured I2P to share") + "<b> " + share + "KBps</b>. ");
+ 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>
- <b>The default settings will work for most people. There is <a href="#chelp">help below</a>.</b>
- </p><p><b>UPnP Configuration:</b><br>
+ <h3><%=intl._("IP and Transport Configuration")%></h3><p>
+ <b><%=intl._("The default settings will work for most people.")%> There is <a href="#chelp">help below</a>.</b>
+ </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>
- </p><p><b>IP Configuration:</b><br>
- Externally reachable hostname or IP address:<br>
+ <%=intl._("Enable UPnP to open firewall ports")%> - <a href="peers.jsp#upnp"><%=intl._("UPnP status")%></a>
+ </p><p><b><%=intl._("IP Configuration")%>:</b><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>
- </p><p><b>UDP Configuration:</b><br>
- UDP port:
+ <%=intl._("Hidden mode - do not publish IP")%> <i><%=intl._("(prevents participating traffic)")%></i><br>
+ </p><p><b><%=intl._("UDP Configuration:")%></b><br>
+ <%=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>
- Externally reachable hostname or IP address:<br>
+ <b><%=intl._("TCP Configuration")%>:</b><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
- <i>(currently <jsp:getProperty name="nethelper" property="udpIP" />)</i>
- if we are not firewalled<br>
+ <%=intl._("Use auto-detected IP address")%>
+ <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
+ <%=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
- <i>(currently <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
+ <%=intl._("Use the same port configured for UDP")%>
+ <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>
- 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.
+</div><h3><a name="chelp"><%=intl._("Configuration Help")%>:</a></h3><div align="justify"><p>
+ <%=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.")%>
</p><p>
- If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach
- you. If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching
- with "SSU introductions" to relay traffic. 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. Certain firewalls such as symmetric NATs may not work well with I2P.
+ <%=intl._("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%>
+ <%=intl._("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%>
+ <%=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.")%>
+ <%=intl._("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
- and forward ports.
- UPnP support is beta, and may not work for any number of reasons:
+ <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>
+ <%=intl._("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">UPnP disabled on the device
-<li class="tidylist">Software firewall interference with UPnP
-<li class="tidylist">Bugs in the device's UPnP implementation
-<li class="tidylist">Multiple firewall/routers in the internet connection path
-<li class="tidylist">UPnP device change, reset, or address change
-</ul><br>
+<li class="tidylist"><%=intl._("No UPnP-compatible device present")%>
+<li class="tidylist"><%=intl._("UPnP disabled on the device")%>
+<li class="tidylist"><%=intl._("Software firewall interference with UPnP")%>
+<li class="tidylist"><%=intl._("Bugs in the device's UPnP implementation")%>
+<li class="tidylist"><%=intl._("Multiple firewall/routers in the internet connection path")%>
+<li class="tidylist"><%=intl._("UPnP device change, reset, or address change")%>
+</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.
-<p>Hostnames entered above will be published in the network database.
+<%=intl._("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%></p>
+<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
- hostname, or do not properly configure your NAT or firewall, your network performance will degrade
- substantially. When in doubt, leave the settings at the defaults.
+ <%=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.")%>
+ <%=intl._("When in doubt, leave the settings at the defaults.")%>
</p>
-<h3><a name="help">Reachability Help:</a></h3><p>
- While I2P will work fine behind most firewalls, your speeds and network integration will generally improve
- if the I2P port (generally 8887) to both UDP and TCP.
- 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.
+<h3><a name="help"><%=intl._("Reachability Help")%>:</a></h3><p>
+ <%=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.")%>
+ <%=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 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>Firewalled</b> - Your UDP port appears to be firewalled.
- As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.
- However, if it appears consistently, you should check whether both your external and internal
- firewalls are open on port 8887. I2P will work fine when firewalled, there is no reason for concern.
- When firewalled, the router uses "introducers" to relay inbound connections.
- However, you will get more participating traffic and help the network more if you can open your
- firewall(s). 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
- limitations or bugs that prevent them from passing traffic through to I2P.
-<li class="tidylist"><b>Testing</b> - 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,
- 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,
- but you are firewalled. 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.
-<li class="tidylist"><b>WARN - Firewalled and Floodfill</b> - You have configured I2P to be a floodfill router, but
- you are firewalled. 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
- 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
- you via TCP, which will hurt the network. Please open your firewall or disable inbound TCP above.
-<li class="tidylist"><b>WARN - Firewalled with UDP Disabled</b> -
- You have configured inbound TCP, however
- you have disabled UDP. You appear to be firewalled on TCP, therefore your router cannot
- accept inbound connections.
- Please open your firewall or enable UDP.
-<li class="tidylist"><b>ERR - Clock Skew</b> - Your system's clock is skewed, which will make it difficult
- to participate in the network. 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
- 127.0.0.1 or 192.168.1.1 as your external address. Correct the address or disable inbound TCP above.
-<li class="tidylist"><b>ERR - SymmetricNAT</b> - I2P detected that you are firewalled by a Symmetric NAT.
- 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.
-<li class="tidylist"><b>ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart</b> -
- I2P was unable to bind to port 8887 or other configured port.
- Check to see if another program is using port 8887. If so, stop that program or configure
- I2P to use a different port. This may be a transient error, if the other program is no longer
- using the port. However, a restart is always required after this error.
-<li class="tidylist"><b>ERR - UDP Disabled and Inbound TCP host/port not set</b> -
- You have not configured inbound TCP with a hostname and port above, however
- you have disabled UDP. Therefore your router cannot accept inbound connections.
- Please configure a TCP host and port above or enable UDP.
-<li class="tidylist"><b>ERR - Client Manager I2CP Error - check logs</b> -
- This is usually due to a port 7654 conflict. Check the logs to verify. Do you have another I2P instance running?
- Stop the conflicting program and restart I2P.
- </ul><hr>
+<li class="tidylist"><b><%=intl._("OK")%></b> -
+ <%=intl._("Your UDP port does not appear to be firewalled.")%>
+<li class="tidylist"><b><%=intl._("Firewalled")%></b> -
+ <%=intl._("Your UDP port appears to be firewalled.")%>
+ <%=intl._("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%>
+ <%=intl._("However, if it appears consistently, you should check whether both your external and internal firewalls are open on port 8887.")%>
+ <%=intl._("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%>
+ <%=intl._("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%>
+ <%=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.")%>
+ <%=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.")%>
+<li class="tidylist"><b><%=intl._("Testing")%></b> -
+ <%=intl._("The router is currently testing whether your UDP port is firewalled.")%>
+<li class="tidylist"><b><%=intl._("Hidden")%></b> -
+ <%=intl._("The router is not configured to publish its address, therefore it does not expect incoming connections.")%>
+<li class="tidylist"><b><%=intl._("WARN - Firewalled and Fast")%></b> -
+ <%=intl._("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%>
+ <%=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.")%>
+<li class="tidylist"><b><%=intl._("WARN - Firewalled and Floodfill")%></b> -
+ <%=intl._("You have configured I2P to be a floodfill router, but you are firewalled.")%>
+ <%=intl._("For best participation as a floodfill router, you should open your firewall.")%>
+<li class="tidylist"><b><%=intl._("WARN - Firewalled with Inbound TCP Enabled")%></b> -
+ <%=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.")%>
+ <%=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.")%>
+ <%=intl._("Please open your firewall or disable inbound TCP above.")%>
+<li class="tidylist"><b><%=intl._("WARN - Firewalled with UDP Disabled")%></b> -
+ <%=intl._("You have configured inbound TCP, however you have disabled UDP.")%>
+ <%=intl._("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%>
+ <%=intl._("Please open your firewall or enable UDP.")%>
+<li class="tidylist"><b><%=intl._("ERR - Clock Skew")%></b> -
+ <%=intl._("Your system's clock is skewed, which will make it difficult to participate in the network.")%>
+ <%=intl._("Correct your clock setting if this error persists.")%>
+<li class="tidylist"><b><%=intl._("ERR - Private TCP Address")%></b> -
+ <%=intl._("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%>
+ <%=intl._("Correct the address or disable inbound TCP above.")%>
+<li class="tidylist"><b><%=intl._("ERR - SymmetricNAT")%></b> -
+ <%=intl._("I2P detected that you are firewalled by a Symmetric NAT.")%>
+ <%=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.")%>
+<li class="tidylist"><b><%=intl._("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%></b> -
+ <%=intl._("I2P was unable to bind to port 8887 or other configured port.")%>
+ <%=intl._("Check to see if another program is using port 8887. If so, stop that program or configure I2P to use a different port.")%>
+ <%=intl._("This may be a transient error, if the other program is no longer using the port.")%>
+ <%=intl._("However, a restart is always required after this error.")%>
+<li class="tidylist"><b><%=intl._("ERR - UDP Disabled and Inbound TCP host/port not set")%></b> -
+ <%=intl._("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%>
+ <%=intl._("Therefore your router cannot accept inbound connections.")%>
+ <%=intl._("Please configure a TCP host and port above or enable UDP.")%>
+<li class="tidylist"><b><%=intl._("ERR - Client Manager I2CP Error - check logs")%></b> -
+ <%=intl._("This is usually due to a port 7654 conflict. Check the logs to verify.")%>
+ <%=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>
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index 00e4a193a19030fe0254466f329f0f3e5c140be9..c4f72738ee310cecfda57969875f9e9ee1b9b7c5 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/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>
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index 81efcd76b64d41dfc196d7fbe04971f5f727d40a..b4fd6afd6942f6ec5468a2ff6aafdc664090a96b 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/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>
- The Java clients listed below are started by the router and run in the same JVM.
+ <h3><%=intl._("Client Configuration")%></h3><p>
+ <%=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
-<%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>.
-All changes require restart to take effect.</i>
+ </p><p><i><%=intl._("To change other client options, edit the file")%>
+ <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>.
+ <%=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>
- 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).
+</div></div><h3><%=intl._("WebApp Configuration")%></h3><p>
+ <%=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).")%>
</p><p>
- 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.
+ <%=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.")%>
</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>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index 02e3845de8d0db14ca9a5c2a1efe2e1bf48ba2aa..ac06feafefe66a697e024516a0716d774b515d2c 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/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>
- The router keyring is used to decrypt encrypted leaseSets.
- The keyring may contain keys for local or remote encrypted destinations.
+<div class="configure"><h2><%=intl._("Keyring")%></h2><p>
+ <%=intl._("The router keyring is used to decrypt encrypted leaseSets.")%>
+ <%=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>
- Enter keys for encrypted remote destinations here.
+ <h3><%=intl._("Manual Keyring Addition")%></h3><p>
+ <%=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>
- <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
+ <p><table><tr>
+ <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>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index b4a08ee19c8f766e44935f60aba5c9d3f0a04175..1c0c92951b42a74c1f79f2be17b0bb392458d1df 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/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>
- </tr><tr><td class="mediumtags" align="right"><b>Log record format:</b></td>
+ <br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></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,
- 'm' = message)</i></td>
- </tr><tr><td class="mediumtags" align="right"><b>Log date format:</b></td>
+ <br> <i><%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
+ </i></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'
- = second, 'SSS' = millisecond)</i></td>
- </tr><tr><td class="mediumtags" align="right"><b>Max log file size:</b></td>
+ <br> <i><%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
+ </i></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>
- <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i>(DEBUG and INFO are not recommended defaults,
- as they will drastically slow down your router)</i></td>
- </tr><tr><td class="mediumtags" align="right"><b>Log level overrides:</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><%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
+ </i></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">
diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsp
index bba31052ec868fa567b9f44acc172a61d91f5931..699a57237181967018b1ede5ee445362b03d9153 100644
--- a/apps/routerconsole/jsp/confignav.jsp
+++ b/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) {
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index b6838df826d7194812ffab40b36850db93861e09..8d6297c0220410eb148f883f4390726f7296974b 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/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>
- <div class="mediumtags">Router Hash:
- <input type="text" size="55" name="peer" value="<%=peer%>" /></div>
- <h3>Manually Ban / Unban a Peer</h3>
- Banning will prevent the participation of this peer in tunnels you create.
+ <h2><%=intl._("Manual Peer Controls")%></h2>
+ <div class="mediumtags"><p><%=intl._("Router Hash")%>:
+<input type="text" size="55" name="peer" value="<%=peer%>" /></p></div>
+ <h3><%=intl._("Manually Ban / Unban a Peer")%></h3>
+ <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>
- 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">profiles page</a>.<br>
+ <h3><%=intl._("Adjust Profile Bonuses")%></h3>
+ <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>
<% 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>
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 45b5e435faa030e3d676598619c607a4930f3705..91eac223a82ab50e25676e83dc71fcd9aec8fa90 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/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>
- <p>Graceful shutdown lets the router satisfy the agreements it has already made
- before shutting down, but may take a few minutes. If you need to kill the
- router immediately, that option is available as well.</p>
+ <h3><%=intl._("Shutdown the router")%></h3>
+ <p><%=intl._("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%>
+ <%=intl._("If you need to kill the 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
- the following. This is useful in some situations - 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. A graceful restart will take a few minutes (but your peers
- will appreciate your patience), while a hard restart does so immediately. After tearing down
- the router, it will wait 1 minute before starting back up again.</p>
+ <p><%=intl._("If you want the router to restart itself after shutting down, you can choose one of the following.")%>
+ <%=intl._("This is useful in some situations")%> -
+ <%=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.")%>
+ <%=intl._("A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately.")%>
+ <%=intl._("After tearing down 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>
- <p>On the windows platform, there is a small application to sit in the system
- tray, allowing you to view the router's status (later on, I2P client applications
- will be able to integrate their own functionality into the system tray as well).
- If you are on windows, you can either enable or disable that icon here.</p>
+ <h3><%=intl._("Systray integration")%></h3>
+ <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")%>
+ <%=intl._("(later on, I2P client applications 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>
<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>
- <p>You can control whether I2P is run on startup or not by selecting one of the
- following options - I2P will install (or remove) a service accordingly. You can
- also run the <code>install_i2p_service_winnt.bat</code> (or
- <code>uninstall_i2p_service_winnt.bat</code>) from the command line, if you prefer.</p>
+</div><h3><%=intl._("Run on startup")%></h3>
+ <p><%=intl._("You can control whether I2P is run on startup or not by selecting one of the following options")%> -
+ <%=intl._("I2P will install (or remove) a service accordingly.")%>
+ <%=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>).</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
- down your router immediately. You may want to consider shutting down gracefully, as
- above, then running uninstall_i2p_service_winnt.bat.</p>
+ <p><b><%=intl._("Note")%>:</b> <%=intl._("If you are running I2P as service right now, removing it will shut down your router immediately.")%>
+ <%=intl._("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%></p>
<% } %>
<% if (System.getProperty("wrapper.version") != null) { %>
- <h3>Debugging</h3>
- <p>At times, it may be helpful to debug I2P by getting a thread dump. To do so,
- please select the following option and review the thread dumped to
+ <h3><%=intl._("Debugging")%></h3>
+ <p> At times, it may be helpful to debug I2P by getting a thread dump.
+ 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>
- <p>I2P's main configuration interface is this web console, so for your convenience
- 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> whenever
- the router starts up.</p>
+ <h3><%=intl._("Launch browser on router startup?")%></h3>
+ <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")%>
+ <a href="http://127.0.0.1:7657/index.jsp">http://127.0.0.1:7657/index.jsp</a> .</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" />
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 53dc83eda4091bdc521316bd5313de71a60e2be1..cfb2dd8ccd755c75f62a4199491210399e11efab 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/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>
- <p>Enable full stats?
+ <h3><%=intl._("Configure I2P Stat Collection")%></h3>
+ <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>
- 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._("change requires restart to take effect")%>)<br>
+ <%=intl._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
+<%=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>Graph</b></td>
+ <td align="center"><b><%=intl._("Log")%></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>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index f9185a01aa1a6c1d826f2c0b27c621ea465745fb..01daf0ffe615943fb9efd343f743a9df46310d35 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/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,23 +21,23 @@
<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>
- NOTE: The default settings work for most people.
- There is a fundamental tradeoff between anonymity and performance.
- 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.
- Change these settings with care, and adjust them if you have problems.
- </i></p><div class="wideload">
- <form action="configtunnels.jsp" method="POST">
+ <div class="configure"><p>
+ <%=intl._("NOTE")%>:
+ <%=intl._("The default settings work for most people.")%>
+ <%=intl._("There is a fundamental tradeoff between anonymity and performance.")%>
+ <%=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.")%>
+ <%=intl._("High CPU and/or high outbound bandwidth usage may result.")%>
+ <%=intl._("Change these settings with care, and adjust them if you have problems.")%>
+<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);
System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce", new java.util.Random().nextLong()+""); %>
<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>
- <i>Client tunnel changes are temporary and are not saved.</i><br>
- <i>To make permanent client tunnel changes see the </i><a href="i2ptunnel/index.jsp">i2ptunnel page</a>.<br>
+ <%=intl._("Note")%>: <%=intl._("Exploratory tunnel setting changes are stored in the router.config file.")%>
+ <%=intl._("Client tunnel changes are temporary and are not saved.")%>
+<%=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>
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index a3a2cb47d36f8e3f8ad5b16da61015c86c7bdf08..8742ba844020757fd98ed50ba5062e581120685c 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/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>
-<%
- // userAgent defined in confignav
- if (userAgent == null || !userAgent.contains("MSIE")) {
-%>
+<div class="configure"><div class="topshimten"><h3><%=uihelper._("Router Console Theme")%></h3></div>
<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="action" value="blah" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce")%>" >
+ <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
-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.
+<%=uihelper._("Theme selection disabled for Internet Explorer, sorry.")%>
+<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>
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index e7562de9f7106e1d9eec4cb853f6ec5cf6da6c85..bda8864c8214aa347d05e5c86118d2a1cbb733e4 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/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 & 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" />
+ <tr><td class= "mediumtags" align="right"><b><%=intl._("News & I2P Updates")%>:</b></td>
+ <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">
diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp
index 865e907235f5565ec35b8b0aef506d0c8a36a283..613b32a6785538f0aa56feda521723e59c207638 100644
--- a/apps/routerconsole/jsp/css.jsp
+++ b/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:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+<jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" />
+<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]-->
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index f865e85d8be63a8e011dfc24a4055b23c5539adf..c2954316406d593f4df45edb8997ddd2b382650b 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/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>
-Error 404: <%=ERROR_URI%> not found.
+<%=intl._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%><hr>
+<%=intl._("Error 404")%>: <%=ERROR_URI%> <%=intl._("not found")%>.
</div></body></html>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index 2a30675d945217146361b4a404081410849d3b0c..1ad8730416318b8f91a4818724585205d8c0f651 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/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">
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index d2ce8ffc2d36517c0ca03aec0826c66e79c7bba4..2fbfb6dc113baeb977383cb4fcb61e50a89b79e9 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/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"); %>
diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp
index 0b51d716560777cff586845675bcc53ae243017b..c53ea0a445fbf4ea60fb88942a4161a8d687e5a5 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/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>
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 26f7d2ea79f2d430c75ee868bda711141bfa3305..859aba705d4a273d2551eac5d53dfeb30bc1ea0b 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/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>
- <i>Please include this information in bug reports:</i>
+ <div class="joblog"><h3><%=intl._("I2P Version & Running Environment")%></h3><a name="version"> </a>
+ <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>
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index 83136b1137273a042e529b7c2c32661497abf8f3..bc954d2bfff7bc80c3c96546e9c4703f474cf81d 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/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" />
diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp
index 7ac5c7cfe7c5196021bea2e91db3ae4ca8a52983..7617ec565cd9b98c6b36b695df03a16ec272d3c9 100644
--- a/apps/routerconsole/jsp/oldstats.jsp
+++ b/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>
diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp
index 19b1d676729a2e2f7e0bda9a7e57ebde3dbc7459..351ad10b6a01ee71ce83da31666f15efd03b5aab 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/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")%>" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index fb61048f378fa3962c1bc4e7811518609eae3873..6064067ff9d39f3b2461605ca9feb7a7532fc915 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/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")%>" />
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp
index e58ac07af2c9fe806e4eaf9679af2bb2c2c8fc13..9c126be703f0d0bf3c09e233ce70759de11654c5 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/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")%>" />
diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po
index 905828c4d097225a891fb0a58699c6c90033d429..e6cb005fa31dd6ff3d15a8bde8fa9472312f3720 100644
--- a/apps/routerconsole/locale/messages_de.po
+++ b/apps/routerconsole/locale/messages_de.po
@@ -1,281 +1,1444 @@
-# I2P
-# Copyright (C) 2009 The I2P Project
-# This file is distributed under the same license as the routerconsole package.
-# To contribute translations, see http://www.i2p2.de/newdevelopers
-# foo <foo@bar>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: I2P routerconsole\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-20 11:55+0000\n"
-"PO-Revision-Date: 2009-10-19 12:50+0000\n"
-"Last-Translator: foo <foo@bar>\n"
-"Language-Team: foo <foo@bar>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:95
-msgid "config update"
-msgstr "config update in german test test test"
-
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334
-msgid "Update policy"
-msgstr "Update policy in german foobarbaz"
-
-#: src/net/i2p/router/web/CSSHelper.java:36
-#: src/net/i2p/router/web/SummaryBarRenderer.java:26
-#: src/net/i2p/router/web/SummaryBarRenderer.java:28
-msgid "I2P Router Console"
-msgstr ""
-
-#: src/net/i2p/router/web/ConfigUpdateHelper.java:90
-msgid "Notify only"
-msgstr "Notify only in german"
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:42
-msgid "I2P Services"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:48
-msgid "Manage your I2P hosts file here (I2P domain name resolution)"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:50
-msgid "Addressbook"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:54
-msgid "Built-in anonymous BitTorrent Client"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:56
-msgid "Torrents"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:60
-msgid "Anonymous webmail client"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:62
-msgid "Webmail"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:66
-msgid "Anonymous resident webserver"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:68
-msgid "Webserver"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:72
-msgid "Configure I2P Router"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:74
-msgid "I2P Internals"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:80
-#: src/net/i2p/router/web/SummaryBarRenderer.java:344
-msgid "View existing tunnels and tunnel build status"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:82
-msgid "Tunnels"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:86
-#: src/net/i2p/router/web/SummaryBarRenderer.java:221
-msgid "Show all current peer connections"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:88
-#: src/net/i2p/router/web/SummaryBarRenderer.java:223
-msgid "Peers"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:92
-msgid "Show recent peer performance profiles"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:94
-msgid "Profiles"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:98
-msgid "Show list of all known I2P routers"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:100
-msgid "NetDB"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:104
-msgid "Health Report"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:106
-msgid "Logs"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:110
-msgid "Show the router's workload, and how it's performing"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:112
-msgid "Jobs"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:116
-msgid "Graph router performance"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:118
-msgid "Graphs"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:122
-msgid "Textual router performance statistics"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:124
-msgid "Stats"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:134
-msgid "I2P Router Help"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:136
-msgid "General"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:139
-msgid "Your unique I2P router identity is"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:143
-msgid "never reveal it to anyone"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:145
-msgid "Local Identity"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:150
-msgid "Version"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:157
-msgid "How long we've been running for this session"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:160
-msgid "Uptime"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:167
-msgid ""
-"Help with configuring your firewall and router for optimal I2P performance"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:194
-msgid "Download"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:198
-#: src/net/i2p/router/web/SummaryBarRenderer.java:207
-msgid "Update"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:203
-msgid "Download Unsigned"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:229
-msgid "Active"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:237
-msgid "Fast"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:243
-msgid "High capacity"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:249
-msgid "Integrated"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:255
-msgid "Known"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:270
-msgid "Help with firewall configuration"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:272
-msgid "Check NAT/firewall"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:309
-msgid "Configure router bandwidth allocation"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:311
-msgid "Bandwidth in/out"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:328
-msgid "Total"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:336
-msgid "Used"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:346
-msgid "Tunnels in/out"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:351
-msgid "Exploratory"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:359
-msgid "Client"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:367
-msgid "Participating"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:373
-msgid "What's in the router's job queue?"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:375
-msgid "Congestion"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:380
-msgid "Job lag"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:386
-msgid "Message delay"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:392
-msgid "Tunnel lag"
-msgstr ""
-
-#: src/net/i2p/router/web/SummaryBarRenderer.java:398
-msgid "Backlog"
-msgstr ""
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P routerconsole\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-24 10:45+0000\n"
+"PO-Revision-Date: 2009-10-19 12:50+0000\n"
+"Last-Translator: foo <foo@bar>\n"
+"Language-Team: foo <foo@bar>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: German\n"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106
+msgid "config networking"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:233
+msgid "I2P Network Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:331
+msgid "Bandwidth limiter"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333
+msgid ""
+"I2P will work best if you configure your rates to match the speed of your "
+"internet connection."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:337
+msgid "KBps In"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347
+msgid "KBps Out"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357
+msgid "Share"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+msgid "NOTE"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:364
+msgid "I2P requires at least 12KBps to enable sharing. "
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365
+msgid ""
+"Please enable sharing (participating in tunnels) by configuring more "
+"bandwidth. "
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:366
+msgid ""
+"It improves your anonymity by creating cover traffic, and helps the network."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:368
+msgid "You have configured I2P to share"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369
+msgid ""
+"The higher the share bandwidth the more you improve your anonymity and help "
+"the network."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375
+msgid "IP and Transport Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377
+msgid "The default settings will work for most people."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379
+msgid "UPnP Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383
+msgid "Enable UPnP to open firewall ports"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:385
+msgid "UPnP status"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387
+msgid "IP Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+msgid "Externally reachable hostname or IP address"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:393
+msgid "Use all auto-detect methods"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:397
+msgid "Disable UPnP IP address detection"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:401
+msgid "Ignore local interface IP address"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405
+msgid "Use SSU IP address detection only"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:463
+msgid "Specify hostname or IP"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356
+msgid "or"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:429
+msgid "Hidden mode - do not publish IP"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:431
+msgid "(prevents participating traffic)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:433
+msgid "UDP Configuration:"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:435
+msgid "UDP port:"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443
+msgid "TCP Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:449
+msgid "Use auto-detected IP address"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:483
+msgid "currently"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455
+msgid "if we are not firewalled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+msgid "Always use auto-detected IP address (Not firewalled)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
+msgid "Disable inbound (Firewalled)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473
+msgid "Completely disable"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:475
+msgid ""
+"(select only if behind a firewall that throttles or blocks outbound TCP)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477
+msgid "Externally reachable TCP port"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:481
+msgid "Use the same port configured for UDP"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489
+msgid "Specify Port"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:363
+msgid "Note"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496
+msgid "Changing these settings will restart your router."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498
+msgid "Configuration Help"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:536
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502
+msgid ""
+"If you can, please poke a hole in your firewall to allow unsolicited UDP and "
+"TCP packets to reach you."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504
+msgid ""
+"If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole "
+"punching with \"SSU introductions\" to relay traffic."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508
+msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:510
+msgid ""
+"UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect "
+"the external IP address and forward ports."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:512
+msgid "UPnP support is beta, and may not work for any number of reasons"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:514
+msgid "No UPnP-compatible device present"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:516
+msgid "UPnP disabled on the device"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:518
+msgid "Software firewall interference with UPnP"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:520
+msgid "Bugs in the device's UPnP implementation"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:522
+msgid "Multiple firewall/routers in the internet connection path"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:524
+msgid "UPnP device change, reset, or address change"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:526
+msgid ""
+"UPnP may be enabled or disabled above, but a change requires a router "
+"restart to take effect."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:528
+msgid "Hostnames entered above will be published in the network database."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:530
+msgid ""
+"If you specify the wrong IP address or hostname, or do not properly "
+"configure your NAT or firewall, your network performance will degrade "
+"substantially."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:532
+msgid "When in doubt, leave the settings at the defaults."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:534
+msgid "Reachability Help"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541
+msgid "OK"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543
+msgid "Your UDP port does not appear to be firewalled."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545
+msgid "Firewalled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547
+msgid "Your UDP port appears to be firewalled."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549
+msgid ""
+"As the firewall detection methods are not 100% reliable, this may "
+"occasionally be displayed in error."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:551
+msgid ""
+"However, if it appears consistently, you should check whether both your "
+"external and internal firewalls are open on port 8887."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:553
+msgid ""
+"I2P will work fine when firewalled, there is no reason for concern. When "
+"firewalled, the router uses \"introducers\" to relay inbound connections."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555
+msgid ""
+"However, you will get more participating traffic and help the network more "
+"if you can open your firewall(s)."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561
+msgid "Testing"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563
+msgid "The router is currently testing whether your UDP port is firewalled."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565
+msgid "Hidden"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567
+msgid ""
+"The router is not configured to publish its address, therefore it does not "
+"expect incoming connections."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569
+msgid "WARN - Firewalled and Fast"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571
+msgid ""
+"You have configured I2P to share more than 128KBps of bandwidth, but you are "
+"firewalled."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575
+msgid "WARN - Firewalled and Floodfill"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577
+msgid ""
+"You have configured I2P to be a floodfill router, but you are firewalled."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579
+msgid ""
+"For best participation as a floodfill router, you should open your firewall."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581
+msgid "WARN - Firewalled with Inbound TCP Enabled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583
+msgid ""
+"You have configured inbound TCP, however your UDP port is firewalled, and "
+"therefore it is likely that your TCP port is firewalled as well."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587
+msgid "Please open your firewall or disable inbound TCP above."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589
+msgid "WARN - Firewalled with UDP Disabled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591
+msgid "You have configured inbound TCP, however you have disabled UDP."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593
+msgid ""
+"You appear to be firewalled on TCP, therefore your router cannot accept "
+"inbound connections."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595
+msgid "Please open your firewall or enable UDP."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597
+msgid "ERR - Clock Skew"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599
+msgid ""
+"Your system's clock is skewed, which will make it difficult to participate "
+"in the network."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601
+msgid "Correct your clock setting if this error persists."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603
+msgid "ERR - Private TCP Address"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605
+msgid ""
+"You must never advertise an unroutable IP address such as 127.0.0.1 or "
+"192.168.1.1 as your external address."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607
+msgid "Correct the address or disable inbound TCP above."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609
+msgid "ERR - SymmetricNAT"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611
+msgid "I2P detected that you are firewalled by a Symmetric NAT."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615
+msgid ""
+"ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config "
+"and restart"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617
+msgid "I2P was unable to bind to port 8887 or other configured port."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619
+msgid ""
+"Check to see if another program is using port 8887. If so, stop that program "
+"or configure I2P to use a different port."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621
+msgid ""
+"This may be a transient error, if the other program is no longer using the "
+"port."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623
+msgid "However, a restart is always required after this error."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625
+msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627
+msgid ""
+"You have not configured inbound TCP with a hostname and port above, however "
+"you have disabled UDP."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629
+msgid "Therefore your router cannot accept inbound connections."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631
+msgid "Please configure a TCP host and port above or enable UDP."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633
+msgid "ERR - Client Manager I2CP Error - check logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635
+msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637
+msgid ""
+"Do you have another I2P instance running? Stop the conflicting program and "
+"restart I2P."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107
+msgid "config advanced"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:234
+msgid "I2P Advanced Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:333
+msgid "Advanced I2P Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:339
+msgid "Some changes may require a restart to take effect."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106
+msgid "config clients"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:233
+msgid "I2P Client Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:340
+msgid "Client Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:342
+msgid ""
+"The Java clients listed below are started by the router and run in the same "
+"JVM."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:346
+msgid "To change other client options, edit the file"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:363
+msgid "All changes require restart to take effect."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:355
+msgid "WebApp Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:357
+msgid ""
+"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)."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:359
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106
+msgid "config keyring"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
+msgid "I2P Keyring Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:326
+msgid "Keyring"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:328
+msgid "The router keyring is used to decrypt encrypted leaseSets."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:331
+msgid ""
+"The keyring may contain keys for local or remote encrypted destinations."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:341
+msgid "Manual Keyring Addition"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:343
+msgid "Enter keys for encrypted remote destinations here."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:345
+msgid "Dest. name, hash, or full key"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:347
+msgid "Encryption Key"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107
+msgid "config logging"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:234
+msgid "I2P Logging Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+msgid "Configure I2P Logging Options"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335
+msgid "Logging filename"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:339
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:341
+msgid "Log record format"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:345
+msgid ""
+"(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:347
+msgid "Log date format"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:351
+msgid ""
+"('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' "
+"= millisecond)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:353
+msgid "Max log file size"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:357
+msgid "Default log level"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:361
+msgid ""
+"(DEBUG and INFO are not recommended defaults, as they will drastically slow "
+"down your router)"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:363
+msgid "Log level overrides"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106
+msgid "config peers"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
+msgid "I2P Peer Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+msgid "Manual Peer Controls"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:340
+msgid "Router Hash"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344
+msgid "Manually Ban / Unban a Peer"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
+msgid ""
+"Banning will prevent the participation of this peer in tunnels you create."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:352
+msgid "Adjust Profile Bonuses"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:354
+msgid ""
+"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"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:356
+msgid "profiles page"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:364
+msgid "Speed"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:368
+msgid "Capacity"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106
+msgid "config service"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
+msgid "I2P Service Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318
+msgid "Shutdown the router"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+msgid ""
+"Graceful shutdown lets the router satisfy the agreements it has already made "
+"before shutting down, but may take a few minutes."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322
+msgid ""
+"If you need to kill the router immediately, that option is available as well."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326
+msgid ""
+"If you want the router to restart itself after shutting down, you can choose "
+"one of the following."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328
+msgid "This is useful in some situations"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332
+msgid ""
+"A graceful restart will take a few minutes (but your peers will appreciate "
+"your patience), while a hard restart does so immediately."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334
+msgid ""
+"After tearing down the router, it will wait 1 minute before starting back up "
+"again."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340
+msgid "Systray integration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342
+msgid ""
+"On the windows platform, there is a small application to sit in the system "
+"tray, allowing you to view the router's status"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344
+msgid ""
+"(later on, I2P client applications will be able to integrate their own "
+"functionality into the system tray as well)."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
+msgid "If you are on windows, you can either enable or disable that icon here."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:348
+msgid "Run on startup"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:350
+msgid ""
+"You can control whether I2P is run on startup or not by selecting one of the "
+"following options"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:352
+msgid "I2P will install (or remove) a service accordingly."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354
+msgid "If you prefer the command line, you can also run the "
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360
+msgid ""
+"If you are running I2P as service right now, removing it will shut down your "
+"router immediately."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362
+msgid ""
+"You may want to consider shutting down gracefully, as above, then running "
+"uninstall_i2p_service_winnt.bat."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:370
+msgid "Debugging"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:374
+msgid "Launch browser on router startup?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:376
+msgid ""
+"I2P's main configuration interface is this web console, so for your "
+"convenience I2P can launch a web browser on startup pointing at"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107
+msgid "config stats"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+msgid "I2P Stats Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:334
+msgid "Configure I2P Stat Collection"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:336
+msgid "Enable full stats?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:343
+msgid "change requires restart to take effect"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:345
+msgid "Stat file"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:349
+msgid "Filter"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:360
+msgid "toggle all"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:362
+msgid "Log"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:364
+msgid "Graph"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:403
+msgid "Advanced filter"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:106
+msgid "config tunnels"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:233
+msgid "I2P Tunnel Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339
+msgid "The default settings work for most people."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343
+msgid "There is a fundamental tradeoff between anonymity and performance."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:346
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:349
+msgid "High CPU and/or high outbound bandwidth usage may result."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:352
+msgid "Change these settings with care, and adjust them if you have problems."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:366
+msgid ""
+"Exploratory tunnel setting changes are stored in the router.config file."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:369
+msgid "Client tunnel changes are temporary and are not saved."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:371
+msgid "To make permanent client tunnel changes see the"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:373
+msgid "i2ptunnel page"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106
+msgid "config UI"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:233
+msgid "I2P UI Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:325
+msgid "Router Console Theme"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:343
+msgid "Theme selection disabled for Internet Explorer, sorry."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:345
+msgid ""
+"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."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:349
+msgid "Router Console Language"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:353
+msgid ""
+"Please contribute to the router console translation project! Contact the "
+"developers on IRC #i2p to help."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106
+msgid "config update"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:220
+msgid "I2P Update Configuration"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334
+msgid "Check for I2P and news updates"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:336
+msgid "News & I2P Updates"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:340
+msgid "Update In Progress"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346
+msgid "News URL"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350
+msgid "Refresh frequency"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354
+msgid "Update policy"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:358
+msgid "Update through the eepProxy?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:362
+msgid "eepProxy host"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:366
+msgid "eepProxy port"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:370
+msgid "Update URLs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:374
+msgid "Trusted keys"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:378
+msgid "Update with unsigned development builds?"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:382
+msgid "Unsigned Build URL"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117
+msgid "Page Not Found"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:241
+msgid ""
+"Sorry! You appear to be requesting a non-existent Router Console page or "
+"resource."
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243
+msgid "Error 404"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:248
+msgid "not found"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106
+msgid "graphs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:220
+msgid "I2P Performance Graphs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105
+msgid "home"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:226
+#: src/net/i2p/router/web/CSSHelper.java:41
+#: src/net/i2p/router/web/SummaryBarRenderer.java:26
+#: src/net/i2p/router/web/SummaryBarRenderer.java:28
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105
+msgid "job queue"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+msgid "I2P Router Job Queue"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105
+msgid "logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:219
+msgid "I2P Router Logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:221
+msgid "I2P Version & Running Environment"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:223
+msgid "Please include this information in bug reports"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105
+msgid "network database summary"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+msgid "I2P Network Database Summary"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:105
+msgid "statistics"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:234
+msgid "I2P Router Statistics"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105
+msgid "peer connections"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+msgid "I2P Network Peers"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105
+msgid "peer profiles"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+msgid "I2P Network Peer Profiles"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
+msgid "tunnel summary"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+msgid "I2P Tunnel Summary"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "classic"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "dark"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "light"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "English"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "French"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "German"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Chinese"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Dutch"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Swedish"
+msgstr ""
+
+#: src/net/i2p/router/web/ConfigUpdateHelper.java:90
+msgid "Notify only"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:42
+msgid "I2P Services"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:48
+msgid "Manage your I2P hosts file here (I2P domain name resolution)"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:50
+msgid "Addressbook"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:54
+msgid "Built-in anonymous BitTorrent Client"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:56
+msgid "Torrents"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:60
+msgid "Anonymous webmail client"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:62
+msgid "Webmail"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:66
+msgid "Anonymous resident webserver"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:68
+msgid "Webserver"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:72
+msgid "Configure I2P Router"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:74
+msgid "I2P Internals"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:80
+#: src/net/i2p/router/web/SummaryBarRenderer.java:344
+msgid "View existing tunnels and tunnel build status"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:82
+msgid "Tunnels"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:86
+#: src/net/i2p/router/web/SummaryBarRenderer.java:221
+msgid "Show all current peer connections"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:88
+#: src/net/i2p/router/web/SummaryBarRenderer.java:223
+msgid "Peers"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:92
+msgid "Show recent peer performance profiles"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:94
+msgid "Profiles"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:98
+msgid "Show list of all known I2P routers"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:100
+msgid "NetDB"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:104
+msgid "Health Report"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:106
+msgid "Logs"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:110
+msgid "Show the router's workload, and how it's performing"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:112
+msgid "Jobs"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:116
+msgid "Graph router performance"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:118
+msgid "Graphs"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:122
+msgid "Textual router performance statistics"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:124
+msgid "Stats"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:134
+msgid "I2P Router Help"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:136
+msgid "General"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:139
+msgid "Your unique I2P router identity is"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:143
+msgid "never reveal it to anyone"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:145
+msgid "Local Identity"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:150
+msgid "Version"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:157
+msgid "How long we've been running for this session"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:160
+msgid "Uptime"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:167
+msgid ""
+"Help with configuring your firewall and router for optimal I2P performance"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:194
+msgid "Download"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:198
+#: src/net/i2p/router/web/SummaryBarRenderer.java:205
+msgid "Update"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:203
+msgid "Download Unsigned"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:229
+msgid "Active"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:237
+msgid "Fast"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:243
+msgid "High capacity"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:249
+msgid "Integrated"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:255
+msgid "Known"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:270
+msgid "Help with firewall configuration"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:272
+msgid "Check NAT/firewall"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:309
+msgid "Configure router bandwidth allocation"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:311
+msgid "Bandwidth in/out"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:328
+msgid "Total"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:336
+msgid "Used"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:346
+msgid "Tunnels in/out"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:351
+msgid "Exploratory"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:359
+msgid "Client"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:367
+msgid "Participating"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:373
+msgid "What's in the router's job queue?"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:375
+msgid "Congestion"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:380
+msgid "Job lag"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:386
+msgid "Message delay"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:392
+msgid "Tunnel lag"
+msgstr ""
+
+#: src/net/i2p/router/web/SummaryBarRenderer.java:398
+msgid "Backlog"
+msgstr ""
diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po
index cb5f52aa5f4e79c444d219cee85f78514b2752b6..8041a7cf5613b3279dcfb073359bb695475c9faf 100644
--- a/apps/routerconsole/locale/messages_zh.po
+++ b/apps/routerconsole/locale/messages_zh.po
@@ -8,28 +8,1070 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-20 11:55+0000\n"
-"PO-Revision-Date: 2009-10-22 01:00+0800\n"
+"POT-Creation-Date: 2009-10-24 10:45+0000\n"
+"PO-Revision-Date: \n"
"Last-Translator: walking <walking@mail.i2p>\n"
-"Language-Team: foo <foo@par>\n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:95
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:106
+msgid "config networking"
+msgstr "连网设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:233
+msgid "I2P Network Configuration"
+msgstr "I2P 连网设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:331
+msgid "Bandwidth limiter"
+msgstr "带宽限制"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:333
+msgid "I2P will work best if you configure your rates to match the speed of your internet connection."
+msgstr "与联网环境相符的速度能使I2P以最佳的状态工作。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:337
+msgid "KBps In"
+msgstr "KBps 入站"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:347
+msgid "KBps Out"
+msgstr "KBps 出站"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:357
+msgid "Share"
+msgstr "共享"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:363
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:337
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337
+msgid "NOTE"
+msgstr "注意"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:364
+msgid "I2P requires at least 12KBps to enable sharing. "
+msgstr "I2P 需要至少 12KBps 才能进行共享。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:365
+msgid "Please enable sharing (participating in tunnels) by configuring more bandwidth. "
+msgstr "请设置更多的带宽以便启用共享功能(加入到其他节点的隧道创建中)。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:366
+msgid "It improves your anonymity by creating cover traffic, and helps the network."
+msgstr "通过制造混淆流量共享能增强您的匿名性，帮助网络成长。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:368
+msgid "You have configured I2P to share"
+msgstr "您设置I2P共享"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:369
+msgid "The higher the share bandwidth the more you improve your anonymity and help the network."
+msgstr "共享的带宽越多，您的匿名性越强同时能帮助网络成长。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:375
+msgid "IP and Transport Configuration"
+msgstr "IP 与传输设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:377
+msgid "The default settings will work for most people."
+msgstr "默认设置适于大多数人。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:379
+msgid "UPnP Configuration"
+msgstr "UPnP 设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:383
+msgid "Enable UPnP to open firewall ports"
+msgstr "启用UPnP以打开防火墙端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:385
+msgid "UPnP status"
+msgstr "UPnP 统计"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:387
+msgid "IP Configuration"
+msgstr "IP 设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:389
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:445
+msgid "Externally reachable hostname or IP address"
+msgstr "公网可访问的本机域名或IP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:393
+msgid "Use all auto-detect methods"
+msgstr "使用全部自动探测方法"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:397
+msgid "Disable UPnP IP address detection"
+msgstr "禁用UPnP IP 地址探测"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:401
+msgid "Ignore local interface IP address"
+msgstr "忽略本地接口的 IP 地址"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:405
+msgid "Use SSU IP address detection only"
+msgstr "仅使用SSU IP 地址探测"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:409
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:463
+msgid "Specify hostname or IP"
+msgstr "指定主机名或IP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:415
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:356
+msgid "or"
+msgstr "或"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:429
+msgid "Hidden mode - do not publish IP"
+msgstr "隐身模式 - 不发布IP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:431
+msgid "(prevents participating traffic)"
+msgstr "(阻止共享流量)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:433
+msgid "UDP Configuration:"
+msgstr "UPnP 设置:"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:435
+msgid "UDP port:"
+msgstr "UDP端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443
+msgid "TCP Configuration"
+msgstr "TCP 连接设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:449
+msgid "Use auto-detected IP address"
+msgstr "使用自动检测得到的 IP 地址"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:451
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:483
+msgid "currently"
+msgstr "目前"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:455
+msgid "if we are not firewalled"
+msgstr "如果没有受到防火墙阻挡"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:459
+msgid "Always use auto-detected IP address (Not firewalled)"
+msgstr "总是使用自动探测到的IP地址(没有防火墙限制)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:469
+msgid "Disable inbound (Firewalled)"
+msgstr "禁止入站连接(受防火墙限制)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473
+msgid "Completely disable"
+msgstr "完全禁用"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:475
+msgid "(select only if behind a firewall that throttles or blocks outbound TCP)"
+msgstr "仅在受到防火墙的流量限制或入站连接限制时使用"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:477
+msgid "Externally reachable TCP port"
+msgstr "公网可访问的TCP端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:481
+msgid "Use the same port configured for UDP"
+msgstr "使用与UDP相同的端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489
+msgid "Specify Port"
+msgstr "指定端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:493
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:358
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:363
+msgid "Note"
+msgstr "注意"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496
+msgid "Changing these settings will restart your router."
+msgstr "修改这些设置将必须重启路由器。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498
+msgid "Configuration Help"
+msgstr "设置帮助"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:536
+msgid "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."
+msgstr "I2P可以与大多数防火墙共存，如果I2P端口(通常为8887)进行了UDP/TCP映射，您的速度和网络整合度会逐渐提升。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:502
+msgid "If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you."
+msgstr "如果可能，请在防火墙中添加端口并允许入站UDP/TCP数据包通过。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:504
+msgid "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic."
+msgstr "如果不能，I2P支持UPnP(Universal Plug and Play)或借助“SSU中介”进行UDP端口穿透，通过它们也可以中继数据。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:506
+msgid "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."
+msgstr "上述大部分设置仅为特殊情况准备，例如UPnP不能正常工作，或外部防火墙封锁网络。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:508
+msgid "Certain firewalls such as symmetric NATs may not work well with I2P."
+msgstr "在某些防火墙下例如Symmetric，I2P可能无法有效利用NAT工作。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:510
+msgid "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports."
+msgstr "UPnP与公网网关设备(IGD)通讯可以检测外部IP和映射端口。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:512
+msgid "UPnP support is beta, and may not work for any number of reasons"
+msgstr "UPnP支持仍在测试阶段，可能由于一些原因无法正常工作。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:514
+msgid "No UPnP-compatible device present"
+msgstr "没有发现UPnP兼容设备"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:516
+msgid "UPnP disabled on the device"
+msgstr "设备上的UPnP支持已禁用"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:518
+msgid "Software firewall interference with UPnP"
+msgstr "软件防火墙阻止UPnP"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:520
+msgid "Bugs in the device's UPnP implementation"
+msgstr "设备的UPnP支持有Bug"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:522
+msgid "Multiple firewall/routers in the internet connection path"
+msgstr "公网连接中存在多个防火墙/路由器"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:524
+msgid "UPnP device change, reset, or address change"
+msgstr "UPnP设备改变、重置或地址迁移"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:526
+msgid "UPnP may be enabled or disabled above, but a change requires a router restart to take effect."
+msgstr "UPnP 的关闭或开启均需要程序重启后生效。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:528
+msgid "Hostnames entered above will be published in the network database."
+msgstr "上面输入的主机名称将在网络数据库(NetDB)中发布。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:530
+msgid "If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially."
+msgstr "如果您设置了错误的IP地址或主机名称，或NAT/防火墙配置不当，您的网络性能将受到明显影响。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:532
+msgid "When in doubt, leave the settings at the defaults."
+msgstr "如果对设置有疑问，请保留默认设置。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:534
+msgid "Reachability Help"
+msgstr "连通性帮助"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:539
+msgid "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."
+msgstr "如果您认为已经打开了防火墙，但I2P仍然报告您受到防火墙阻隔，请想想您是否可能有多层防火墙，例如软件防护墙和外部的硬件路由器。"
+
+# 暂不翻译，确定/良好 可能影响按钮的翻译
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:541
+msgid "OK"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:543
+msgid "Your UDP port does not appear to be firewalled."
+msgstr "您的UDP端口似乎一切正常。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:545
+msgid "Firewalled"
+msgstr "防火墙阻挡(Firewalled)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:547
+msgid "Your UDP port appears to be firewalled."
+msgstr "您的UDP端口似乎因防火墙而连接受阻。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:549
+msgid "As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error."
+msgstr "由于防火墙检测方法并非100%可靠，有时也可能错误地显示此此提示。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:551
+msgid "However, if it appears consistently, you should check whether both your external and internal firewalls are open on port 8887."
+msgstr "然而，如果总是出现此提示，您应检查外部或内部防火墙是否打开了8887(或用户指定的)端口。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:553
+msgid "I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections."
+msgstr "即使受到防火墙阻拦，I2P也能够正常工作，无需担心。受到防火墙阻隔时，路由器将通过“中介(Introducers)”中继入站连接。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:555
+msgid "However, you will get more participating traffic and help the network more if you can open your firewall(s)."
+msgstr "然而，如果您能打开防火墙端口，您才能得到的共享流量，更好的帮助I2P网络。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:557
+msgid "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."
+msgstr "如果您确信已经打开了防火墙，请想想是不是同时存在硬件和软件防火墙，或存在您无法控制的额外的机构性的防火墙。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:559
+msgid "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."
+msgstr "当然，某些路由器可能无法正确映射同时使用TCP和UDP协议的端口，或存在其他限制或缺陷，障碍了数据进入I2P网络。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:561
+msgid "Testing"
+msgstr "测试中(Testing)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:563
+msgid "The router is currently testing whether your UDP port is firewalled."
+msgstr "路由器正在测试您的UDP端口是否被防火墙阻挡。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:565
+msgid "Hidden"
+msgstr "隐藏(Hidden)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:567
+msgid "The router is not configured to publish its address, therefore it does not expect incoming connections."
+msgstr "路由器被设置为禁止发布IP地址，因此并不需要入站连接。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:569
+msgid "WARN - Firewalled and Fast"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:571
+msgid "You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled."
+msgstr "您设置I2P共享超过128KBps的带宽，但您的连接因防火墙受阻。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:573
+msgid "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."
+msgstr "尽管在此种配置情况下I2P可以正常工作，但如果您的确能够分享超过128kps的带宽，打开防火墙端口它能工作的更好帮助网络中其他的人。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:575
+msgid "WARN - Firewalled and Floodfill"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:577
+msgid "You have configured I2P to be a floodfill router, but you are firewalled."
+msgstr "您已将I2P设置为种子路由，但您的连接已因防火墙受阻。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:579
+msgid "For best participation as a floodfill router, you should open your firewall."
+msgstr "为了种子路由能够更好的参与到I2P网络中，请您的防火墙中打开端口。"
+
+# 暂不翻译方便反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:581
+msgid "WARN - Firewalled with Inbound TCP Enabled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:583
+msgid "You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well."
+msgstr "您设置了使用入站TCP连接，同时您的UDP端口因防火墙受阻，由此看来您的TCP端口也被防火墙阻挡。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:585
+msgid "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."
+msgstr "如果您在TCP端口因防火墙受阻的情况下启用入站TCP连接，其他路由器节点将无法与您建立连接，造成网络受阻。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:587
+msgid "Please open your firewall or disable inbound TCP above."
+msgstr "请打开您的防火墙端口或禁用上面的入站TCP连接。"
+
+# 暂不翻译
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:589
+msgid "WARN - Firewalled with UDP Disabled"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:591
+msgid "You have configured inbound TCP, however you have disabled UDP."
+msgstr "您设置了使用TCP连接，然而禁用了UDP连接。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:593
+msgid "You appear to be firewalled on TCP, therefore your router cannot accept inbound connections."
+msgstr "您的TCP连接似乎因防火墙受阻，导致您的路由器无法接收入站连接。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:595
+msgid "Please open your firewall or enable UDP."
+msgstr "请打开防火墙端口或启用UDP。"
+
+# 暂不翻译，方便错误反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:597
+msgid "ERR - Clock Skew"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:599
+msgid "Your system's clock is skewed, which will make it difficult to participate in the network."
+msgstr "如果您的系统时钟太快或太慢，将影响计算机接入网络。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:601
+msgid "Correct your clock setting if this error persists."
+msgstr "如果错误持续，请校对您的系统时间。"
+
+# 暂不翻译，方便错误反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:603
+msgid "ERR - Private TCP Address"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:605
+msgid "You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address."
+msgstr "您不能发布一个公网无法访问的 IP 地址，例如127.0.0.1或192.168.1.1一类的内网地址。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:607
+msgid "Correct the address or disable inbound TCP above."
+msgstr "正确设置IP地址或禁用上面的入站TCP连接。"
+
+# 暂不翻译，方便错误反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:609
+msgid "ERR - SymmetricNAT"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:611
+msgid "I2P detected that you are firewalled by a Symmetric NAT."
+msgstr "I2P检测到您受到Symmetic NAT的阻挡。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:613
+msgid "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."
+msgstr "I2P无法与此类防火墙很好的并存。您可能无法接收入站连接，这会障碍您连入I2P网络。"
+
+# 暂不翻译，方便问题反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:615
+msgid "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:617
+msgid "I2P was unable to bind to port 8887 or other configured port."
+msgstr "I2P无法绑定到端口8887或其他指定的端口上。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:619
+msgid "Check to see if another program is using port 8887. If so, stop that program or configure I2P to use a different port."
+msgstr "检查是否有其他程序正在使用8887端口，如果是，关闭此程序或设置I2P使用不同的端口。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:621
+msgid "This may be a transient error, if the other program is no longer using the port."
+msgstr "如果其他程序不再使用此端口，这可能是临时性的错误。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:623
+msgid "However, a restart is always required after this error."
+msgstr "然而，发生此错误后一般需要重启程序才能解决。"
+
+# 暂不翻译，方便错误反馈
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:625
+msgid "ERR - UDP Disabled and Inbound TCP host/port not set"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:627
+msgid "You have not configured inbound TCP with a hostname and port above, however you have disabled UDP."
+msgstr "您没有设置入站TCP的主机名称和端口，同时又关闭了UDP。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:629
+msgid "Therefore your router cannot accept inbound connections."
+msgstr "因此您的路由器无法接收入站连接。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:631
+msgid "Please configure a TCP host and port above or enable UDP."
+msgstr "请在前面设置TCP主机和端口或启用UDP"
+
+# 错误提示暂不翻译，以便错误反馈。
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:633
+msgid "ERR - Client Manager I2CP Error - check logs"
+msgstr ""
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:635
+msgid "This is usually due to a port 7654 conflict. Check the logs to verify."
+msgstr "这通常为7654端口冲突所致，请查看日志确认原因。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:637
+msgid "Do you have another I2P instance running? Stop the conflicting program and restart I2P."
+msgstr "您是否已经运行了另一个I2P实例？请关掉冲突的程序并重启I2P。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:107
+msgid "config advanced"
+msgstr "高级设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:234
+msgid "I2P Advanced Configuration"
+msgstr "I2P 高级设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:333
+msgid "Advanced I2P Configuration"
+msgstr "I2P 高级设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:339
+msgid "Some changes may require a restart to take effect."
+msgstr "某些设置需要程序重启后生效。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:106
+msgid "config clients"
+msgstr "升级设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:233
+msgid "I2P Client Configuration"
+msgstr "I2P 客户程序设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:340
+msgid "Client Configuration"
+msgstr "客户程序设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:342
+msgid "The Java clients listed below are started by the router and run in the same JVM."
+msgstr "下面列出的Java客户端随路由器启动并运行于同一JVM中。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:346
+msgid "To change other client options, edit the file"
+msgstr "修改其他客户端设置请编辑文件"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:353
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:363
+msgid "All changes require restart to take effect."
+msgstr "所有更改均需要程序重启才能生效。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:355
+msgid "WebApp Configuration"
+msgstr "WebApp 设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:357
+msgid "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)."
+msgstr "下面列出的Java Web 程序随客户端“web控制台”一同启动，并与路由运行于同一JVM中。这些Web程序通常可以通过路由器界面直接访问。他们可能是完整的程序 (例如 i2psnark/BT客户端),其他客户端程序的前端或必须单独启动的程序(例如. susidns, i2ptunnel),甚至根本没有Web界面(例如 addressbook)。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:359
+msgid "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."
+msgstr "从webapps目录中删除相应的.war文件同样可以禁用Web程序;然而这些 .war 文件和Web程序在更新I2P后还会再次出现,所以推荐在这里通过设置的方法禁用不用的Web程序。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:106
+msgid "config keyring"
+msgstr "钥匙环设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:220
+msgid "I2P Keyring Configuration"
+msgstr "I2P 钥匙环设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:326
+msgid "Keyring"
+msgstr "钥匙环"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:328
+msgid "The router keyring is used to decrypt encrypted leaseSets."
+msgstr "路由的钥匙环被用来解密和加密 leaseSets."
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:331
+msgid "The keyring may contain keys for local or remote encrypted destinations."
+msgstr "钥匙环可以包含本地和远程的加密目标(Destination)."
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:341
+msgid "Manual Keyring Addition"
+msgstr "手动添加钥匙环"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:343
+msgid "Enter keys for encrypted remote destinations here."
+msgstr "在此处添加远程加密目标的密钥。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:345
+msgid "Dest. name, hash, or full key"
+msgstr "目标(Dest.)名称, HASH, 或完整公钥"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:347
+msgid "Encryption Key"
+msgstr "加密密钥"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:107
+msgid "config logging"
+msgstr "日志设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:234
+msgid "I2P Logging Configuration"
+msgstr "I2P 记录设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:333
+msgid "Configure I2P Logging Options"
+msgstr "设置 I2P 记录选项"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:335
+msgid "Logging filename"
+msgstr "日志文件名称"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:339
+msgid "(the symbol '@' will be replaced during log rotation)"
+msgstr "(日志轮转时符号'@'将被替换)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:341
+msgid "Log record format"
+msgstr "日志记录格式"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:345
+msgid "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)"
+msgstr "( 'd' = 日期, 'c' = 类, 't' = 线程, 'p' = 优先级, 'm' = 消息)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:347
+msgid "Log date format"
+msgstr "日志日期格式"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:351
+msgid "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)"
+msgstr "('MM' = 月, 'dd' = 天, 'HH' = 小时, 'mm' = 分钟, 'ss' = 秒, 'SSS' = 毫秒)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:353
+msgid "Max log file size"
+msgstr "日志最大体积"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:357
+msgid "Default log level"
+msgstr "默认日志等级"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:361
+msgid "(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)"
+msgstr "(建议不要使用 DEBUG 或 INFO 作为默认等级,他们会明显降低程序性能)"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:363
+msgid "Log level overrides"
+msgstr "等级外日志项目"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:106
+msgid "config peers"
+msgstr "节点设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:220
+msgid "I2P Peer Configuration"
+msgstr "I2P 节点设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338
+msgid "Manual Peer Controls"
+msgstr "手动节点控制"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:340
+msgid "Router Hash"
+msgstr "路由器 HASH"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:344
+msgid "Manually Ban / Unban a Peer"
+msgstr "手动封锁/解封某个节点"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346
+msgid "Banning will prevent the participation of this peer in tunnels you create."
+msgstr "封锁将阻止节点参与您的隧道创建"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:352
+msgid "Adjust Profile Bonuses"
+msgstr "调整节点评分"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:354
+msgid "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"
+msgstr "评分(Bonuse)可能为正或为负并影响节点是否评为快速和高容量节点。快速节点用于客户程序通道，高容量节点用于探索隧道。当前评分显示于"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:356
+msgid "profiles page"
+msgstr "节点信息页面"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:364
+msgid "Speed"
+msgstr "速度"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:368
+msgid "Capacity"
+msgstr "容量"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:106
+msgid "config service"
+msgstr "服务设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:220
+msgid "I2P Service Configuration"
+msgstr "I2P 服务设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:318
+msgid "Shutdown the router"
+msgstr "关闭路由器"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320
+msgid "Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes."
+msgstr "平滑关闭(Graceful Shutdown)让路由器在关闭前完成已达成的任务，但这可能需要花费几分钟的时间。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:322
+msgid "If you need to kill the router immediately, that option is available as well."
+msgstr "当然你也可以选择立即关闭路由。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:326
+msgid "If you want the router to restart itself after shutting down, you can choose one of the following."
+msgstr "如果你想要路由器关闭后自动重新启动，可以选择下面的选项。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:328
+msgid "This is useful in some situations"
+msgstr "重启在某些情况下有用"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:330
+msgid "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."
+msgstr "例如当修改了客户程序仅在启动时读取的设置，比如路由器控制界面的密码，监听的接口。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:332
+msgid "A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately."
+msgstr "平滑重启可能会等待几分钟的时间(但你的节点一定会感激你的耐心)，硬重启可以立即完成。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334
+msgid "After tearing down the router, it will wait 1 minute before starting back up again."
+msgstr "路由关闭后将等待1分钟再重新启动。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:340
+msgid "Systray integration"
+msgstr "使用系统托盘"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:342
+msgid "On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status"
+msgstr "Windows 平台允许小程序进驻系统托盘，让你可以查看路由状态"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:344
+msgid "(later on, I2P client applications will be able to integrate their own functionality into the system tray as well)."
+msgstr "(以后的 I2P 客户端程序也会将它们的功能集成到系统托盘里)。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346
+msgid "If you are on windows, you can either enable or disable that icon here."
+msgstr "如果你使用Windows, 可以在这里开启或关闭这个托盘图标。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:348
+msgid "Run on startup"
+msgstr "系统启动时运行"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:350
+msgid "You can control whether I2P is run on startup or not by selecting one of the following options"
+msgstr "这里你可以通过下面的选项来设置开机后 I2P 是否启动"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:352
+msgid "I2P will install (or remove) a service accordingly."
+msgstr "I2P将相应的将自身安装为服务(或卸载服务)。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:354
+msgid "If you prefer the command line, you can also run the "
+msgstr "如果你偏好使用命令行，可以运行"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:360
+msgid "If you are running I2P as service right now, removing it will shut down your router immediately."
+msgstr "如果您目前已经以服务形式运行 I2P ，删除 I2P 服务将立刻关闭路由器。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:362
+msgid "You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat."
+msgstr "您可以考虑先平滑关闭路由，待退出后运行 uninstall_i2p_service_winnt.bat。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:370
+msgid "Debugging"
+msgstr "调试"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:374
+msgid "Launch browser on router startup?"
+msgstr "路由器启动时运行浏览器?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:376
+msgid "I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at"
+msgstr "此Web控制台是I2P的主要设置界面，所以如果您您觉得有必要I2P可以在路由启动时调用浏览器打开"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:107
+msgid "config stats"
+msgstr "统计设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221
+msgid "I2P Stats Configuration"
+msgstr "I2P 统计设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:334
+msgid "Configure I2P Stat Collection"
+msgstr "设置 I2P 统计项"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:336
+msgid "Enable full stats?"
+msgstr "启用完整统计?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:343
+msgid "change requires restart to take effect"
+msgstr "设置需要程序重启后才能生效。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:345
+msgid "Stat file"
+msgstr "统计文件"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:349
+msgid "Filter"
+msgstr "过滤器"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:351
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:360
+msgid "toggle all"
+msgstr "全部切换"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:362
+msgid "Log"
+msgstr "日志"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:364
+msgid "Graph"
+msgstr "统计图"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:403
+msgid "Advanced filter"
+msgstr "高级过滤器"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:106
+msgid "config tunnels"
+msgstr "隧道设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:233
+msgid "I2P Tunnel Configuration"
+msgstr "I2P 隧道设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:339
+msgid "The default settings work for most people."
+msgstr "默认设置适于大多数人。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:343
+msgid "There is a fundamental tradeoff between anonymity and performance."
+msgstr "匿名性需要以性能为代价。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:346
+msgid "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."
+msgstr "长于3个跳点(hops)的隧道(例如 2hops + 0-2hops，3 hops + 0-1 hops, 3 hops + 0-2 hops)，或高质量+备用质量(higg + backup),可能降低性能和稳定性。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:349
+msgid "High CPU and/or high outbound bandwidth usage may result."
+msgstr "导致高CPU占用和/或高上行流量。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:352
+msgid "Change these settings with care, and adjust them if you have problems."
+msgstr "小心更改这些设置。如果遇到问题可以在这里调整。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:366
+msgid "Exploratory tunnel setting changes are stored in the router.config file."
+msgstr "对探测隧道设置的更改将保存入router.config文件中。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:369
+msgid "Client tunnel changes are temporary and are not saved."
+msgstr "对客户程序隧道的修改是临时的，将不予保存。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:371
+msgid "To make permanent client tunnel changes see the"
+msgstr "要永久性更改客户通道的设置参见"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:373
+msgid "i2ptunnel page"
+msgstr "I2P 隧道页面"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:106
+msgid "config UI"
+msgstr "界面设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:233
+msgid "I2P UI Configuration"
+msgstr "I2P 界面设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:325
+msgid "Router Console Theme"
+msgstr "路由控制台主题"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:343
+msgid "Theme selection disabled for Internet Explorer, sorry."
+msgstr "抱歉，主题功能在InternetExplorer中已禁用。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:345
+msgid "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."
+msgstr "如果您没使用IE，您的浏览器可能正在伪装IE的UserAgent；您需要设置浏览器(或过滤式代理)使用不同的UserAgent，才能访问路由控制台的主题功能。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:349
+msgid "Router Console Language"
+msgstr "路由控制台语言"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:353
+msgid "Please contribute to the router console translation project! Contact the developers on IRC #i2p to help."
+msgstr "欢迎加入路由控制台翻译项目！提供帮助请通过IRC到#i2p房间与开发人员联系。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:106
msgid "config update"
-msgstr "更新设置"
+msgstr "升级设置"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:220
+msgid "I2P Update Configuration"
+msgstr "I2P 更新设置"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:334
+msgid "Check for I2P and news updates"
+msgstr "检查I2P软件及新闻更新"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:336
+msgid "News & I2P Updates"
+msgstr "软件及新闻更新"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:340
+msgid "Update In Progress"
+msgstr "更新中"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:346
+msgid "News URL"
+msgstr "新闻链接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:350
+msgid "Refresh frequency"
+msgstr "更新频率"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:354
msgid "Update policy"
-msgstr "更新策略"
+msgstr "升级策略"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:358
+msgid "Update through the eepProxy?"
+msgstr "通过eepProxy更新?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:362
+msgid "eepProxy host"
+msgstr "eepProxy主机"
-#: src/net/i2p/router/web/CSSHelper.java:36
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:366
+msgid "eepProxy port"
+msgstr "eepProxy端口"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:370
+msgid "Update URLs"
+msgstr "更新链接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:374
+msgid "Trusted keys"
+msgstr "可信公钥"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:378
+msgid "Update with unsigned development builds?"
+msgstr "更新包括未签名的开发版?"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:382
+msgid "Unsigned Build URL"
+msgstr "未签名软件链接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:117
+msgid "Page Not Found"
+msgstr "页面未找到"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:241
+msgid "Sorry! You appear to be requesting a non-existent Router Console page or resource."
+msgstr "抱歉!您请求的页面或资源不存在。"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:243
+msgid "Error 404"
+msgstr "错误 404"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:248
+msgid "not found"
+msgstr "未找到"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:106
+msgid "graphs"
+msgstr "统计图"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:220
+msgid "I2P Performance Graphs"
+msgstr "I2P 性能图表"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:105
+msgid "home"
+msgstr "主页"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/index_jsp.java:226
+#: src/net/i2p/router/web/CSSHelper.java:41
#: src/net/i2p/router/web/SummaryBarRenderer.java:26
#: src/net/i2p/router/web/SummaryBarRenderer.java:28
msgid "I2P Router Console"
-msgstr "I2P路由控制台"
+msgstr "I2P 路由控制台"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:105
+msgid "job queue"
+msgstr "作业队列"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219
+msgid "I2P Router Job Queue"
+msgstr "I2P 路由器作业队列"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:105
+msgid "logs"
+msgstr "日志"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:219
+msgid "I2P Router Logs"
+msgstr "I2P 路由器日志"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:221
+msgid "I2P Version & Running Environment"
+msgstr "I2P 版本及运行环境"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:223
+msgid "Please include this information in bug reports"
+msgstr "报告问题时请包括以下信息"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:105
+msgid "network database summary"
+msgstr "I2P 网络数据库概况"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219
+msgid "I2P Network Database Summary"
+msgstr "I2P 网络数据库概况"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:105
+msgid "statistics"
+msgstr "统计数据"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldstats_jsp.java:234
+msgid "I2P Router Statistics"
+msgstr "I2P 路由器统计数据"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:105
+msgid "peer connections"
+msgstr "节点连接"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219
+msgid "I2P Network Peers"
+msgstr "I2P 网络节点"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:105
+msgid "peer profiles"
+msgstr "节点信息"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219
+msgid "I2P Network Peer Profiles"
+msgstr "I2P 网络节点信息"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:105
+msgid "tunnel summary"
+msgstr "隧道概况"
+
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219
+msgid "I2P Tunnel Summary"
+msgstr "I2P 隧道概况"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "classic"
+msgstr "经典"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "dark"
+msgstr "暗色调"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:6
+msgid "light"
+msgstr "亮色调"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "English"
+msgstr "英语"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "French"
+msgstr "法语"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:21
+msgid "German"
+msgstr "德语"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Chinese"
+msgstr "中文"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: src/net/i2p/router/web/ConfigUIHelper.java:22
+msgid "Swedish"
+msgstr "瑞士语"
#: src/net/i2p/router/web/ConfigUpdateHelper.java:90
msgid "Notify only"
@@ -112,7 +1154,7 @@ msgstr "包含所有已知I2P路由器的列表"
#: src/net/i2p/router/web/SummaryBarRenderer.java:100
msgid "NetDB"
-msgstr "网络数据库"
+msgstr "NetDB"
#: src/net/i2p/router/web/SummaryBarRenderer.java:104
msgid "Health Report"
@@ -187,9 +1229,9 @@ msgid "Download"
msgstr "下载"
#: src/net/i2p/router/web/SummaryBarRenderer.java:198
-#: src/net/i2p/router/web/SummaryBarRenderer.java:207
+#: src/net/i2p/router/web/SummaryBarRenderer.java:205
msgid "Update"
-msgstr "更新"
+msgstr "升级"
#: src/net/i2p/router/web/SummaryBarRenderer.java:203
msgid "Download Unsigned"
@@ -197,7 +1239,7 @@ msgstr "下载未签名更新"
#: src/net/i2p/router/web/SummaryBarRenderer.java:229
msgid "Active"
-msgstr "活跃节点"
+msgstr "活动节点"
#: src/net/i2p/router/web/SummaryBarRenderer.java:237
msgid "Fast"
@@ -279,3 +1321,28 @@ msgstr "隧道延迟"
msgid "Backlog"
msgstr "积压"
+#~ msgid ""
+#~ "If you want the router to restart itself after shutting down, you can "
+#~ "choose one of the following. This is useful in some situations - 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. A graceful restart will take a few minutes (but your peers "
+#~ "will appreciate your patience), while a hard restart does so "
+#~ "immediately. After tearing down the router, it will wait 1 minute before "
+#~ "starting back up again."
+#~ msgstr ""
+#~ "如果你想要路由器关闭后重新启动，可以选择下面的选项。重启在某些情况下有用 "
+#~ "- 例如当修改了客户程序仅在启动时读取的设置比如路由器控制界面的密码，监听的"
+#~ "接口。平滑重启可能会等待几分钟的时间 (但其他节点一定会感激你的耐心)，硬重"
+#~ "启可以立即完成。 路由关闭后将等待1分钟再重新启动。"
+#~ msgid ""
+#~ "On the windows platform, there is a small application to sit in the "
+#~ "system tray, allowing you to view the router's status (later on, I2P "
+#~ "client applications will be able to integrate their own functionality "
+#~ "into the system tray as well). If you are on windows, you can either "
+#~ "enable or disable that icon here."
+#~ msgstr ""
+#~ "windows 平台允许小程序进驻系统托盘，让你可以查看路由状态，(以后的 I2P 客户"
+#~ "端程序也会将它们的功能集成到系统托盘里)。如果你使用Windows, 可以在这里开启"
+#~ "或关闭这个托盘图标。"
+
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index 22f7609d99299e5b5912527cf776644db05e0514..d0f25aec5fe8c22adee47786214e95c2c267148b 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/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))
- return "Downloaded version is not greater than current version";
+ 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";
diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java
index 9dcc431e520c1caf5403165f4e3cdc10aad3cd23..0fe61e5c02888e60d5c75fd2b29a3f7dd8c81efd 100644
--- a/core/java/src/net/i2p/data/Certificate.java
+++ b/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;
diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java
index ab0341f411de0d9219bf057bf704927b82b7ce50..f35898139ef348f675616fa4b976bba910a335dd 100644
--- a/core/java/src/net/i2p/util/FileUtil.java
+++ b/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) {
diff --git a/history.txt b/history.txt
index b141d99945afdde7373cb78e9d60ec044ef2d6ca..30fa01e8f4d35a11339a6bd1853df9624aa83581 100644
--- a/history.txt
+++ b/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
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 8d09caa40606e583727e8128eef0d5cfabf1dc50..b09b508ad1b548b014fb6ec53452612754329f01 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/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 {
- margin-top: 3px;
+div.tunnels table{
+ 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 {
diff --git a/installer/resources/themes/console/classic/console_big.css b/installer/resources/themes/console/classic/console_big.css
new file mode 100644
index 0000000000000000000000000000000000000000..c35c6f1000055c4f8090f915d8f3eb0ab7380f6a
--- /dev/null
+++ b/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:����;
+ 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;
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index eff38321baad986d0ec37230ca755fa997b6889e..7ea556b58f4b94bf83cd0107ada4914ab051e6d8 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/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;
- padding: 3px 0 4px 0;
+ margin: -7px -9px -8px -9px;
+ 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 {
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index a2112c04401fa4da977adc1bd7b3e50a34ff29b7..cd413faf445d08e54e4a1e0436bcffa3d7bbc1b8 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/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;
- padding: 4px;
+ margin: 0 !important;
+ 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:li {
+ div.joblog:ul {
word-wrap: break-word !important;
- text-align: justify !important;
- line-height: 80% !important;
+ text-align: justify;
+ line-height: 100% !important;
}
-div.joblog:ul {
+ div.joblog:li {
word-wrap: break-word !important;
- text-align: justify;
+ text-align: justify !important;
+ line-height: 80% !important;
+ padding: 0;
}
div.joblog li:first-child {
margin-top: 10px;
+
}
div.joblog li:last-child {
- margin-bottom: -15px;
+ margin-bottom: 5px;
}
div.joblog form:first-child {
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index b54d1de4bcebaa2676a267138f4700e337aabb2f..5a4225cae2be185e40050c37f96e53fda74c1635 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 5;
+ public final static long BUILD = 6;
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;