diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index 3b80c80e9c..607b4b00a8 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -27,8 +27,8 @@ do
 	# translate calls must be one of the forms:
 	# _("foo")
 	# _x("foo")
-	# cssHelper._("foo")
-	# cssHelper.title("foo")
+	# intl._("foo")
+	# intl.title("foo")
 	# handler._("foo")
 	# formhandler._("foo")
 	# In a jsp, you must use a helper or handler that has the context set.
@@ -36,7 +36,7 @@ do
 	# then ant distclean updater.
 	find src ../jsp/WEB-INF -name *.java > $TMPFILE
 	xgettext -f $TMPFILE -F -L java \
-                 --keyword=_ --keyword=_x --keyword=cssHelper._ --keyword=cssHelper.title \
+                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
                  --keyword=handler._ --keyword=formhandler._ \
 	         -o ${i}t
 	if [ $? -ne 0 ]
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index ed48e544bb..c4f72738ee 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config advanced")%>
+<%=intl.title("config advanced")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
@@ -12,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><%=cssHelper._("I2P Advanced Configuration")%></h1>
+<h1><%=intl._("I2P Advanced Configuration")%></h1>
 <div class="main" id="main">
 
  <%@include file="confignav.jsp" %>
@@ -29,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><%=cssHelper._("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><%=cssHelper._("NOTE")%>:</b> <%=cssHelper._("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 10f4271d77..8a929782d4 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config clients")%>
+<%=intl.title("config clients")%>
 <style type='text/css'>
 button span.hide{
     display:none;
@@ -15,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><%=cssHelper._("I2P Client Configuration")%></h1>
+<h1><%=intl._("I2P Client Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -30,8 +30,8 @@ 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><%=cssHelper._("Client Configuration")%></h3><p>
- <%=cssHelper._("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
@@ -39,7 +39,7 @@ button span.hide{
 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><%=cssHelper._("WebApp Configuration")%></h3><p>
+</div></div><h3><%=intl._("WebApp Configuration")%></h3><p>
  The Java web applications listed below are started by the webConsole client and run in the same JVM as the router.
  They are usually web applications accessible through the router console.
  They may be complete applications (e.g. i2psnark),
@@ -52,7 +52,7 @@ All changes require restart to take effect.</i>
  </p><div class="wideload"><p>
  <jsp:getProperty name="clientshelper" property="form2" />
  </p><p>
- <i><%=cssHelper._("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 1f24dc81e5..ac06feafef 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -4,11 +4,11 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config keyring")%>
+<%=intl.title("config keyring")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("I2P Keyring Configuration")%></h1>
+<h1><%=intl._("I2P Keyring Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -18,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><%=cssHelper._("Keyring")%></h2><p>
- <%=cssHelper._("The router keyring is used to decrypt encrypted leaseSets.")%>
- <%=cssHelper._("The keyring may contain keys for local or remote encrypted destinations.")%></p>
+<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>
@@ -30,16 +30,16 @@
     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><%=cssHelper._("Manual Keyring Addition")%></h3><p>
- <%=cssHelper._("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>
   <div class="wideload">
       <p><table><tr>
-          <td class="mediumtags" align="right"><%=cssHelper._("Dest. name, hash, or full key")%>:</td>
+          <td class="mediumtags" align="right"><%=intl._("Dest. name, hash, or full key")%>:</td>
           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
         </tr><tr>
-          <td class="mediumtags" align="right"><%=cssHelper._("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" />
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index d1fa8bbcb1..c83421c695 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -4,13 +4,13 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config logging")%>
+<%=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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("(the symbol '@' will be replaced during log rotation)")%></i></td>
-        </tr><tr><td class="mediumtags" align="right"><b><%=cssHelper._("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><%=cssHelper._("Log date format")%>:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log date format")%>:</b></td>
           <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
             <br> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
             = second, 'SSS' = millisecond)</i></td>
-        </tr><tr><td class="mediumtags" align="right"><b><%=cssHelper._("Max log file size")%>:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Max log file size")%>:</b></td>
           <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br></td>
-        </tr><tr><td class="mediumtags" align="right"><b><%=cssHelper._("Default log level")%>:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Default log level")%>:</b></td>
           <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /><br><i>(DEBUG and INFO are not recommended defaults,
             as they will drastically slow down your router)</i></td>
-        </tr><tr><td class="mediumtags" align="right"><b><%=cssHelper._("Log level overrides")%>:</b></td>
+        </tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log level overrides")%>:</b></td>
           <td><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
         </tr><tr><td colspan="2"><hr></td>
         </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction">
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index a5b47ef998..247b909cfb 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/apps/routerconsole/jsp/configpeer.jsp
@@ -4,11 +4,11 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config peers")%>
+<%=intl.title("config peers")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("I2P Peer Configuration")%></h1>
+<h1><%=intl._("I2P Peer Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -35,11 +35,11 @@
  <a name="sh"> </a>
  <a name="unsh"> </a>
  <a name="bonus"> </a>
- <h2><%=cssHelper._("Manual Peer Controls")%></h2>
- <div class="mediumtags"><p><%=cssHelper._("Router Hash")%>:
+ <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><%=cssHelper._("Manually Ban / Unban a Peer")%></h3>
- <p><%=cssHelper._("Banning will prevent the participation of this peer in tunnels you create.")%></p>
+ <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" />
@@ -48,7 +48,7 @@
         <% } %>
       </div>
 
- <h3><%=cssHelper._("Adjust Profile Bonuses")%></h3>
+ <h3><%=intl._("Adjust Profile Bonuses")%></h3>
  <p>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
@@ -58,9 +58,9 @@
         // get existing bonus values?
     }
  %>
- <div class="mediumtags"><p><%=cssHelper._("Speed")%>:
+ <div class="mediumtags"><p><%=intl._("Speed")%>:
  <input type="text" size="8" name="speed" value="<%=speed%>" />
- <%=cssHelper._("Capacity")%>:
+ <%=intl._("Capacity")%>:
  <input type="text" size="8" name="capacity" value="<%=capacity%>" />
  <input type="submit" name="action" value="Adjust peer bonuses" /></p></div>
  </form>
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index e1ecd0776d..b21e528059 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -4,11 +4,11 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config service")%>
+<%=intl.title("config service")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("I2P Service Configuration")%></h1>
+<h1><%=intl._("I2P Service Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -22,7 +22,7 @@
     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><%=cssHelper._("Shutdown the router")%></h3>
+ <h3><%=intl._("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>
@@ -44,7 +44,7 @@
  <% } %></div>
 
  <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>
- <h3><%=cssHelper._("Systray integration")%></h3>
+ <h3><%=intl._("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).
@@ -52,7 +52,7 @@
  <hr><div class="formaction">
  <input type="submit" name="action" value="Show systray icon" />
  <input type="submit" name="action" value="Hide systray icon" />
-</div><h3><%=cssHelper._("Run on startup")%></h3>
+</div><h3><%=intl._("Run on startup")%></h3>
  <p>You can control whether I2P is run on startup or not by selecting one of the
  following options - I2P will install (or remove) a service accordingly.  You can
  also run the <code>install_i2p_service_winnt.bat</code> (or
@@ -66,7 +66,7 @@
  <% } %>
 
  <% if (System.getProperty("wrapper.version") != null) { %>
- <h3><%=cssHelper._("Debugging")%></h3>
+ <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>
@@ -74,7 +74,7 @@
  <input type="submit" name="action" value="Dump threads" />
 <% } %></div>
 
- <h3><%=cssHelper._("Launch browser on router startup?")%></h3>
+ <h3><%=intl._("Launch browser on router startup?")%></h3>
  <p>I2P's main configuration interface is this web console, so for your convenience
  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
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 085949fd74..cfb2dd8ccd 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config stats")%>
+<%=intl.title("config stats")%>
 <script type="text/javascript">
 function init()
 {
@@ -53,7 +53,7 @@ function toggleAll(category)
 </script>
 </head><body onLoad="init();">
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("I2P Stats Configuration")%></h1>
+<h1><%=intl._("I2P Stats Configuration")%></h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
 
@@ -71,13 +71,13 @@ 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><%=cssHelper._("Configure I2P Stat Collection")%></h3>
- <p><%=cssHelper._("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" <% } %>/>
- (<%=cssHelper._("change requires restart to take effect")%>)<br>
- <%=cssHelper._("Stat file")%>: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br>
-<%=cssHelper._("Filter")%>: (<a href="javascript: void(null);" onclick="toggleAll('*')"><%=cssHelper._("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">
  <p><table>
  <% while (statshelper.hasMoreStats()) {
@@ -85,11 +85,11 @@ function toggleAll(category)
  <tr class="tablefooter">
      <td align="left" colspan="3">
      <b><%=statshelper.getCurrentGroupName()%></b>
-     (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=cssHelper._("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><%=cssHelper._("Log")%></b></td>
-    <td align="center"><b><%=cssHelper._("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 %>
@@ -106,7 +106,7 @@ function toggleAll(category)
     } // 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"><%=cssHelper._("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></p></div></form></div></div></body></html>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index 5896c6e4f0..368aa43a75 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -4,14 +4,14 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config tunnels")%>
+<%=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><%=cssHelper._("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" />
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 1bf276237c..8742ba8440 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("config UI")%>
+<%=intl.title("config UI")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
@@ -21,7 +21,7 @@
  <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"><h3><%=uihelper._("Router Console Theme")%></h3>
+<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);
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index 9e3851e70b..bda8864c82 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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("News &amp; I2P Updates")%>:</b></td>
-          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=cssHelper._("Update In Progress")%></i><br> <% } else { %> <input type="submit" name="action" value="Check for updates" />
+        <tr><td class= "mediumtags" align="right"><b><%=intl._("News &amp; I2P Updates")%>:</b></td>
+          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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><%=cssHelper._("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 62aceaa93f..613b32a678 100644
--- a/apps/routerconsole/jsp/css.jsp
+++ b/apps/routerconsole/jsp/css.jsp
@@ -23,17 +23,17 @@
 %>
 <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="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
+<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
 <%
    // make the fonts bigger for chinese
-   if (cssHelper.getLang().equals("zh")) {
+   if (intl.getLang().equals("zh")) {
 %>
-<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console_big.css" rel="stylesheet" type="text/css">
+<link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_big.css" rel="stylesheet" type="text/css">
 <%
    }
 %>
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index 81fff617ef..c295431640 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -14,7 +14,7 @@
 %>
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("Page Not Found")%>
+<%=intl.title("Page Not Found")%>
 </head><body>
 <%
 if (System.getProperty("router.consoleNonce") == null) {
@@ -24,6 +24,6 @@ if (System.getProperty("router.consoleNonce") == null) {
 <%@include file="summary.jsp" %>
 <h1><%=ERROR_CODE%> <%=ERROR_MESSAGE%></h1>
 <div class="sorry" id="warning">
-<%=cssHelper._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%><hr>
-<%=cssHelper._("Error 404")%>: <%=ERROR_URI%> <%=cssHelper._("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 700f54ed58..1ad8730416 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -4,11 +4,11 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("graphs")%>
+<%=intl.title("graphs")%>
 </head><body>
 
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("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 50efc24771..2fbfb6dc11 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -4,7 +4,7 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("home")%>
+<%=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><%=cssHelper._("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 c70bd6aab1..c53ea0a445 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@@ -4,9 +4,9 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("job queue")%>
+<%=intl.title("job queue")%>
 </head><body>
-<%@include file="summary.jsp" %><h1><%=cssHelper._("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")%>" />
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index d7dc76bb7e..859aba705d 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -4,13 +4,13 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("logs")%>
+<%=intl.title("logs")%>
 </head><body>
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("I2P Router Logs")%></h1>
+<h1><%=intl._("I2P Router Logs")%></h1>
 <div class="main" id="main">
- <div class="joblog"><h3><%=cssHelper._("I2P Version & Running Environment")%></h3><a name="version"> </a>
- <i><%=cssHelper._("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>
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index 677c777d23..bc954d2bff 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/apps/routerconsole/jsp/netdb.jsp
@@ -4,10 +4,10 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("network database summary")%>
+<%=intl.title("network database summary")%>
 </head><body>
 <%@include file="summary.jsp" %>
- <h1><%=cssHelper._("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 1e6c1d9eeb..7617ec565c 100644
--- a/apps/routerconsole/jsp/oldstats.jsp
+++ b/apps/routerconsole/jsp/oldstats.jsp
@@ -4,13 +4,13 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("statistics")%>
+<%=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><%=cssHelper._("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 bf66ed6cb0..351ad10b6a 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/apps/routerconsole/jsp/peers.jsp
@@ -4,10 +4,10 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("peer connections")%>
+<%=intl.title("peer connections")%>
 </head><body>
 <%@include file="summary.jsp" %>
-<h1><%=cssHelper._("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 281c05bf94..6064067ff9 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -4,9 +4,9 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("peer profiles")%>
+<%=intl.title("peer profiles")%>
 </head><body><%@include file="summary.jsp" %>
-<h1><%=cssHelper._("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 9033170c68..9c126be703 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@@ -4,9 +4,9 @@
 
 <html><head>
 <%@include file="css.jsp" %>
-<%=cssHelper.title("tunnel summary")%>
+<%=intl.title("tunnel summary")%>
 </head><body>
-<%@include file="summary.jsp" %><h1><%=cssHelper._("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/history.txt b/history.txt
index b141d99945..30fa01e8f4 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/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index b54d1de4bc..5a4225cae2 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;
