diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index f319c60ebf..ae18ed74ef 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 "" + destination + "\n"); try { String b32 = Base32.encode(SHA256Generator.getInstance().calculateHash(Base64.decode(ahelperKey)).getData()); - out.write("" + _t("Base 32") + "" + + out.write("" + _t("Base32") + "" + "" + b32 + ".b32.i2p"); } 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("\n" + - "" + + "" + "" + "\n
" + _t("Base 32") + "
" + _t("Base32") + "" + destination + "
\n" + "
"); 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("

" + msg + "

"); diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi index 666bfc7890..fed81d7007 100644 --- a/apps/i2ptunnel/jsp/editClient.jsi +++ b/apps/i2ptunnel/jsp/editClient.jsi @@ -453,7 +453,7 @@ - <%=intl._t("Local Base 32")%>:  + <%=intl._t("Local Base32")%>:  <%=editBean.getDestHashBase32(curTunnel)%> diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp index d105186bda..c2427d867c 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; %> -<%=intl._t("Base 32")%>: <%=b32%> +<%=intl._t("Base32")%>: <%=b32%> <% if (altb32 != null && altb32.length() > 0) { %> - <%=intl._t("Alt Base 32")%>: <%=altb32%> + <%=intl._t("Alt Base32")%>: <%=altb32%> <% } // altb32 final String CHECK = "  ✔"; diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index 878ff1de58..b02bd46944 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -285,7 +285,7 @@

<%=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.")%>

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 10bc1091cc..4dea3e408b 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 da7aaf5b2d..903c3acf21 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -37,7 +37,7 @@ <% } %> - <%=intl._t("Full destination, name, base 32, or hash")%>: + <%=intl._t("Full destination, name, Base32, or hash")%>: <%=intl._t("Type")%>: diff --git a/installer/resources/proxy/b32-header.ht b/installer/resources/proxy/b32-header.ht index 19f1b87752..62d6cb650a 100644 --- a/installer/resources/proxy/b32-header.ht +++ b/installer/resources/proxy/b32-header.ht @@ -19,7 +19,7 @@ Proxy-Connection: close

_("Warning: Invalid Destination")

-_("The b32 address is invalid.") +_("The Base32 address is invalid.")

_("Could not find the following destination:")