merge of '5aab7ebb6f496024fff1cc4b87e39475a7277db0'

     and 'b2e508dbe3e9c7c67bb38d3f573481ae3fb8c9b3'

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

@@ -28,10 +28,10 @@ public class HomeHelper extends HelperBase {
         _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "wrench_orange.png" + S +
         _x("Configure Language") + S + _x("Console Language Selection") + S + "/configui" + S + I + "wrench_orange.png" + S +
         _x("Customize Home Page") + S + _x("I2P Home Page Configuration") + S + "/confighome" + S + I + "wrench_orange.png" + S +
-        _x("Email") + S + _x("Anonymous webmail client") + S + "/webmail" + S + I + "email.png" + S +
+        _x("Email") + S + _x("Anonymous webmail client") + S + "/susimail/susimail" + S + I + "email.png" + S +
         _x("Help") + S + _x("I2P Router Help") + S + "/help" + S + I + "help.png" + S +
         _x("Router Console") + S + _x("I2P Router Console") + S + "/console" + S + I + "wrench_orange.png" + S +
-        _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/torrents" + S + I + "film.png" + S +
+        _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/i2psnark/" + S + I + "film.png" + S +
         _x("Website") + S + _x("Local web server") + S + "http://127.0.0.1:7658/" + S + I + "server.png" + S +
         "";
 

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

@@ -156,13 +156,13 @@ public class SummaryBarRenderer {
 
                    "<hr class=\"b\"><table><tr><td>" +
 
-                   "<a href=\"/webmail\" target=\"_top\" title=\"")
+                   "<a href=\"/susimail/susimail\" target=\"_blank\" title=\"")
            .append(_("Anonymous webmail client"))
            .append("\">")
            .append(_("Email"))
            .append("</a>\n" +
 
-                   "<a href=\"/torrents\" target=\"_top\" title=\"")
+                   "<a href=\"/i2psnark/\" target=\"_blank\" title=\"")
            .append(_("Built-in anonymous BitTorrent Client"))
            .append("\">")
            .append(_("Torrents"))