From 65348b2365fe159a8c0dd6485527ab905664d4cb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 8 Jan 2015 18:20:08 +0000
Subject: [PATCH] more renaming

---
 .../i2p/i2ptunnel/I2PTunnelHTTPClient.java    | 10 ++--
 .../i2p/i2ptunnel/I2PTunnelHTTPServer.java    |  2 +-
 apps/i2ptunnel/locale-proxy/messages_ar.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_cs.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_de.po    | 50 +++++++++---------
 apps/i2ptunnel/locale-proxy/messages_en.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_es.po    | 52 +++++++++----------
 apps/i2ptunnel/locale-proxy/messages_fr.po    | 52 +++++++++----------
 apps/i2ptunnel/locale-proxy/messages_hu.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_it.po    | 36 ++++++-------
 apps/i2ptunnel/locale-proxy/messages_nb.po    | 36 ++++++-------
 apps/i2ptunnel/locale-proxy/messages_nl.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_pl.po    | 36 ++++++-------
 apps/i2ptunnel/locale-proxy/messages_pt.po    | 36 ++++++-------
 apps/i2ptunnel/locale-proxy/messages_pt_BR.po | 40 +++++++-------
 apps/i2ptunnel/locale-proxy/messages_ro.po    | 52 +++++++++----------
 apps/i2ptunnel/locale-proxy/messages_ru.po    | 36 ++++++-------
 apps/i2ptunnel/locale-proxy/messages_sk.po    | 38 +++++++-------
 apps/i2ptunnel/locale-proxy/messages_sv.po    | 52 +++++++++----------
 apps/i2ptunnel/locale-proxy/messages_uk.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_vi.po    | 30 +++++------
 apps/i2ptunnel/locale-proxy/messages_zh.po    | 30 +++++------
 .../proxy/ahelper-conflict-header.ht          |  2 +-
 installer/resources/proxy/dnf-header.ht       |  8 +--
 installer/resources/proxy/dnfb-header.ht      |  2 +-
 installer/resources/proxy/dnfh-header.ht      |  6 +--
 installer/resources/proxy/enc-header.ht       |  6 +--
 installer/resources/proxy/nols-header.ht      |  8 +--
 28 files changed, 400 insertions(+), 400 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index e5d94cfb18..a60cf22f06 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -122,8 +122,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
             "<html><body><H1>I2P ERROR: Destination key conflict</H1>" +
             "The addresshelper link you followed specifies a different destination key " +
             "than a host entry in your host database. " +
-            "Someone could be trying to impersonate another eepsite, " +
-            "or people have given two eepsites identical names.<p>" +
+            "Someone could be trying to impersonate another website, " +
+            "or people have given two websites identical names.<p>" +
             "You can resolve the conflict by considering which key you trust, " +
             "and either discarding the addresshelper link, " +
             "discarding the host entry from your host database, " +
@@ -1183,11 +1183,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 "<input type=\"hidden\" name=\"host\" value=\"" + destination + "\">\n" +
                 "<input type=\"hidden\" name=\"dest\" value=\"" + ahelperKey + "\">\n" +
                 "<input type=\"hidden\" name=\"nonce\" value=\"" + _proxyNonce + "\">\n" +
-                "<button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" + _("Save {0} to router address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
+                "<button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" + _("Save {0} to router address book and continue to website", destination) + "</button><br>\n").getBytes("UTF-8"));
         if(_context.namingService().getName().equals("BlockfileNamingService")) {
             // only blockfile supports multiple books
-            out.write(("<br><button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
-            out.write(("<button type=\"submit\" name=\"private\" value=\"private\">" + _("Save {0} to private address book and continue to eepsite", destination) + "</button>\n").getBytes("UTF-8"));
+            out.write(("<br><button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to website", destination) + "</button><br>\n").getBytes("UTF-8"));
+            out.write(("<button type=\"submit\" name=\"private\" value=\"private\">" + _("Save {0} to private address book and continue to website", destination) + "</button>\n").getBytes("UTF-8"));
         }
         // Firefox (and others?) don't send referer to meta refresh target, which is
         // what the jump servers use, so this isn't that useful.
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
index 37104206ae..e20a184d33 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
@@ -78,7 +78,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
          "\r\n"+
          "<html><head><title>503 Service Unavailable</title></head>\n"+
          "<body><h2>503 Service Unavailable</h2>\n" +
-         "<p>This I2P eepsite is unavailable. It may be down or undergoing maintenance.</p>\n" +
+         "<p>This I2P website is unavailable. It may be down or undergoing maintenance.</p>\n" +
          "</body></html>")
          .getBytes();
 
diff --git a/apps/i2ptunnel/locale-proxy/messages_ar.po b/apps/i2ptunnel/locale-proxy/messages_ar.po
index e495506e4c..560f4eb8a0 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ar.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ar.po
@@ -125,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -166,16 +166,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -192,7 +192,7 @@ msgstr "Ø§Ø³Ù… Ø§Ùˆ Ø§ØªØ¬Ø§Ù‡"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -233,12 +233,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr "ÙˆØ¬Ù‡Ø© Ù…ØÙ„ÙŠØ©"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -305,15 +305,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -444,18 +444,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_cs.po b/apps/i2ptunnel/locale-proxy/messages_cs.po
index 3de1c9b0d9..ddb81e2725 100644
--- a/apps/i2ptunnel/locale-proxy/messages_cs.po
+++ b/apps/i2ptunnel/locale-proxy/messages_cs.po
@@ -126,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -167,16 +167,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -193,7 +193,7 @@ msgstr "jmÃ©no nebo cÃl"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -234,12 +234,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr "CÃl tunelu"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -306,15 +306,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -445,18 +445,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_de.po b/apps/i2ptunnel/locale-proxy/messages_de.po
index 7cd08d0bbc..a5f52f6f9c 100644
--- a/apps/i2ptunnel/locale-proxy/messages_de.po
+++ b/apps/i2ptunnel/locale-proxy/messages_de.po
@@ -136,9 +136,9 @@ msgstr "Der von Ihnen gefolgte Adresshelfer Link definiert einen anderen Destina
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Jemand kann versuchen Ihnen eine gefÃ¤lschte Eepsite darzubieten oder zwei Eepsites haben zufÃ¤Ã¤lig den selben Namen."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Jemand kann versuchen Ihnen eine gefÃ¤lschte Website darzubieten oder zwei Websites haben zufÃ¤Ã¤lig den selben Namen."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -177,17 +177,17 @@ msgstr "Sie haben versucht eine Webseite oder Adresse ausserhalb von I2P zu erre
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "Warnung: Eepsite unerreichbar"
+msgid "Warning: Website Unreachable"
+msgstr "Warnung: Website unerreichbar"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "Die Eepsite wurde nicht erreicht, da deren Leaseset nicht gefunden wurde."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "Die Website wurde nicht erreicht, da deren Leaseset nicht gefunden wurde."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "Die Eepsite ist wahrscheinlich nicht aktiv, aber es kann auch ein Problem im Netzwerk sein"
+"The website is probably down, but there could also be network congestion."
+msgstr "Die Website ist wahrscheinlich nicht aktiv, aber es kann auch ein Problem im Netzwerk sein"
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
 #: ../java/build/Proxy.java:104
@@ -203,7 +203,7 @@ msgstr "Tunnel Ziel"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr "Diese Eepseite war nicht erreichbar, da die verwendeten VerschlÃ¼sselungseinstellungen nicht von deiner I2P- oder Java-Version unterstÃ¼tzt werden."
 
@@ -244,14 +244,14 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Bitte stelle einen Ausgangsproxy in I2PTunnel ein"
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "Die Eepsite ist nicht erreichbar."
+msgid "The website was not reachable."
+msgstr "Die Website ist nicht erreichbar."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Die Eepsite ist offline, das Netzwerk ist Ã¼berlastet oder ihr Router ist nicht gut ins Netzwerk integriert. "
+msgstr "Die Website ist offline, das Netzwerk ist Ã¼berlastet oder ihr Router ist nicht gut ins Netzwerk integriert. "
 
 #: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
@@ -259,9 +259,9 @@ msgstr "lokales Ziel"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "Die genannte Eepsite Adresse ist nicht gÃ¼ltig, oder andersweitig unerreichbar."
+msgstr "Die genannte Website Adresse ist nicht gÃ¼ltig, oder andersweitig unerreichbar."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -316,16 +316,16 @@ msgid ""
 msgstr "Falls Sie weiterhin Probleme haben, kÃ¶nnen Sie {0}hier{1} Ihre Liste der Outproxies Ã¤ndern."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Warnung: Eepsite unbekannt"
+msgid "Warning: Website Unknown"
+msgstr "Warnung: Website unbekannt"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Warnung: Eepsite Adresse nicht im Adressbuch gefunden"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Warnung: Website Adresse nicht im Adressbuch gefunden"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Die Eepsite wurde nicht im Adressbuch ihres Routers gefunden."
+msgid "The website was not found in your router's addressbook."
+msgstr "Die Website wurde nicht im Adressbuch ihres Routers gefunden."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -455,18 +455,18 @@ msgstr "Weiter zu {0}, ohne zu speichern"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "{0} im Router-Adressbuch speichern und auf die Eepseite weiterleiten"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "{0} im Master-Adressbuch speichern und auf die Eepseite weiterleiten"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "{0} im privaten Adressbuch speichern und auf die Eepseite weiterleiten"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_en.po b/apps/i2ptunnel/locale-proxy/messages_en.po
index d02b11d87e..24de8d0ad3 100644
--- a/apps/i2ptunnel/locale-proxy/messages_en.po
+++ b/apps/i2ptunnel/locale-proxy/messages_en.po
@@ -124,8 +124,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given "
-"two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given "
+"two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -165,16 +165,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -191,7 +191,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -232,12 +232,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -304,15 +304,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -441,18 +441,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_es.po b/apps/i2ptunnel/locale-proxy/messages_es.po
index dac696eafa..af816ce856 100644
--- a/apps/i2ptunnel/locale-proxy/messages_es.po
+++ b/apps/i2ptunnel/locale-proxy/messages_es.po
@@ -133,9 +133,9 @@ msgstr "El enlace de ayuda que ha pulsado tienen una clave de destino diferente
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Alguien podrÃa estar intentando hacerse pasar por otra eepsite, o la gente ha puesto nombres idÃ©nticos a varias eepsites."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Alguien podrÃa estar intentando hacerse pasar por otra website, o la gente ha puesto nombres idÃ©nticos a varias websites."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -174,17 +174,17 @@ msgstr "Ha intentado conectarse a una localizaciÃ³n o una web no I2P."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "Advertencia: Eepsite no accesible"
+msgid "Warning: Website Unreachable"
+msgstr "Advertencia: Website no accesible"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "El eepsite no estaba accesible porque no se encontrÃ³ su LeaseSet (grupo de tÃºneles a un destino)"
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "El website no estaba accesible porque no se encontrÃ³ su LeaseSet (grupo de tÃºneles a un destino)"
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "El eepsite probablemente estaba caÃdo, pero tambiÃ©n puedo haber congestiÃ³n en la red."
+"The website is probably down, but there could also be network congestion."
+msgstr "El website probablemente estaba caÃdo, pero tambiÃ©n puedo haber congestiÃ³n en la red."
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
 #: ../java/build/Proxy.java:104
@@ -200,9 +200,9 @@ msgstr "No se pudo encontrar el siguiente destino:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
-msgstr "El eepsite no se pudo alcanzar, porque usa opciones de cifrado que no estÃ¡n soportadas por su versiÃ³n de I2P o de Java."
+msgstr "El website no se pudo alcanzar, porque usa opciones de cifrado que no estÃ¡n soportadas por su versiÃ³n de I2P o de Java."
 
 #: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
 msgid "Could not connect to the following destination:"
@@ -241,14 +241,14 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configure un proxy de salida en el I2PTunnel."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "No se ha podido acceder a la eepsite."
+msgid "The website was not reachable."
+msgstr "No se ha podido acceder a la website."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "La eepsite estÃ¡ pagada, o hay congestiÃ³n en la red, o su ruter no estÃ¡ aÃºn bien integrado con los otros pares."
+msgstr "La website estÃ¡ pagada, o hay congestiÃ³n en la red, o su ruter no estÃ¡ aÃºn bien integrado con los otros pares."
 
 #: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
@@ -256,9 +256,9 @@ msgstr "Aviso: DestinaciÃ³n no vÃ¡lida."
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "La destinaciÃ³n de eepsite especificada no es vÃ¡lida, o quizÃ¡s no se ha podido acceder a ella."
+msgstr "La destinaciÃ³n de website especificada no es vÃ¡lida, o quizÃ¡s no se ha podido acceder a ella."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -313,16 +313,16 @@ msgid ""
 msgstr "Si aÃºn sigue teniendo problemas puede ser que desee editar si lista de outproxies {0}aquÃ{1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Advertencia: Eepsite desconocida."
+msgid "Warning: Website Unknown"
+msgstr "Advertencia: Website desconocida."
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Advertencia: Eepsite no encontrada en la libreta de direcciones"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Advertencia: Website no encontrada en la libreta de direcciones"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "LA eepsite no se encontrÃ³ en su libreta de direcciones."
+msgid "The website was not found in your router's addressbook."
+msgstr "LA website no se encontrÃ³ en su libreta de direcciones."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -452,18 +452,18 @@ msgstr "Acceder a {0} sin guardar"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "Guardar {0} a la libreta de direcciones del router y acceder al sitio i2p."
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "Guardar {0} a la libreta de direcciones principal y acceder al sitio i2p."
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "Guardar {0} a la libreta de direcciones privada y acceder al sitio i2p."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_fr.po b/apps/i2ptunnel/locale-proxy/messages_fr.po
index 72eb78e410..d4ebc3abeb 100644
--- a/apps/i2ptunnel/locale-proxy/messages_fr.po
+++ b/apps/i2ptunnel/locale-proxy/messages_fr.po
@@ -129,9 +129,9 @@ msgstr "Le lien d'assistant d'adresse que vous avez suivi spÃ©cifie une clÃ© de
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Quelqu'un pourrait essayer de se faire passer pour un autre eepsite, ou des gens ont donnÃ© des noms identiques Ã  deux eepsites."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Quelqu'un pourrait essayer de se faire passer pour un autre website, ou des gens ont donnÃ© des noms identiques Ã  deux websites."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -170,17 +170,17 @@ msgstr "Vous avez tentÃ© de vous connecter Ã  un site ou emplacement non-I2P."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "Avertissement : Eepsite inaccessible"
+msgid "Warning: Website Unreachable"
+msgstr "Avertissement : Website inaccessible"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "L'eepsite n'Ã©tait pas accessible, parce que son jeu de bail n'a pas Ã©tÃ© trouvÃ©."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "L'website n'Ã©tait pas accessible, parce que son jeu de bail n'a pas Ã©tÃ© trouvÃ©."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "L'eepsite est probablement hors ligne, mais il pourrait Ã©galement y avoir congestion du rÃ©seau."
+"The website is probably down, but there could also be network congestion."
+msgstr "L'website est probablement hors ligne, mais il pourrait Ã©galement y avoir congestion du rÃ©seau."
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
 #: ../java/build/Proxy.java:104
@@ -196,9 +196,9 @@ msgstr "Destination du tunnel"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
-msgstr "L'eepsite n'Ã©tait pas accessible, parce qu'il utilise les options de chiffrement qui ne sont pas supportÃ©es par votre version d'I2P ou de Java."
+msgstr "L'website n'Ã©tait pas accessible, parce qu'il utilise les options de chiffrement qui ne sont pas supportÃ©es par votre version d'I2P ou de Java."
 
 #: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
 msgid "Could not connect to the following destination:"
@@ -237,14 +237,14 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Veuillez configurer un outproxy dans I2PTunnel."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "Le eepsite n'Ã©tait pas joignable."
+msgid "The website was not reachable."
+msgstr "Le website n'Ã©tait pas joignable."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Le eepsite est hors ligne, ou il y a congestion du rÃ©seau, ou votre routeur n'est pas encore bien intÃ©grÃ© avec les pairs."
+msgstr "Le website est hors ligne, ou il y a congestion du rÃ©seau, ou votre routeur n'est pas encore bien intÃ©grÃ© avec les pairs."
 
 #: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
@@ -252,9 +252,9 @@ msgstr "Avertissement : destination invalide"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "La destination vers l'eepsite spÃ©cifiÃ© n'Ã©tait pas valide, ou autrement Ã©tait inaccessible."
+msgstr "La destination vers l'website spÃ©cifiÃ© n'Ã©tait pas valide, ou autrement Ã©tait inaccessible."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -309,16 +309,16 @@ msgid ""
 msgstr "Si vous continuez Ã  avoir des dÃ©rangements vous pourriez vouloir modifier votre liste de outproxy {0}ici{1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Avertissement : Eepsite inconnu"
+msgid "Warning: Website Unknown"
+msgstr "Avertissement : Website inconnu"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Avertissement : Eepsite pas trouvÃ© dans le carnet d'adresses"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Avertissement : Website pas trouvÃ© dans le carnet d'adresses"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Le eepsite n'a pas Ã©tÃ© trouvÃ© dans le carnet d'adresses de votre routeur."
+msgid "The website was not found in your router's addressbook."
+msgstr "Le website n'a pas Ã©tÃ© trouvÃ© dans le carnet d'adresses de votre routeur."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -448,18 +448,18 @@ msgstr "Aller sur le site i2p {0} sans enregistrer dans un carnet d''adresses. "
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "Ajouter au carnet d''adresse du routeur {0} et aller sur le site i2p"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "Ajouter au carnet d''adresse principal {0} et aller sur le site i2p"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "Ajouter au carnet d''adresse privÃ© {0} et aller sur le site i2p"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_hu.po b/apps/i2ptunnel/locale-proxy/messages_hu.po
index c68ea9baeb..30812aee11 100644
--- a/apps/i2ptunnel/locale-proxy/messages_hu.po
+++ b/apps/i2ptunnel/locale-proxy/messages_hu.po
@@ -124,8 +124,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -165,16 +165,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -191,7 +191,7 @@ msgstr "AlagÃºt cÃ©lÃ¡llomÃ¡sa"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -232,12 +232,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr "Helyi cÃ©lÃ¡llomÃ¡st"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -304,15 +304,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -443,18 +443,18 @@ msgstr "MentÃ©s nÃ©lkÃ¼l tovÃ¡bb ide: {0}"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "{0} mentÃ©se a router cÃmjegyzÃ©kbe Ã©s tovÃ¡bb az eep oldalra"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "{0} mentÃ©se a mester cÃmjegyzÃ©kbe Ã©s tovÃ¡bb az eep oldalra"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "{0} mentÃ©se a privÃ¡t cÃmjegyzÃ©kbe Ã©s tovÃ¡bb az eep oldalra"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_it.po b/apps/i2ptunnel/locale-proxy/messages_it.po
index a82562be67..e97e8822b5 100644
--- a/apps/i2ptunnel/locale-proxy/messages_it.po
+++ b/apps/i2ptunnel/locale-proxy/messages_it.po
@@ -131,8 +131,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -172,16 +172,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -198,7 +198,7 @@ msgstr "Destinazione tunnel"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -239,12 +239,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -254,7 +254,7 @@ msgstr "Destinazione locale"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -311,15 +311,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -450,19 +450,19 @@ msgstr "Continua a {0} senza salvare"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica del router e continua verso l'eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Salva {0} nella rubrica del router e continua verso l'website"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica master e continua verso l'eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Salva {0} nella rubrica master e continua verso l'website"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Salva {0} nella rubrica privata e continua verso l'eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Salva {0} nella rubrica privata e continua verso l'website"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_nb.po b/apps/i2ptunnel/locale-proxy/messages_nb.po
index bbdd905a02..07424b2f58 100644
--- a/apps/i2ptunnel/locale-proxy/messages_nb.po
+++ b/apps/i2ptunnel/locale-proxy/messages_nb.po
@@ -125,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -166,16 +166,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -192,7 +192,7 @@ msgstr "Tunnel destinasjon"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -233,12 +233,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr "Lokal destinasjon"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -305,15 +305,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -444,19 +444,19 @@ msgstr "Fortsett til {0} uten Ã¥ lagre"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Lagre {0} til ruter adressebok og fortsett til eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Lagre {0} til ruter adressebok og fortsett til website"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Save {0} til hoved adressebok og fortsett til eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Save {0} til hoved adressebok og fortsett til website"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Save {0} til privat adressebok og fortsett til eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Save {0} til privat adressebok og fortsett til website"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_nl.po b/apps/i2ptunnel/locale-proxy/messages_nl.po
index dcbb06ecce..53aa883273 100644
--- a/apps/i2ptunnel/locale-proxy/messages_nl.po
+++ b/apps/i2ptunnel/locale-proxy/messages_nl.po
@@ -125,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -166,16 +166,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -192,7 +192,7 @@ msgstr "Tunnel Destinations"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -233,12 +233,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr "Lokale destination"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -305,15 +305,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -444,18 +444,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_pl.po b/apps/i2ptunnel/locale-proxy/messages_pl.po
index af67c5befd..6cedbe1bce 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pl.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pl.po
@@ -127,8 +127,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -168,16 +168,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -194,7 +194,7 @@ msgstr "nazwa lub cel"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr "Cel localny"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -307,15 +307,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -446,19 +446,19 @@ msgstr "Kontynuuj do {0} bez zapisywania"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Zapisz {0} do ksiÄ…Å¼ki adresowej rutera i kontynuuj do eepsite'u"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Zapisz {0} do ksiÄ…Å¼ki adresowej rutera i kontynuuj do website'u"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Zapisz {0} do gÅ‚Ã³wnej ksiÄ…Å¼ki adresowej i kontynuuj do eepsite'u"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Zapisz {0} do gÅ‚Ã³wnej ksiÄ…Å¼ki adresowej i kontynuuj do website'u"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Zapisz {0} do prywatnej ksiÄ…Å¼ki adresowej i kontynuuj do eepsite'u"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Zapisz {0} do prywatnej ksiÄ…Å¼ki adresowej i kontynuuj do website'u"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_pt.po b/apps/i2ptunnel/locale-proxy/messages_pt.po
index 1efce10de9..6307a27654 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pt.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pt.po
@@ -130,8 +130,8 @@ msgstr "A ligaÃ§Ã£o de ajudante de endereÃ§o que seguiste especifica um destinat
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr "AlguÃ©m pode estar a tentar se passar por outro site da rede I2P, ou pessoas deram a dois sites da rede I2P distintos o mesmo nome."
 
 #: ../java/build/Proxy.java:26
@@ -171,16 +171,16 @@ msgstr "Tentaste acessar um site ou recurso fora da rede I2P."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr "Aviso: Site na rede I2P inalcanÃ§Ã¡vel."
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -197,7 +197,7 @@ msgstr "NÃ£o foi possÃvel encontrar o seguinte destinatÃ¡rio:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -238,12 +238,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configura um intermediador (proxy) externo a rede I2P no tÃºnel I2P"
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr "O site na rede I2P nÃ£o estÃ¡ alcanÃ§Ã¡vel."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr "O site na rede I2P estÃ¡ fora do ar, hÃ¡ congestionamento de dados, ou teu roteador nÃ£o estÃ¡ bem integrado com os participantes."
 
@@ -253,7 +253,7 @@ msgstr "Aviso: DestinatÃ¡rio invÃ¡lido"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr "O destinatÃ¡rio, um site na rede I2P, especificado nÃ£o Ã© valido, ou estÃ¡ inalcanÃ§Ã¡vel."
 
@@ -310,15 +310,15 @@ msgid ""
 msgstr "Se continuas a ter problemas, podeis modificar tua lista de intermediadores externos a rede I2P {0}aqui{1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr "Aviso: Site na rede I2P desconhecido"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr "Aviso: Site na rede I2P nÃ£o encontrado no livro de endereÃ§os"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr "O site na rede I2P nÃ£o foi encontrado no livro de endereÃ§os do seu roteador"
 
 #: ../java/build/Proxy.java:135
@@ -449,19 +449,19 @@ msgstr "Continuar para {0} sem salvar"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Salvar {0} ao livro de endereÃ§os do roteador e continuar no eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr "Salvar {0} ao livro de endereÃ§os do roteador e continuar no website"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Salvar {0} ao livro de endereÃ§os master e continuar no eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr "Salvar {0} ao livro de endereÃ§os master e continuar no website"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Salvar {0} no livro de endereÃ§os particular e continuar no eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr "Salvar {0} no livro de endereÃ§os particular e continuar no website"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
index f2c7799c07..c673e55cc2 100644
--- a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
+++ b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po
@@ -126,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -167,16 +167,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "Aviso: eepsite inalcanÃ§Ã¡vel"
+msgid "Warning: Website Unreachable"
+msgstr "Aviso: website inalcanÃ§Ã¡vel"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -193,7 +193,7 @@ msgstr "NÃ£o foi possÃvel encontrar o seguinte destino:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -234,12 +234,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Por favor, configurar um proxy de saÃda no tÃºnel I2P."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "O eepsite nÃ£o se encontra alcanÃ§Ã¡vel."
+msgid "The website was not reachable."
+msgstr "O website nÃ£o se encontra alcanÃ§Ã¡vel."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr "Aviso: Destino invÃ¡lido"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -306,16 +306,16 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Aviso: eepsite desconhecido"
+msgid "Warning: Website Unknown"
+msgstr "Aviso: website desconhecido"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Aviso: eepsite nÃ£o encontrado no livro de endereÃ§os"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Aviso: website nÃ£o encontrado no livro de endereÃ§os"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "O eepsite nÃ£o foi encontrado no livro de endereÃ§os do seu roteador."
+msgid "The website was not found in your router's addressbook."
+msgstr "O website nÃ£o foi encontrado no livro de endereÃ§os do seu roteador."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -445,18 +445,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_ro.po b/apps/i2ptunnel/locale-proxy/messages_ro.po
index dcbb389bba..811a497481 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ro.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ro.po
@@ -124,9 +124,9 @@ msgstr "Link-ul addresshelper aÈ›i specificat o cheie de destinaÈ›ie diferitÄƒ d
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "Cineva ar putea fi Ã®ncercÄƒ sÄƒ imita un alt eepsite, sau cineva au dat douÄƒ nume eepsite identice."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Cineva ar putea fi Ã®ncercÄƒ sÄƒ imita un alt website, sau cineva au dat douÄƒ nume website identice."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -165,16 +165,16 @@ msgstr "AÈ›i Ã®ncercat sÄƒ vÄƒ conectaÈ›i la un site sau locaÈ›ie non-I2P ."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "AtenÈ›ie: Eepsite indisponibil"
+msgid "Warning: Website Unreachable"
+msgstr "AtenÈ›ie: Website indisponibil"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -191,7 +191,7 @@ msgstr "Nu am putut gÄƒsi urmÄƒtoarea destinaÈ›ie:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -232,14 +232,14 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "VÄƒ rugÄƒm sÄƒ configuraÈ›i un outproxy Ã®n I2PTunnel."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "Eepsite nu a fost accesibil."
+msgid "The website was not reachable."
+msgstr "Website nu a fost accesibil."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Eepsite este deconectat, este congestionarea reÈ›elei, sau router-ul nu este Ã®ncÄƒ bine integrat cu colegii."
+msgstr "Website este deconectat, este congestionarea reÈ›elei, sau router-ul nu este Ã®ncÄƒ bine integrat cu colegii."
 
 #: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
@@ -247,9 +247,9 @@ msgstr "AtenÈ›ie: DestinaÈ›ie incorecta"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "DestinaÈ›ia eepsite specificat nu a fost valabila, sau a fost inaccesibila."
+msgstr "DestinaÈ›ia website specificat nu a fost valabila, sau a fost inaccesibila."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -304,16 +304,16 @@ msgid ""
 msgstr "DacÄƒ aveÈ›i Ã®n continuare probleme, este posibil sÄƒ doriÈ›i sÄƒ editaÈ›i lista de outproxy {0} aici {1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "AtenÈ›ie: Eepsite Necunoscut"
+msgid "Warning: Website Unknown"
+msgstr "AtenÈ›ie: Website Necunoscut"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "AtenÈ›ie: Eepsite nu a fost gÄƒsit Ã®n Agenda"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "AtenÈ›ie: Website nu a fost gÄƒsit Ã®n Agenda"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Eepsite nu a fost gasit in Agenda ruterului."
+msgid "The website was not found in your router's addressbook."
+msgstr "Website nu a fost gasit in Agenda ruterului."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -443,19 +443,19 @@ msgstr "ContinuaÈ›i {0} fÄƒrÄƒ salvare"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "SalvaÈ›i {0} Ã®n agendÄƒ router È™i continuÄƒ la eepsite"
+msgid "Save {0} to router address book and continue to website"
+msgstr "SalvaÈ›i {0} Ã®n agendÄƒ router È™i continuÄƒ la website"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "SalvaÈ›i {0} Ã®n agenda master  È™i continuÄƒ la eepsite"
+msgid "Save {0} to master address book and continue to website"
+msgstr "SalvaÈ›i {0} Ã®n agenda master  È™i continuÄƒ la website"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "SalvaÈ›i {0} Ã®n agendÄƒ router privata È™i continuÄƒ la eepsite"
+msgid "Save {0} to private address book and continue to website"
+msgstr "SalvaÈ›i {0} Ã®n agendÄƒ router privata È™i continuÄƒ la website"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_ru.po b/apps/i2ptunnel/locale-proxy/messages_ru.po
index f8b1dd1a58..fe8b306af5 100644
--- a/apps/i2ptunnel/locale-proxy/messages_ru.po
+++ b/apps/i2ptunnel/locale-proxy/messages_ru.po
@@ -132,8 +132,8 @@ msgstr "Ð¡ÑÑ‹Ð»ÐºÐ° AddressHelper, Ð¿Ð¾ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð²Ñ‹ Ð¿Ñ€Ð¾ÑˆÐ»Ð¸, Ð¾Ð¿
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr "ÐšÑ‚Ð¾-Ñ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ñ‹Ñ‚Ð°Ñ‚ÑŒÑÑ Ð²Ñ‹Ð´Ð°Ñ‚ÑŒ ÑÐµÐ±Ñ Ð·Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¹ ÑÐ°Ð¹Ñ‚ Ð¸Ð»Ð¸ Ñ€Ð°Ð·Ð½Ñ‹Ðµ Ð»ÑŽÐ´Ð¸ Ð´Ð°Ð»Ð¸ Ð´Ð²ÑƒÐ¼ ÑÐ°Ð¹Ñ‚Ð°Ð¼ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð°."
 
 #: ../java/build/Proxy.java:26
@@ -173,17 +173,17 @@ msgstr "Ð’Ñ‹ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°Ð»Ð¸ÑÑŒ ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ñ ÑÐ°Ð¹Ñ‚Ð¾Ð¼ Ð½Ðµ Ð²
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð¡Ð°Ð¹Ñ‚ I2P Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
-msgstr "eepsite Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½, Ñ‚Ð°Ðº ÐºÐ°Ðº ÐµÐ³Ð¾ LeaseSet Ð½Ðµ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½."
+msgid "The website was not reachable, because its lease set was not found."
+msgstr "website Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½, Ñ‚Ð°Ðº ÐºÐ°Ðº ÐµÐ³Ð¾ LeaseSet Ð½Ðµ Ð±Ñ‹Ð» Ð½Ð°Ð¹Ð´ÐµÐ½."
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
-msgstr "eepsite, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½, Ð½Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° Ð¿ÐµÑ€ÐµÐ³Ñ€ÑƒÐ·ÐºÐ° ÑÐµÑ‚Ð¸"
+"The website is probably down, but there could also be network congestion."
+msgstr "website, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½, Ð½Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° Ð¿ÐµÑ€ÐµÐ³Ñ€ÑƒÐ·ÐºÐ° ÑÐµÑ‚Ð¸"
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
 #: ../java/build/Proxy.java:104
@@ -199,9 +199,9 @@ msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
-msgstr "Eepsite Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ Ð²Ð°ÑˆÐµÐ¹ Ð²ÐµÑ€ÑÐ¸ÐµÐ¹ I2P Ð¸Ð»Ð¸ Java."
+msgstr "Website Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½, Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚ÑÑ Ð²Ð°ÑˆÐµÐ¹ Ð²ÐµÑ€ÑÐ¸ÐµÐ¹ I2P Ð¸Ð»Ð¸ Java."
 
 #: ../java/build/Proxy.java:64 ../java/build/Proxy.java:126
 msgid "Could not connect to the following destination:"
@@ -240,12 +240,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹Ñ‚Ðµ Ð²Ñ‹Ñ…Ð¾Ð´Ð½Ð¾Ð¹ Ð¿Ñ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€ Ð² I2PTunnel."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr "Ð¡Ð°Ð¹Ñ‚ I2P Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr "Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð¾Ð½ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½, ÑÐµÑ‚ÑŒ Ð¿ÐµÑ€ÐµÐ³Ñ€ÑƒÐ¶ÐµÐ½Ð° Ð¸Ð»Ð¸ Ð²Ð°Ñˆ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€ Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¸Ð½Ñ‚ÐµÐ³Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑƒÐ·Ð»Ð°Ð¼Ð¸."
 
@@ -255,7 +255,7 @@ msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð½ÐµÐ´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½ Ð¸Ð»Ð¸ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½."
 
@@ -312,15 +312,15 @@ msgid ""
 msgstr "Ð•ÑÐ»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ Ð¿Ð¾ÑÐ²Ð»ÑÑ‚ÑŒÑÑ, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ñ€Ð¾ÐºÑÐ¸-ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð² {0}Ð·Ð´ÐµÑÑŒ{1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ÑÐ°Ð¹Ñ‚ I2P"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ: Ð¡Ð°Ð¹Ñ‚ I2P Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ðµ"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr "Ð¡Ð°Ð¹Ñ‚ I2P Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð² Ð°Ð´Ñ€ÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ðµ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð°."
 
 #: ../java/build/Proxy.java:135
@@ -451,18 +451,18 @@ msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ðº {0} Ð±ÐµÐ· ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ {0} Ð² Ð°Ð´Ñ€ÐµÑÐ½ÑƒÑŽ ÐºÐ½Ð¸Ð³Ñƒ Ñ€Ð¾ÑƒÑ‚ÐµÑ€Ð° (router address book) Ð¸ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ðº eep-ÑÐ°Ð¹Ñ‚Ñƒ"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ {0} Ð² Ð¾ÑÐ½Ð¾Ð²Ð½ÑƒÑŽ (master) Ð°Ð´Ñ€ÐµÑÐ½ÑƒÑŽ ÐºÐ½Ð¸Ð³Ñƒ Ð¸ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ðº eep-ÑÐ°Ð¹Ñ‚Ñƒ"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ {0} Ð² Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½ÑƒÑŽ Ð°Ð´Ñ€ÐµÑÐ½ÑƒÑŽ ÐºÐ½Ð¸Ð³Ñƒ Ð¸ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´ Ðº eep-ÑÐ°Ð¹Ñ‚Ñƒ"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_sk.po b/apps/i2ptunnel/locale-proxy/messages_sk.po
index d56e29924d..7672995d08 100644
--- a/apps/i2ptunnel/locale-proxy/messages_sk.po
+++ b/apps/i2ptunnel/locale-proxy/messages_sk.po
@@ -125,8 +125,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -166,16 +166,16 @@ msgstr "PokÃºsili ste sa pripojiÅ¥ k webovej strÃ¡nke alebo lokÃ¡cii mimo I2P."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -192,7 +192,7 @@ msgstr "Nebolo moÅ¾nÃ© nÃ¡jsÅ¥ nasledovnÃº destinÃ¡ciu:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -233,12 +233,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "ProsÃm nakonfigurujte si v I2PTunneli vÃ½chodzÃ proxy."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -248,9 +248,9 @@ msgstr "Varovanie: NeplatnÃ¡ destinÃ¡cia"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "ZadanÃ¡ eepsite destinÃ¡cia nebola platnÃ¡, alebo sa ju inÃ½m spÃ´sobom nepodarilo dosiahnuÅ¥."
+msgstr "ZadanÃ¡ website destinÃ¡cia nebola platnÃ¡, alebo sa ju inÃ½m spÃ´sobom nepodarilo dosiahnuÅ¥."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -305,16 +305,16 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Varovanie: NeznÃ¡ma eepsite"
+msgid "Warning: Website Unknown"
+msgstr "Varovanie: NeznÃ¡ma website"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Varovanie: Eepsite nebola v adresÃ¡ri nÃ¡jdenÃ¡"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Varovanie: Website nebola v adresÃ¡ri nÃ¡jdenÃ¡"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "DanÃ¡ eepsite nebola nÃ¡jdenÃ¡ v adresÃ¡ri vÃ¡Å¡ho routra."
+msgid "The website was not found in your router's addressbook."
+msgstr "DanÃ¡ website nebola nÃ¡jdenÃ¡ v adresÃ¡ri vÃ¡Å¡ho routra."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -444,18 +444,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_sv.po b/apps/i2ptunnel/locale-proxy/messages_sv.po
index 5a16ba9230..a069a8cfb4 100644
--- a/apps/i2ptunnel/locale-proxy/messages_sv.po
+++ b/apps/i2ptunnel/locale-proxy/messages_sv.po
@@ -128,9 +128,9 @@ msgstr "AdresshjÃ¤lpar-lÃ¤nken du fÃ¶ljde specifierad en annan mÃ¥l-nyckel Ã¤n f
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
-msgstr "NÃ¥gon kanske fÃ¶rsÃ¶ker utge sig fÃ¶r att vara en annan eepsite eller personer kan ha givit eepsites identiska namn."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "NÃ¥gon kanske fÃ¶rsÃ¶ker utge sig fÃ¶r att vara en annan website eller personer kan ha givit websites identiska namn."
 
 #: ../java/build/Proxy.java:26
 msgid ""
@@ -169,16 +169,16 @@ msgstr "Du fÃ¶rsÃ¶kte ansluta till en icke-I2P webbsida eller plats."
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
-msgstr "Varning: Eepsite kan ej nÃ¥s"
+msgid "Warning: Website Unreachable"
+msgstr "Varning: Website kan ej nÃ¥s"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -195,7 +195,7 @@ msgstr "Kunde inte hitta fÃ¶ljande mÃ¥l:"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -236,14 +236,14 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "Var god stÃ¤ll in en utproxy i I2PTunnel."
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
-msgstr "Eepsiten var inte nÃ¥bar."
+msgid "The website was not reachable."
+msgstr "Websiten var inte nÃ¥bar."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
-msgstr "Eepsiten Ã¤r offline, nÃ¤tverket Ã¤r under hÃ¶g belastning eller din router Ã¤r Ã¤nnu inte vÃ¤l integrerad med peers."
+msgstr "Websiten Ã¤r offline, nÃ¤tverket Ã¤r under hÃ¶g belastning eller din router Ã¤r Ã¤nnu inte vÃ¤l integrerad med peers."
 
 #: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
 msgid "Warning: Invalid Destination"
@@ -251,9 +251,9 @@ msgstr "Varning: Ogiltigt MÃ¥l"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
-msgstr "Eepsite mÃ¥let som specificerades Ã¤r inte giltigt eller kan annars ej nÃ¥s."
+msgstr "Website mÃ¥let som specificerades Ã¤r inte giltigt eller kan annars ej nÃ¥s."
 
 #: ../java/build/Proxy.java:102
 msgid ""
@@ -308,16 +308,16 @@ msgid ""
 msgstr "Om du fortsÃ¤tter att ha problem, sÃ¥ kanske du vill Ã¤ndra din utproxy-liste {0}hÃ¤r{1}."
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
-msgstr "Varning: OkÃ¤nd Eepsite"
+msgid "Warning: Website Unknown"
+msgstr "Varning: OkÃ¤nd Website"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
-msgstr "Varning: Eepsite Finns Inte i Adressboken"
+msgid "Warning: Website Not Found in Addressbook"
+msgstr "Varning: Website Finns Inte i Adressboken"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
-msgstr "Eepsite:n hittades inte i din routers adressbok."
+msgid "The website was not found in your router's addressbook."
+msgstr "Website:n hittades inte i din routers adressbok."
 
 #: ../java/build/Proxy.java:135
 msgid "Check the link or find a Base 32 or Base 64 address."
@@ -447,19 +447,19 @@ msgstr "FortsÃ¤tt till {0} utan att spara"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
-msgstr "Spara {0} till routeradressboken och fortsÃ¤tt till eepsite "
+msgid "Save {0} to router address book and continue to website"
+msgstr "Spara {0} till routeradressboken och fortsÃ¤tt till website "
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
-msgstr "Spara {0} till huvudadressboken och fortsÃ¤tt till eepsite "
+msgid "Save {0} to master address book and continue to website"
+msgstr "Spara {0} till huvudadressboken och fortsÃ¤tt till website "
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
-msgstr "Spara {0} till privatadressbok och fortsÃ¤tt till eepsite "
+msgid "Save {0} to private address book and continue to website"
+msgstr "Spara {0} till privatadressbok och fortsÃ¤tt till website "
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
 #, java-format
diff --git a/apps/i2ptunnel/locale-proxy/messages_uk.po b/apps/i2ptunnel/locale-proxy/messages_uk.po
index c264629440..8aa1b1c4a7 100644
--- a/apps/i2ptunnel/locale-proxy/messages_uk.po
+++ b/apps/i2ptunnel/locale-proxy/messages_uk.po
@@ -128,8 +128,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -169,16 +169,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr "Ð£Ð²Ð°Ð³Ð°: Eep-ÑÐ°Ð¹Ñ‚ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -195,7 +195,7 @@ msgstr "ÐœÑ–ÑÑ†Ðµ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÑƒÐ½ÐµÐ»ÑŽ"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -236,12 +236,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr "Eep-ÑÐ°Ð¹Ñ‚ Ð½Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹."
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr "Eep-ÑÐ°Ð¹Ñ‚ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¸Ð¹, Ð¼ÐµÑ€ÐµÐ¶Ð° Ð¿ÐµÑ€ÐµÐ²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð°, Ð°Ð±Ð¾ Ð²Ð°Ñˆ Ñ€Ð¾ÑƒÑ‚ÐµÑ€ Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð½ÑŒÐ¾ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ñ–Ð· Ð¿Ñ–Ñ€Ð°Ð¼Ð¸."
 
@@ -251,7 +251,7 @@ msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ð´Ñ€ÐµÑ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -308,15 +308,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr "Ð£Ð²Ð°Ð³Ð°: ÐÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹ eep-ÑÐ°Ð¹Ñ‚"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr "Ð£Ð²Ð°Ð³Ð°: Eep-ÑÐ°Ð¹Ñ‚ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ðµ Ð² Ð°Ð´Ñ€ÐµÑÐ½Ñ–Ð¹ ÐºÐ½Ð¸Ð·Ñ–"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr "Eep-ÑÐ°Ð¹Ñ‚ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ðµ Ð² Ð°Ð´Ñ€ÐµÑÐ½Ñ–Ð¹ ÐºÐ½Ð¸Ð·Ñ– Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ñ€Ð¾ÑƒÑ‚ÐµÑ€Ñƒ."
 
 #: ../java/build/Proxy.java:135
@@ -447,18 +447,18 @@ msgstr "ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸ Ð´Ð¾ {0} Ð±ÐµÐ· Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ {0} Ð² Ð°Ð´Ñ€ÐµÑÐ½Ñƒ ÐºÐ½Ð¸Ð³Ñƒ Ñ€Ð¾ÑƒÑ‚ÐµÑ€Ð° Ð¸ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÑ…Ñ–Ð´ Ð´Ð¾ eep-ÑÐ°Ð¹Ñ‚Ñƒ"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ {0} Ð² Ð¾ÑÐ½Ð¾Ð²Ð½Ñƒ Ð°Ð´Ñ€ÐµÑÐ½Ñƒ ÐºÐ½Ð¸Ð³Ñƒ Ñ– Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÑ…Ñ–Ð´ Ð´Ð¾ ÐµÐµÑ€-ÑÐ°Ð¹Ñ‚Ñƒ"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ {0} Ð² Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñƒ Ð°Ð´Ñ€ÐµÑÐ½Ñƒ ÐºÐ½Ð¸Ð³Ñƒ Ñ– Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÑ…Ñ–Ð´ Ð´Ð¾ ÐµÐµÑ€-ÑÐ°Ð¹Ñ‚Ñƒ."
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_vi.po b/apps/i2ptunnel/locale-proxy/messages_vi.po
index 8fce0709a3..0c10b93763 100644
--- a/apps/i2ptunnel/locale-proxy/messages_vi.po
+++ b/apps/i2ptunnel/locale-proxy/messages_vi.po
@@ -126,8 +126,8 @@ msgstr ""
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr ""
 
 #: ../java/build/Proxy.java:26
@@ -167,16 +167,16 @@ msgstr ""
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr ""
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr ""
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr ""
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -193,7 +193,7 @@ msgstr "tÃªn hay Ä‘iá»ƒm Ä‘áº¿n"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr ""
 
@@ -234,12 +234,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr ""
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr ""
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr "Äiá»ƒm Ä‘áº¿n ná»™i bá»™"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr ""
 
@@ -306,15 +306,15 @@ msgid ""
 msgstr ""
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr ""
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr ""
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr ""
 
 #: ../java/build/Proxy.java:135
@@ -445,18 +445,18 @@ msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr ""
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr ""
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/apps/i2ptunnel/locale-proxy/messages_zh.po b/apps/i2ptunnel/locale-proxy/messages_zh.po
index 9b07998bfb..6b7242ccbe 100644
--- a/apps/i2ptunnel/locale-proxy/messages_zh.po
+++ b/apps/i2ptunnel/locale-proxy/messages_zh.po
@@ -131,8 +131,8 @@ msgstr "æ‚¨æ‰€æ‰“å¼€çš„åœ°å€ç°¿è¿žæŽ¥æŒ‡å®šçš„ç›®æ ‡å¯†é’¥ä¸Žæ‚¨çš„åœ°å€ç°¿ä¸
 
 #: ../java/build/Proxy.java:25
 msgid ""
-"Someone could be trying to impersonate another eepsite, or people have given"
-" two eepsites identical names."
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
 msgstr "å¯èƒ½æœ‰äººæ£è¯•å›¾é€šè¿‡æ¤é“¾æŽ¥ä¼ªè£…æˆæ¤ç«™ç‚¹ï¼Œæˆ–æœ‰äººä½¿ç”¨äº†ç›¸åŒçš„ç«™ç‚¹ç½‘å€ã€‚"
 
 #: ../java/build/Proxy.java:26
@@ -172,16 +172,16 @@ msgstr "æ‚¨å°è¯•è¿žæŽ¥çš„ç½‘ç«™éžI2Pç«™ç‚¹æˆ–ä½ç½®ã€‚"
 #: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51
 #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62
 #: ../java/build/Proxy.java:83 ../java/build/Proxy.java:89
-msgid "Warning: Eepsite Unreachable"
+msgid "Warning: Website Unreachable"
 msgstr "è¦å‘Šï¼šI2P ç«™ç‚¹ä¸å¯è¾¾"
 
 #: ../java/build/Proxy.java:52
-msgid "The eepsite was not reachable, because its lease set was not found."
+msgid "The website was not reachable, because its lease set was not found."
 msgstr "è¯¥åŒ¿åç½‘ç«™ä¸å¯è¾¾ï¼Œå› ä¸ºæ‰¾ä¸åˆ°å…¶ç§Ÿå¥‘ã€‚"
 
 #: ../java/build/Proxy.java:53
 msgid ""
-"The eepsite is probably down, but there could also be network congestion."
+"The website is probably down, but there could also be network congestion."
 msgstr "è¯¥åŒ¿åç½‘ç«™å¯èƒ½å·²ä¸‹çº¿ï¼Œä½†ä¹Ÿå¯èƒ½æ˜¯ç”±äºŽç½‘ç»œæ‹¥å µã€‚"
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:92
@@ -198,7 +198,7 @@ msgstr "æ— æ³•ç›´åˆ°å¦‚ä¸‹ç›®æ ‡ï¼š"
 
 #: ../java/build/Proxy.java:63
 msgid ""
-"The eepsite was not reachable, because it uses encryption options that are "
+"The website was not reachable, because it uses encryption options that are "
 "not supported by your I2P or Java version."
 msgstr "æ¤åŒ¿åç½‘ç«™ä¸å¯è¾¾ï¼Œå› ä¸ºæ‚¨ä½¿ç”¨çš„ I2P æˆ–è€… Java ç‰ˆæœ¬ä¸æ”¯æŒå®ƒä½¿ç”¨çš„åŠ å¯†é€‰é¡¹ã€‚"
 
@@ -239,12 +239,12 @@ msgid "Please configure an outproxy in I2PTunnel."
 msgstr "è¯·åˆ° I2PTunnel ä¸é…ç½®å‡ºå£ä»£ç†ã€‚"
 
 #: ../java/build/Proxy.java:90
-msgid "The eepsite was not reachable."
+msgid "The website was not reachable."
 msgstr "æ¤ I2P ç«™ç‚¹ä¸å¯è¾¾"
 
 #: ../java/build/Proxy.java:91
 msgid ""
-"The eepsite is offline, there is network congestion, or your router is not "
+"The website is offline, there is network congestion, or your router is not "
 "yet well-integrated with peers."
 msgstr "æ¤ I2P ç«™ç‚¹å·²ç»ä¸‹çº¿ï¼Œé‡åˆ°ç½‘ç»œæ‹¥å µï¼Œæˆ–æ‚¨çš„è·¯ç”±å°šæœªå®Œå…¨æ•´åˆè‡³ I2P ç½‘ç»œä¸ã€‚"
 
@@ -254,7 +254,7 @@ msgstr "è¦å‘Šï¼šæ— æ•ˆç›®æ ‡"
 
 #: ../java/build/Proxy.java:101
 msgid ""
-"The eepsite destination specified was not valid, or was otherwise "
+"The website destination specified was not valid, or was otherwise "
 "unreachable."
 msgstr "æŒ‡å®šç«™ç‚¹çš„ç›®æ ‡å¯†é’¥æ— æ•ˆï¼Œæˆ–æ— æ³•åˆ°è¾¾ã€‚"
 
@@ -311,15 +311,15 @@ msgid ""
 msgstr "å¦‚æžœé—®é¢˜æŒç»å˜åœ¨ï¼Œæ‚¨å¯èƒ½éœ€è¦{0}åœ¨æ¤{1}ç¼–è¾‘å‡ºå£ä»£ç†åˆ—è¡¨ã€‚"
 
 #: ../java/build/Proxy.java:127
-msgid "Warning: Eepsite Unknown"
+msgid "Warning: Website Unknown"
 msgstr "è¦å‘Šï¼šæœªçŸ¥ I2P ç«™ç‚¹"
 
 #: ../java/build/Proxy.java:133
-msgid "Warning: Eepsite Not Found in Addressbook"
+msgid "Warning: Website Not Found in Addressbook"
 msgstr "è¦å‘Šï¼šåœ°å€ç°¿ä¸æœªæ‰¾åˆ°è¯¥ I2P ç«™ç‚¹"
 
 #: ../java/build/Proxy.java:134
-msgid "The eepsite was not found in your router's addressbook."
+msgid "The website was not found in your router's addressbook."
 msgstr "æ¤ I2P ç«™ç‚¹æœªå˜åœ¨äºŽæ‚¨è·¯ç”±å™¨çš„åœ°å€ç°¿ä¸ã€‚"
 
 #: ../java/build/Proxy.java:135
@@ -450,18 +450,18 @@ msgstr "ç»§ç»{0}ï¼Œè€Œä¸ä¿å˜"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181
 #, java-format
-msgid "Save {0} to router address book and continue to eepsite"
+msgid "Save {0} to router address book and continue to website"
 msgstr "ä¿å˜{0}è‡³â€œè·¯ç”±å™¨åœ°å€ç°¿â€å¹¶è®¿é—®è¯¥ I2P ç«™ç‚¹ã€‚"
 
 #. only blockfile supports multiple books
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184
 #, java-format
-msgid "Save {0} to master address book and continue to eepsite"
+msgid "Save {0} to master address book and continue to website"
 msgstr "ä¿å˜{0}è‡³â€œä¸»åœ°å€ç°¿â€å¹¶è®¿é—®è¯¥ I2P ç«™ç‚¹ã€‚"
 
 #: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185
 #, java-format
-msgid "Save {0} to private address book and continue to eepsite"
+msgid "Save {0} to private address book and continue to website"
 msgstr "ä¿å˜{0}è‡³â€œç§æœ‰åœ°å€ç°¿â€å¹¶è®¿é—®è¯¥ I2P ç«™ç‚¹ã€‚"
 
 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162
diff --git a/installer/resources/proxy/ahelper-conflict-header.ht b/installer/resources/proxy/ahelper-conflict-header.ht
index 474be3181f..3222013748 100644
--- a/installer/resources/proxy/ahelper-conflict-header.ht
+++ b/installer/resources/proxy/ahelper-conflict-header.ht
@@ -19,7 +19,7 @@ Proxy-Connection: close
 <h3>_("Warning: Destination Key Conflict")</h3>
 <p>
 _("The addresshelper link you followed specifies a different destination key than a host entry in your host database.")
-_("Someone could be trying to impersonate another eepsite, or people have given two eepsites identical names.")
+_("Someone could be trying to impersonate another website, or people have given two websites identical names.")
 </p>
 <p>
 _("You can resolve the conflict by considering which key you trust, and either discarding the addresshelper link, discarding the host entry from your host database, or naming one of them differently.")
diff --git a/installer/resources/proxy/dnf-header.ht b/installer/resources/proxy/dnf-header.ht
index d4c7465c82..ffb9426da6 100644
--- a/installer/resources/proxy/dnf-header.ht
+++ b/installer/resources/proxy/dnf-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Warning: Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,10 +16,10 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Warning: Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable.")
-_("The eepsite is offline, there is network congestion, or your router is not yet well-integrated with peers.")
+_("The website was not reachable.")
+_("The website is offline, there is network congestion, or your router is not yet well-integrated with peers.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")</p>
 <hr>
 <p><b>_("Could not find the following destination:")</b>
diff --git a/installer/resources/proxy/dnfb-header.ht b/installer/resources/proxy/dnfb-header.ht
index 382ea761c5..d98c4ab599 100644
--- a/installer/resources/proxy/dnfb-header.ht
+++ b/installer/resources/proxy/dnfb-header.ht
@@ -18,7 +18,7 @@ Proxy-Connection: close
 <div class="warning" id="warning">
 <h3>_("Warning: Invalid Destination")</h3>
 <p>
-_("The eepsite destination specified was not valid, or was otherwise unreachable.")
+_("The website destination specified was not valid, or was otherwise unreachable.")
 _("Perhaps you pasted in the wrong Base 64 string or the link you are following is bad.")
 _("The I2P host could also be offline.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")
diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht
index 57421cd1e2..fdaa4a2b92 100644
--- a/installer/resources/proxy/dnfh-header.ht
+++ b/installer/resources/proxy/dnfh-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unknown")</title>
+<title>_("Warning: Website Unknown")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,9 +16,9 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Not Found in Addressbook")</h3>
+<h3>_("Warning: Website Not Found in Addressbook")</h3>
 <p>
-_("The eepsite was not found in your router's addressbook.")
+_("The website was not found in your router's addressbook.")
 _("Check the link or find a Base 32 or Base 64 address.")
 _("If you have the Base 64 address, {0}add it to your addressbook{1}.", "<a href=\"http://127.0.0.1:7657/susidns/addressbook.jsp?book=router\">", "</a>")
 _("Otherwise, find a Base 32 or address helper link, or use a jump service link below.")
diff --git a/installer/resources/proxy/enc-header.ht b/installer/resources/proxy/enc-header.ht
index e5c271e234..ba77fadf90 100644
--- a/installer/resources/proxy/enc-header.ht
+++ b/installer/resources/proxy/enc-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Warning: Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,9 +16,9 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Warning: Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
+_("The website was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
 <hr>
 <p><b>_("Could not connect to the following destination:")</b>
 </p>
diff --git a/installer/resources/proxy/nols-header.ht b/installer/resources/proxy/nols-header.ht
index 5cd67460fe..0adf713f31 100644
--- a/installer/resources/proxy/nols-header.ht
+++ b/installer/resources/proxy/nols-header.ht
@@ -6,7 +6,7 @@ Proxy-Connection: close
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
-<title>_("Warning: Eepsite Unreachable")</title>
+<title>_("Warning: Website Unreachable")</title>
 <link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico">
 <link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,10 +16,10 @@ Proxy-Connection: close
  <a href="http://127.0.0.1:7657/config.jsp">_("Configuration")</a> <a href="http://127.0.0.1:7657/help.jsp">_("Help")</a> <a href="http://127.0.0.1:7657/susidns/index">_("Addressbook")</a>
 </div>
 <div class="warning" id="warning">
-<h3>_("Warning: Eepsite Unreachable")</h3>
+<h3>_("Warning: Website Unreachable")</h3>
 <p>
-_("The eepsite was not reachable, because its lease set was not found.")
-_("The eepsite is probably down, but there could also be network congestion.")
+_("The website was not reachable, because its lease set was not found.")
+_("The website is probably down, but there could also be network congestion.")
 _("You may want to {0}retry{1}.", "<a href=\"javascript:window.location.reload()\">", "</a>")</p>
 <hr>
 <p><b>_("Could not find the following destination:")</b>
-- 
GitLab