From 1dfdf79d15fd76ae1e1beb7dbcc069480a444ade Mon Sep 17 00:00:00 2001 From: zzz <zzz@i2pmail.org> Date: Wed, 27 Jan 2021 11:03:57 -0500 Subject: [PATCH] Console: Spelling fixes all over, from pospelchek --- apps/i2ptunnel/jsp/editServer.jsi | 6 +++--- apps/i2ptunnel/jsp/wizard.jsp | 10 +++++----- apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java | 2 +- .../i2p/router/web/helpers/ConfigKeyringHandler.java | 2 +- .../src/net/i2p/router/web/helpers/PeerHelper.java | 4 ++-- apps/routerconsole/jsp/error.jsp | 2 +- apps/routerconsole/jsp/welcome.jsp | 2 +- apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi index 3910e85b7e..00f1bb3e02 100644 --- a/apps/i2ptunnel/jsp/editServer.jsi +++ b/apps/i2ptunnel/jsp/editServer.jsi @@ -962,7 +962,7 @@ <b><%=intl._t("Per Client")%> </b> </td><td> - <input type="text" name="postMax" title="<%=intl._t("Maximum number of post requests permitted for a unique client for the configured timespan")%>" value="<%=editBean.getPostMax(curTunnel)%>" class="freetext quantity"/> + <input type="text" name="postMax" title="<%=intl._t("Maximum number of post requests permitted for a unique client for the configured time span")%>" value="<%=editBean.getPostMax(curTunnel)%>" class="freetext quantity"/> </td><td colspan="2"> <input type="text" name="postBanTime" title="<%=intl._t("If a client exceeds the maximum number of post requests per allocated period, enforce a ban for this number of minutes")%>" value="<%=editBean.getPostBanTime(curTunnel)%>" class="freetext period"/> <%=intl._t("minutes")%> @@ -972,7 +972,7 @@ <b><%=intl._t("Total")%> </b> </td><td> - <input type="text" name="postTotalMax" title="<%=intl._t("Total number of post requests permitted for the configured timespan")%>" value="<%=editBean.getPostTotalMax(curTunnel)%>" class="freetext quantity"/> + <input type="text" name="postTotalMax" title="<%=intl._t("Total number of post requests permitted for the configured time span")%>" value="<%=editBean.getPostTotalMax(curTunnel)%>" class="freetext quantity"/> </td><td colspan="2"> <input type="text" name="postTotalBanTime" title="<%=intl._t("If the maximum number of post requests per allocated period is exceeded, enforce a global access ban for this number of minutes")%>" value="<%=editBean.getPostTotalBanTime(curTunnel)%>" class="freetext period"/> <%=intl._t("minutes")%> @@ -982,7 +982,7 @@ <b><%=intl._t("POST limit period")%> </b> </td><td colspan="2"> - <input type="text" name="postCheckTime" title="<%=intl._t("Timespan for the maximum number of post requests to be reached before a ban is triggered")%>" value="<%=editBean.getPostCheckTime(curTunnel)%>" class="freetext period"/> + <input type="text" name="postCheckTime" title="<%=intl._t("Time span for the maximum number of post requests to be reached before a ban is triggered")%>" value="<%=editBean.getPostCheckTime(curTunnel)%>" class="freetext period"/> <%=intl._t("minutes")%> </td><td></td><td class="blankColumn"></td> </tr> diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index b7558359fa..86aef306d6 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -139,7 +139,7 @@ <%=intl._t("Websites outside I2P can also be reached if an HTTP proxy within I2P is known.")%> </td></tr> <tr><td>IRC</td><td> - <%=intl._t("Customised client tunnel specific for IRC connections.")%> + <%=intl._t("Customized client tunnel specific for IRC connections.")%> <%=intl._t("With this tunnel type, your IRC client will be able to connect to an IRC network inside I2P.")%> <%=intl._t("Each IRC network in I2P that you wish to connect to will require its own tunnel. (See Also, SOCKS IRC)")%> </td></tr> @@ -148,7 +148,7 @@ <%=intl._t("This enables both TCP and UDP connections to be made through a SOCKS outproxy within I2P.")%> </td></tr> <tr><td>SOCKS IRC</td><td> - <%=intl._t("A client tunnel implementing the SOCKS protocol, which is customised for connecting to IRC networks.")%> + <%=intl._t("A client tunnel implementing the SOCKS protocol, which is customized for connecting to IRC networks.")%> <%=intl._t("With this tunnel type, IRC networks in I2P can be reached by typing the I2P address into your IRC client, and configuring the IRC client to use this SOCKS tunnel.")%> <%=intl._t("This means that only one I2P tunnel is required rather than a separate tunnel per IRC network.")%> <%=intl._t("IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P is known, though it depends on whether or not the outproxy has been blocked by the IRC network.")%> @@ -160,11 +160,11 @@ <%=intl._t("Try this if none of the tunnel types below fit your requirements, or you don't know what type of tunnel you need.")%> </td></tr> <tr><td>HTTP</td><td> - <%=intl._t("A server tunnel that is customised for HTTP connections.")%> + <%=intl._t("A server tunnel that is customized for HTTP connections.")%> <%=intl._t("Use this tunnel type if you want to host an I2P Site.")%> </td></tr> <tr><td>IRC</td><td> - <%=intl._t("A customised server tunnel for hosting IRC networks inside I2P.")%> + <%=intl._t("A customized server tunnel for hosting IRC networks inside I2P.")%> <%=intl._t("Usually, a separate tunnel needs to be created for each IRC server that is to be accessible inside I2P.")%> </td></tr><% } @@ -408,7 +408,7 @@ <td> <p> <%=intl._t("The I2P router can automatically start this tunnel for you when the router is started.")%> - <%=intl._t("This can be useful for frequently-used tunnels (especially server tunnels), but for tunnels that are only used occassionally it would mean that the I2P router is creating and maintaining unnecessary tunnels.")%> + <%=intl._t("This can be useful for frequently-used tunnels (especially server tunnels), but for tunnels that are only used occasionally it would mean that the I2P router is creating and maintaining unnecessary tunnels.")%> </p> </td> </tr> diff --git a/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java b/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java index aa0ce57046..aa861c0fc5 100644 --- a/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java +++ b/apps/jetty/java/src/net/i2p/servlet/ErrorServlet.java @@ -172,7 +172,7 @@ public class ErrorServlet extends HttpServlet { */ protected void outputMessage(PrintWriter out, int errorCode, String errorMsg, String errorURI, Throwable errorCause) { if (errorCode == 404) { - out.println(_t("Sorry! You appear to be requesting a non-existent Router Console page or resource.")); + out.println(_t("Sorry! You appear to be requesting a nonexistent Router Console page or resource.")); out.println("<hr>"); out.println(_t("Error {0}", 404) + ": " + errorURI + " " + _t("not found")); } else if (errorCode == 403 || errorCode >= 500 || errorCause != null) { 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 e7deebcdb9..5348bab119 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 @@ -160,7 +160,7 @@ public class ConfigKeyringHandler extends FormHandler { _context.netDb().setBlindData(bdout); addFormNotice(_t("Key for {0} added to keyring", bdout.toBase32())); if (_mode == 6 || _mode == 7) { - addFormNotice(_t("Send key to server opererator.") + ' ' + pk.toPublic().toBase64()); + addFormNotice(_t("Send key to server operator.") + ' ' + pk.toPublic().toBase64()); } } catch (IllegalArgumentException iae) { addFormError(_t("Invalid destination") + ": " + iae.getLocalizedMessage()); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java index 807c47044d..058f30ccc9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java @@ -258,8 +258,8 @@ public class PeerHelper extends HelperBase { .append("<tr><td><b id=\"def.up\">").append(_t("Up")).append("</b></td><td>").append(_t("How long ago this connection was established")).append("</td></tr>\n") .append("<tr><td><b id=\"def.skew\">").append(_t("Skew")).append("</b></td><td>").append(_t("The difference between the peer's clock and your own")).append("</td></tr>\n"); if (isAdvanced()) { - buf.append("<tr><td><b id=\"def.cwnd\">CWND</b></td><td>").append(_t("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" /<br>\n") - .append(_t("The number of sent messages awaiting acknowledgement")).append(" /<br>\n") + buf.append("<tr><td><b id=\"def.cwnd\">CWND</b></td><td>").append(_t("The congestion window, which is how many bytes can be sent without an acknowledgment")).append(" /<br>\n") + .append(_t("The number of sent messages awaiting acknowledgment")).append(" /<br>\n") .append(_t("The maximum number of concurrent messages to send")).append(" /<br>\n") .append(_t("The number of pending sends which exceed congestion window")).append("</td></tr>\n") .append("<tr><td><b id=\"def.ssthresh\">SST</b></td><td>").append(_t("The slow start threshold")).append("</td></tr>\n") diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp index c565524c66..baf871519e 100644 --- a/apps/routerconsole/jsp/error.jsp +++ b/apps/routerconsole/jsp/error.jsp @@ -32,6 +32,6 @@ <%@include file="summary.jsi" %> <h1><%=ERROR_CODE%> <%=ERROR_MESSAGE%></h1> <div class="sorry" id="warning"> -<%=intl._t("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%><hr> +<%=intl._t("Sorry! You appear to be requesting a nonexistent Router Console page or resource.")%><hr> <%=intl._t("Error 404")%>: <%=ERROR_URI%> <%=intl._t("not found")%>. </div></body></html> diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp index 4094102b23..d77f0a4322 100644 --- a/apps/routerconsole/jsp/welcome.jsp +++ b/apps/routerconsole/jsp/welcome.jsp @@ -365,7 +365,7 @@ <%=intl._t("There is a quick guide, news about the latest release, an FAQ, and troubleshooting guide available on the {0}console{1} page.", "<a href=\"/console\" target=\"_blank\">", "</a>")%> </p><p> <%=intl._t("You may notice a message in the sidebar that I2P is rejecting tunnels.")%> -<%=intl._t("This is normal behavior as part of the start-up process, to make sure that your router is ready to help others with participating traffic.")%> +<%=intl._t("This is normal behavior as part of the startup process, to make sure that your router is ready to help others with participating traffic.")%> <%=intl._t("When the connection indicators in the sidebar turn green, you are ready to explore the Invisible Internet.")%> </p> </div> diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 29b4dc147c..a3393d9007 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -1805,7 +1805,7 @@ public class WebMail extends HttpServlet } else if (!newHost.equals(oldHost) && !newHost.equals("localhost")) { props.setProperty(CONFIG_HOST, oldHost); File cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), "susimail.config"); - sessionObject.error += _t("Host unchanged. Edit configation file {0} to change host.", cfg.getAbsolutePath()) + '\n'; + sessionObject.error += _t("Host unchanged. Edit configuration file {0} to change host.", cfg.getAbsolutePath()) + '\n'; } String ps = props.getProperty(Folder.PAGESIZE); Folder<String> folder = getCurrentFolder(sessionObject, request); -- GitLab