diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index d9ff34695..4fda75eff 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -28,6 +28,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
 <jsp:useBean id="book" class="i2p.susi.dns.AddressbookBean" scope="session" />
+<jsp:useBean id="intl" class="i2p.susi.dns.Messages" scope="application" />
 <jsp:setProperty name="book" property="*" />
 <jsp:setProperty name="book" property="resetDeletionMarks" value="1"/>
 <c:forEach items="${paramValues.checked}" var="checked">
@@ -37,7 +38,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>${book.book} addressbook - susidns v${version.version}</title>
+<title>${book.book} <%=intl._("addressbook")%> - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
 <body>
@@ -47,19 +48,20 @@
 </div>
 <hr>
 <div id="navi">
-<p>addressbooks
-<a href="addressbook.jsp?book=master&filter=none&begin=0&end=99">master</a> |
-<a href="addressbook.jsp?book=router&filter=none&begin=0&end=99">router</a> |
-<a href="addressbook.jsp?book=published&filter=none&begin=0&end=99">published</a> |
-<a href="addressbook.jsp?book=private&filter=none&begin=0&end=99">private</a> *
-<a href="subscriptions.jsp">subscriptions</a> *
-<a href="config.jsp">configuration</a> *
-<a href="index.jsp">overview</a>
+<p>
+<%=intl._("addressbooks")%>
+<a href="addressbook.jsp?book=private&filter=none&begin=0&end=99"><%=intl._("private")%></a> |
+<a href="addressbook.jsp?book=master&filter=none&begin=0&end=99"><%=intl._("master")%></a> |
+<a href="addressbook.jsp?book=router&filter=none&begin=0&end=99"><%=intl._("router")%></a> |
+<a href="addressbook.jsp?book=published&filter=none&begin=0&end=99"><%=intl._("published")%></a> *
+<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> *
+<a href="config.jsp"><%=intl._("configuration")%></a> *
+<a href="index.jsp"><%=intl._("overview")%></a>
 </p>
 </div>
 <hr>
 <div id="headline">
-<h3>${book.book} addressbook at ${book.fileName}</h3>
+<h3><%=intl._(book.getBook())%> <%=intl._("addressbook")%>: ${book.fileName}</h3>
 </div>
 
 <div id="messages">${book.messages}</div>
@@ -68,7 +70,7 @@
 
 <c:if test="${book.notEmpty}">
 <div id="filter">
-<p>Filter:
+<p><%=intl._("Filter")%>:
 <a href="addressbook.jsp?filter=a&begin=0&end=99">a</a>
 <a href="addressbook.jsp?filter=b&begin=0&end=99">b</a>
 <a href="addressbook.jsp?filter=c&begin=0&end=99">c</a> 
@@ -96,10 +98,10 @@
 <a href="addressbook.jsp?filter=y&begin=0&end=99">y</a>
 <a href="addressbook.jsp?filter=z&begin=0&end=99">z</a>
 <a href="addressbook.jsp?filter=0-9&begin=0&end=99">0-9</a>
-<a href="addressbook.jsp?filter=none&begin=0&end=99">all</a></p>
+<a href="addressbook.jsp?filter=none&begin=0&end=99"><%=intl._("all")%></a></p>
 <c:if test="${book.hasFilter}">
-<p>Current filter: ${book.filter}
-(<a href="addressbook.jsp?filter=none&begin=0&end=99">clear filter</a>)</p>
+<p><%=intl._("Current filter")%>: ${book.filter}
+(<a href="addressbook.jsp?filter=none&begin=0&end=99"><%=intl._("clear filter")%></a>)</p>
 </c:if>
 </div>
 
@@ -108,7 +110,7 @@
 <input type="hidden" name="end" value="99">
 <div id="search">
 <table><tr>
-<td class="search">Search: <input type="text" name="search" value="${book.search}" size="20" ></td>
+<td class="search"><%=intl._("Search")%>: <input type="text" name="search" value="${book.search}" size="20" ></td>
 <td class="search"><input type="image" src="images/search.png" name="submitsearch" value="search" alt="Search" ></td>
 </tr>
 </table>
@@ -133,17 +135,17 @@
 <th>&nbsp;</th>
 </c:if>
 
-<th>Name</th>
-<th>Destination</th>
+<th><%=intl._("Name")%></th>
+<th><%=intl._("Destination")%></th>
 </tr>
 <!-- limit iterator, or "Form too large" may result on submit, and is a huge web page if we don't -->
 <c:forEach items="${book.entries}" var="addr" begin="${book.begin}" end="${book.end}">
 <tr class="list${book.trClass}">
 <c:if test="${book.master || book.router || book.published || book.private}">
-<td class="checkbox"><input type="checkbox" name="checked" value="${addr.name}" alt="Mark for deletion"></td>
+<td class="checkbox"><input type="checkbox" name="checked" value="${addr.name}" title="<%=intl._("Mark for deletion")%>"></td>
 </c:if>
 <td class="names"><a href="http://${addr.name}/">${addr.name}</a> -
-<span class="addrhlpr"><a href="http://${addr.name}/?i2paddresshelper=${addr.destination}">(addrhlpr)</a></span>
+<span class="addrhlpr">(<a href="http://${addr.name}/?i2paddresshelper=${addr.destination}"><%=intl._("address helper link")%></a>)</span>
 </td>
 <td class="destinations"><textarea rows="1" style="height: 3em;" cols="40" wrap="off" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td>
 </tr>
@@ -162,15 +164,15 @@
 
 <c:if test="${book.isEmpty}">
 <div id="book">
-<p class="book">The ${book.book} addressbook is empty.</p>
+<p class="book"><%=intl._("This addressbook is empty.")%></p>
 </div>
 </c:if>
 
 <div id="add">
 <p class="add">
-<h3>Add new destination:</h3>
-<b>Hostname:</b> <input type="text" name="hostname" value="${book.hostname}" size="20">
-<b>Destination:</b> <textarea name="destination" rows="1" style="height: 3em;" cols="40" wrap="off" >${book.destination}</textarea><br/>
+<h3><%=intl._("Add new destination")%>:</h3>
+<b><%=intl._("Hostname")%>:</b> <input type="text" name="hostname" value="${book.hostname}" size="20">
+<b><%=intl._("Destination")%>:</b> <textarea name="destination" rows="1" style="height: 3em;" cols="40" wrap="off" >${book.destination}</textarea><br/>
 </p><p>
 <input type="image" name="action" value="add" src="images/add.png" alt="Add destination" >
 </p>
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index 415bec755..4c3cefbdf 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -28,12 +28,13 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application"/>
 <jsp:useBean id="cfg" class="i2p.susi.dns.ConfigBean" scope="session"/>
+<jsp:useBean id="intl" class="i2p.susi.dns.Messages" scope="application" />
 <jsp:setProperty name="cfg" property="*" />
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>configuration - susidns v${version.version}</title>
+<title><%=intl._("configuration")%> - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
 <body>
@@ -43,14 +44,14 @@
 </div><hr>
 <div id="navi">
 <p>
-addressbooks
-<a href="addressbook.jsp?book=master">master</a> |
-<a href="addressbook.jsp?book=router">router</a> |
-<a href="addressbook.jsp?book=published">published</a> |
-<a href="addressbook.jsp?book=private">private</a> *
-<a href="subscriptions.jsp">subscriptions</a> *
-configuration *
-<a href="index.jsp">overview</a>
+<%=intl._("addressbooks")%>
+<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
+<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
+<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
+<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
+<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> *
+<%=intl._("configuration")%> *
+<a href="index.jsp"><%=intl._("overview")%></a>
 </p>
 </div><hr>
 <div id="headline">
@@ -68,30 +69,58 @@ configuration *
 </div>
 </form>
 <div id="help">
-<h3>Hints</h3>
+<h3><%=intl._("Hints")%></h3>
 <ol>
-<li>All file or directory paths here are relative to the addressbook's working directory, which normally
-is located at $I2P/addressbook/.</li>
-<li>If you want to manually add lines to an addressbook, add them to the private or master addressbooks. The router
-addressbook and the published addressbook are overwritten by the addressbook application.</li>
-<li><b>Important:</b>When you publish your addressbook, <b>ALL</b> destinations from the master and router addressbooks appear there.
-Use the private addressbook for private destinations, these are not published.
+<li>
+<%=intl._("File and directory paths here are relative to the addressbook's working directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P\\addressbook\\ (Windows).")%>
+</li>
+<li>
+<%=intl._("If you want to manually add lines to an addressbook, add them to the private or master addressbooks.")%>
+<%=intl._("The router addressbook and the published addressbook are updated by the addressbook application.")%>
+</li>
+<li>
+<%=intl._("When you publish your addressbook, ALL destinations from the master and router addressbooks appear there.")%>
+<%=intl._("Use the private addressbook for private destinations, these are not published.")%>
 </li>
 </ol>
-<h3>Options</h3>
+<h3><%=intl._("Options")%></h3>
 <ul>
-<li><b>subscriptions</b> - file containing the list of subscriptions URLs (no need to change)</li>
-<li><b>update_delay</b> - update interval in hours (no need to change)</li>
-<li><b>published_addressbook</b> - your public hosts.txt file (choose a path within your webserver document root)</li>
-<li><b>router_addressbook</b> - your hosts.txt (don't change)</li>
-<li><b>master_addressbook</b> - your personal addressbook, it never gets overwritten by the addressbook (don't change)</li>
-<li><b>private_addressbook</b> - your private addressbook, it is never published (defaults to ../privatehosts.txt, don't change)</li>
-<li><b>proxy_port</b> - http port for your eepProxy (no need to change)</li>
-<li><b>proxy_host</b> - hostname for your eepProxy (no need to change)</li>
-<li><b>should_publish</b> - true/false whether to write the published addressbook</li>
-<li><b>etags</b> - file containing the etags header from the fetched subscription URLs (no need to change)</li>
-<li><b>last_modified</b> - file containing the modification timestamp for each fetched subscription URL (no need to change)</li>
-<li><b>log</b> - file to log activity to (change to /dev/null if you like)</li>
+<li><b>subscriptions</b> -
+<%=intl._("File containing the list of subscriptions URLs (no need to change)")%>
+</li>
+<li><b>update_delay</b> -
+<%=intl._("Update interval in hours")%>
+</li>
+<li><b>published_addressbook</b> -
+<%=intl._("Your public hosts.txt file (choose a path within your webserver document root)")%>
+</li>
+<li><b>router_addressbook</b> -
+<%=intl._("Your hosts.txt (don't change)")%>
+</li>
+<li><b>master_addressbook</b> -
+<%=intl._("Your personal addressbook, these hosts will be published")%>
+</li>
+<li><b>private_addressbook</b> -
+<%=intl._("Your private addressbook, it is never published")%>
+</li>
+<li><b>proxy_port</b> -
+<%=intl._("Port for your eepProxy (no need to change)")%>
+</li>
+<li><b>proxy_host</b> -
+<%=intl._("Hostname for your eepProxy (no need to change)")%>
+</li>
+<li><b>should_publish</b> -
+<%=intl._("Whether to update the published addressbook")%>
+</li>
+<li><b>etags</b> -
+<%=intl._("File containing the etags header from the fetched subscription URLs (no need to change)")%>
+</li>
+<li><b>last_modified</b> -
+<%=intl._("File containing the modification timestamp for each fetched subscription URL (no need to change)")%>
+</li>
+<li><b>log</b> -
+<%=intl._("File to log activity to (change to /dev/null if you like)")%>
+</li>
 </ul>
 </div><hr>
 <div id="footer">
diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp
index 581b638f9..0f56bdf18 100644
--- a/apps/susidns/src/jsp/index.jsp
+++ b/apps/susidns/src/jsp/index.jsp
@@ -32,7 +32,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><%=intl._("Introduction - SusiDNS")%> v${version.version}</title>
+<title><%=intl._("Introduction")%> - SusiDNS v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
 <body>
@@ -42,40 +42,40 @@
 </div>
 <hr>
 <div id="navi">
-<p>addressbooks
-<a href="addressbook.jsp?book=master">master</a> |
-<a href="addressbook.jsp?book=router">router</a> |
-<a href="addressbook.jsp?book=published">published</a> |
-<a href="addressbook.jsp?book=private">private</a> *
-<a href="subscriptions.jsp">subscriptions</a> *
-<a href="config.jsp">configuration</a> *
-overview
+<p>
+<%=intl._("addressbooks")%>
+<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
+<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
+<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
+<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
+<a href="subscriptions.jsp"><%=intl._("subscriptions")%></a> *
+<a href="config.jsp"><%=intl._("configuration")%></a> *
+<%=intl._("overview")%>
 </p>
 </div>
 <hr>
 <div id="content">
-<h3>Huh? what addressbook?</h3>
+<h3><%=intl._("What is the addressbook?")%></h3>
 <p>
-The addressbook application is part of your i2p installation. It regularly updates your hosts.txt file
-from distributed sources. It keeps your hosts.txt up to date, so it can automatically add
-eepsites announced on other sites if you subscribe to those sites' addressbooks.
+<%=intl._("The addressbook application is part of your i2p installation.")%>
+<%=intl._("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%>
 </p>
 <p>
-(To speak the truth: In its default configuration the addressbook does not poll
-additional sites, but www.i2p2.i2p only. Subscribing to additional sites is an easy task,
-just add them to your <a href="subscriptions.jsp">subscriptions</a> file.)
+<%=intl._("In the default configuration, the addressbook is only subscribed to www.i2p2.i2p.")%>
+<%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions.jsp\">subscriptions</a> file.")%>
 </p>
-<p>If you have questions about naming in i2p, there is an excellent <a href="http://forum.i2p/viewtopic.php?t=134">introduction</a>
-from duck in the forum and <a href="http://www.i2p2.i2p/naming.html">additional information on www.i2p2.i2p</a>.</p>
-<h3>How does the addressbook work?</h3>
-<p>The addressbook application regularly (normally once per hour) polls your subscriptions and merges their content
-into your so-called router addressbook (normally your plain hosts.txt). Then it merges your so-called master addressbook (normally
-your userhosts.txt) into the router addressbook as well. If configured, the router addressbook is now written to the published addressbook, 
-which is a publicly available copy of your hosts.txt somewhere in your eepsite's document root.
+<p>
+<%=intl._("For more information on naming in i2p, see <a href=\"http://www.i2p2.i2p/naming.html\">the overview on www.i2p2.i2p</a>.")%>
+</p>
+<h3><%=intl._("How does the addressbook work?")%></h3>
+<p>
+<%=intl._("The addressbook application regularly polls your subscriptions and merges their content into your \"router\" addressbook, stored in the hosts.txt file.")%>
+<%=intl._("Then it merges your \"master\" addressbook (userhosts.txt) into the router addressbook as well.")%>
+<%=intl._("If configured, the router addressbook is now written to the \"published\" addressbook, which will be publicly available if you are running an eepsite.")%>
 </p><p>
-The router also uses a private addressbook (privatehosts.txt, not shown in the picture), which is not merged or published.
-Hosts in the private addressbook can be accessed by you but their addresses are never distributed to others.
-The private addressbook can also be used for aliases of hosts in your other addressbooks.
+<%=intl._("The router also uses a private addressbook (privatehosts.txt, not shown in the picture), which is not merged or published.")%>
+<%=intl._("Hosts in the private addressbook can be accessed by you but their addresses are never distributed to others.")%>
+<%=intl._("The private addressbook can also be used for aliases of hosts in your other addressbooks.")%>
 </p>
 <p><center><img src="images/how.png" border="0" alt="addressbook working scheme" title="How the addressbook works" class="illustrate" /></center></p>
 </div>	
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index a60710310..7485e10bc 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -28,12 +28,13 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />
 <jsp:useBean id="subs" class="i2p.susi.dns.SubscriptionsBean" scope="session" />
+<jsp:useBean id="intl" class="i2p.susi.dns.Messages" scope="application" />
 <jsp:setProperty name="subs" property="*" />
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>subscriptions - susidns v${version.version}</title>
+<title><%=intl._("subscriptions")%> - susidns v${version.version}</title>
 <link rel="stylesheet" type="text/css" href="css.css">
 </head>
 <body>
@@ -42,14 +43,15 @@
 <img src="images/logo.png" alt="susidns logo" border="0"/>
 </div><hr>
 <div id="navi">
-<p>addressbooks
-<a href="addressbook.jsp?book=master">master</a> |
-<a href="addressbook.jsp?book=router">router</a> |
-<a href="addressbook.jsp?book=published">published</a> |
-<a href="addressbook.jsp?book=private">private</a> *
-subscriptions *
-<a href="config.jsp">configuration</a> *
-<a href="index.jsp">overview</a>
+<p>
+<%=intl._("addressbooks")%>
+<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> |
+<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> |
+<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> |
+<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> *
+<%=intl._("subscriptions")%> *
+<a href="config.jsp"><%=intl._("configuration")%></a> *
+<a href="index.jsp"><%=intl._("overview")%></a>
 </p>
 </div><hr>
 <div id="headline">
@@ -67,13 +69,13 @@ subscriptions *
 </div>
 </form>
 <div id="help">
-<h3>Explanation</h3>
 <p class="help">
-The subscription file contains a list of (i2p) URLs. The addressbook application
-regularly (once per hour) checks this list for new eepsites. Those URLs simply contain the published hosts.txt
-file of other people. The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.
-So it is a good idea to add additional subscriptions to sites that have the latest addresses.
-<a href="http://www.i2p2.i2p/faq.html#subscriptions">See the FAQ for a list of subscription URLs.</a>
+<%=intl._("The subscription file contains a list of i2p URLs.")%>
+<%=intl._("The addressbook application regularly checks this list for new eepsites.")%>
+<%=intl._("Those URLs refer to published hosts.txt files.")%>
+<%=intl._("The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.")%>
+<%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%>
+<a href="http://www.i2p2.i2p/faq.html#subscriptions"><%=intl._("See the FAQ for a list of subscription URLs.")%></a>
 </p>
 </div><hr>
 <div id="footer">
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index aea509c4d..0116da736 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 = 7;
+    public final static long BUILD = 8;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
