diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index f319c60ebfd0f73d22be6389c2becd363e097e66..ae18ed74ef1f8c20107f1e0027da047d3cb4de2e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -92,7 +92,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"\r\n";
// ESR version of Firefox, same as Tor Browser
private static final String UA_CLEARNET = "User-Agent: " +
- "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0" +
+ "Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0" +
"\r\n";
// overrides
private static final String PROP_UA_I2P = "httpclient.userAgent.i2p";
@@ -1221,7 +1221,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// 8-59 or 61-63 chars, this won't work
String header = getErrorPage("b32", ERR_DESTINATION_UNKNOWN);
try {
- writeErrorMessage(header, _t("Corrupt b32 address"), out, targetRequest, false, destination);
+ writeErrorMessage(header, _t("Corrupt Base32 address"), out, targetRequest, false, destination);
} catch (IOException ioe) {}
return;
}
@@ -1271,7 +1271,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
// form to supply missing data
writeB32SaveForm(out, destination, code, targetRequest);
return;
-
}
// fall through to standard destination unreachable error page
}
@@ -1439,7 +1438,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"</td><td>" + destination + "</td></tr>\n");
try {
String b32 = Base32.encode(SHA256Generator.getInstance().calculateHash(Base64.decode(ahelperKey)).getData());
- out.write("<tr><td align=\"right\">" + _t("Base 32") + "</td>" +
+ out.write("<tr><td align=\"right\">" + _t("Base32") + "</td>" +
"<td><a href=\"http://" + b32 + ".b32.i2p/\">" + b32 + ".b32.i2p</a></td></tr>");
} catch(Exception e) {
}
@@ -1500,18 +1499,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
String header = getErrorPage("b32-auth", ERR_DESTINATION_UNKNOWN);
out.write(header);
out.write("<table id=\"proxyNewHost\">\n" +
- "<tr><td align=\"right\">" + _t("Base 32") + "</td>" +
+ "<tr><td align=\"right\">" + _t("Base32") + "</td>" +
"<td>" + destination + "</td></tr>" +
"\n</table>\n" + "<hr>");
String msg;
if (code == LookupResult.RESULT_SECRET_REQUIRED)
- msg = _t("Base 32 address requires lookup password");
+ msg = _t("Base32 address requires lookup password");
else if (code == LookupResult.RESULT_KEY_REQUIRED)
- msg = _t("Base 32 address requires encryption key");
+ msg = _t("Base32 address requires encryption key");
else if (code == LookupResult.RESULT_SECRET_AND_KEY_REQUIRED)
- msg = _t("Base 32 address requires encryption key and lookup password");
+ msg = _t("Base32 address requires encryption key and lookup password");
else if (code == LookupResult.RESULT_DECRYPTION_FAILURE)
- msg = _t("Base 32 address decryption failure, check encryption key");
+ msg = _t("Base32 address decryption failure, check encryption key");
else
msg = "lookup failure code " + code;
out.write("<p><b>" + msg + "</b></p>");
diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index 666bfc789075e8cb1d83cb6be99f7bc1cfaccd3c..fed81d7007d17486753770b360af8c8f968a2043 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -453,7 +453,7 @@
</td>
</tr><tr>
<td colspan="2">
- <b><%=intl._t("Local Base 32")%>:</b>
+ <b><%=intl._t("Local Base32")%>:</b>
<%=editBean.getDestHashBase32(curTunnel)%>
</td>
</tr>
diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp
index d105186bda8e8a46ad7c40bbd06c5ea46981de48..c2427d867c4518d21662f43c76a9420a94583b3e 100644
--- a/apps/i2ptunnel/jsp/ssl.jsp
+++ b/apps/i2ptunnel/jsp/ssl.jsp
@@ -520,11 +520,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
} else {
valid = true;
%>
-<tr><td colspan="4"><b><%=intl._t("Base 32")%>:</b> <%=b32%></td></tr>
+<tr><td colspan="4"><b><%=intl._t("Base32")%>:</b> <%=b32%></td></tr>
<%
if (altb32 != null && altb32.length() > 0) {
%>
- <tr><td><b><%=intl._t("Alt Base 32")%>:</b> <%=altb32%></td></tr>
+ <tr><td><b><%=intl._t("Alt Base32")%>:</b> <%=altb32%></td></tr>
<%
} // altb32
final String CHECK = " ✔";
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index 878ff1de581db7eac9b402229e0829000872cbc9..b02bd469448eebb190edf2e07f6c73d2b12bbcbe 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -285,7 +285,7 @@
<td>
<p>
<%=intl._t("Type in the I2P destination of the service that this client tunnel should connect to.")%>
- <%=intl._t("This could be the full base 64 destination key, or an I2P URL from your address book.")%>
+ <%=intl._t("This could be the full Base64 destination key, or an I2P URL from your address book.")%>
</p>
</td>
</tr>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
index 10bc1091cc3f4195b070c7e7e0b6987a9929facc..4dea3e408b87ce17deba60c5427356bb960d101b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java
@@ -84,7 +84,7 @@ public class ConfigKeyringHandler extends FormHandler {
spk = bdin.getUnblindedPubKey();
}
if (spk == null) {
- addFormError(_t("Requires hostname, destination, or blinded base32"));
+ addFormError(_t("Requires hostname, destination, or blinded Base32"));
return;
}
// from BlindCache
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index da7aaf5b2d6c19e177b3adc8c4d0fdbce94b0393..903c3acf21bc6b7141784432331abad4ee3ed55e 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -37,7 +37,7 @@
<% } %>
</td>
</tr><tr>
- <td align="right"><b><%=intl._t("Full destination, name, base 32, or hash")%>:</b></td>
+ <td align="right"><b><%=intl._t("Full destination, name, Base32, or hash")%>:</b></td>
<td><input type="text" name="peer" size="55"></td>
</tr><tr>
<td align="right"><b><%=intl._t("Type")%>:</b></td>
diff --git a/installer/resources/proxy/b32-header.ht b/installer/resources/proxy/b32-header.ht
index 19f1b877523176ac5724b5c5045fef3b5dfb05c3..62d6cb650a2c71646116ec8837528c01794c43a2 100644
--- a/installer/resources/proxy/b32-header.ht
+++ b/installer/resources/proxy/b32-header.ht
@@ -19,7 +19,7 @@ Proxy-Connection: close
<div class="warning" id="warning">
<h3>_("Warning: Invalid Destination")</h3>
<p>
-_("The b32 address is invalid.")
+_("The Base32 address is invalid.")
<hr>
<p><b>_("Could not find the following destination:")</b>
</p>