Console: Indent address options on /confignet

hostname -> host name or other rewording
This commit is contained in:
zzz
2021-02-01 15:48:16 -05:00
parent 3314d4bf31
commit a4777f3e5d
6 changed files with 12 additions and 11 deletions

View File

@@ -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 host name, destination, or blinded Base32"));
return;
}
// from BlindCache

View File

@@ -466,7 +466,7 @@ public class ConfigNetHandler extends FormHandler {
// TODO set IPv6 arg based on configuration?
boolean rv = TransportUtil.isPubliclyRoutable(iab, true);
if (!rv)
addFormError(_t("The hostname or IP {0} is not publicly routable", addr));
addFormError(_t("The address {0} is not publicly routable", addr));
return rv;
}

View File

@@ -236,6 +236,7 @@ public class ConfigNetHelper extends HelperBase {
}
StringBuilder buf = new StringBuilder(128);
for (String addr : addrs) {
buf.append("\n<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
buf.append("<input type=\"checkbox\" class=\"optbox\" value=\"foo\" name=\"addr_");
buf.append(addr);
buf.append('"');
@@ -243,10 +244,10 @@ public class ConfigNetHelper extends HelperBase {
buf.append(CHECKED);
buf.append("> ");
buf.append(addr);
buf.append("<br>\n");
}
if (!addrs.isEmpty()) {
buf.append(_t("Add host name or IP"))
buf.append("\n<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
.append(_t("Add host name or IP"))
.append(": ");
}
buf.append("<input name=\"udpHost1\" type=\"text\" size=\"16\" >");

View File

@@ -40,7 +40,7 @@
</p>
<p>
<%=intl._t("Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.")%>&nbsp;
<%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>&nbsp;
<%=intl._t("If you specify the wrong IP address, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>&nbsp;
<%=intl._t("When in doubt, leave the settings at the defaults.")%>&nbsp;
</p>
</td>
@@ -59,7 +59,7 @@
</tr>
<tr>
<td>
<b class="suboption"><%=intl._t("Externally reachable hostname or IP address")%>:</b><br>
<b class="suboption"><%=intl._t("Externally reachable IP address")%>:</b><br>
<label><input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> >
<%=intl._t("Use all auto-detect methods")%></label><br>
<label><input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> >
@@ -71,7 +71,7 @@
<label><input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> >
<%=intl._t("Hidden mode - do not publish IP")%> <i><%=intl._t("(prevents participating traffic)")%></i></label><br>
<label><input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> >
<%=intl._t("Specify hostname or IP")%>:</label>
<%=intl._t("Specify host name or IP")%>:</label>
<%=nethelper.getAddressSelector() %>
</td>
</tr>
@@ -137,7 +137,7 @@
</tr>
<tr>
<td>
<b class="suboption"><%=intl._t("Externally reachable hostname or IP address")%>:</b><br>
<b class="suboption"><%=intl._t("Externally reachable IP address")%>:</b><br>
<label><input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> >
<%=intl._t("Use auto-detected IP address")%>
<i>(<%=intl._t("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
@@ -149,7 +149,7 @@
<label><input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> >
<%=intl._t("Completely disable")%> <i><%=intl._t("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i></label><br>
<label><input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> >
<%=intl._t("Specify hostname or IP")%>:</label>
<%=intl._t("Specify host name or IP")%>:</label>
<input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" >
</td>
</tr>

View File

@@ -26,7 +26,7 @@
<ul><li>
<%=intl._t("The proxy may be a remote public proxy, or may be running on your computer (localhost).")%>
</li><li>
<%=intl._t("To use a proxy, configure the type, hostname, and port below.")%>
<%=intl._t("To use a proxy, configure the type, host, and port below.")%>
</li><li>
<%=intl._t("If you are running Tor Browser, reseed through it by configuring SOCKS 5, localhost, port 9150.")%>
</li><li>

View File

@@ -61,7 +61,7 @@
<%=intl._t("However, a restart is always required after this error.")%>
</li>
<li><b><%=intl._t("ERR - UDP Disabled and Inbound TCP host/port not set")%>:</b>
<%=intl._t("You have not configured inbound TCP with a hostname and port on the Network Configuration page, however you have disabled UDP.")%>&nbsp;
<%=intl._t("You have not configured inbound TCP with an address and port on the Network Configuration page, however you have disabled UDP.")%>&nbsp;
<%=intl._t("Therefore your router cannot accept inbound connections.")%>&nbsp;
<%=intl._t("Please configure a TCP host and port on the Network Configuration page or enable UDP.")%>
</li>