diff --git a/apps/i2psnark/resources/themes/light/snark.css b/apps/i2psnark/resources/themes/light/snark.css index b9958f1ef..20b902f94 100644 --- a/apps/i2psnark/resources/themes/light/snark.css +++ b/apps/i2psnark/resources/themes/light/snark.css @@ -2597,6 +2597,7 @@ input[type="submit"] { font-size: 12pt !important; padding: 4px 1px 3px !important; min-width: 300px; + border-radius: 0px 0px 6px 6px; } .snarkTorrentStatus b { @@ -2633,6 +2634,7 @@ input[type="submit"] { .snarkConfigTitle a { font-size: 12.5pt !important; margin-top: 0 !important; + border-radius: 0px 0px 6px 6px; } } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java index ab989c101..a534e4dc9 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java @@ -298,7 +298,7 @@ public abstract class LocalHTTPServer { .append(conURL).append("help.jsp\">").append(_t("Help")).append(""); if (pm.isRegistered(PortMapper.SVC_SUSIDNS)) { buf.append(" ") - .append(_t("Addressbook")).append("\n"); + .append(_t("Address book")).append("\n"); } buf.append("" + "
\n" + @@ -368,13 +368,13 @@ public abstract class LocalHTTPServer { "\"I2P
\n" + "" + _t("Configuration") + " " + _t("Help") + "").getBytes("UTF-8")); if (pm.isRegistered(PortMapper.SVC_SUSIDNS)) - out.write((" " + _t("Addressbook") + "\n").getBytes("UTF-8")); + out.write((" " + _t("Address Book") + "\n").getBytes("UTF-8")); out.write(("
" + "
\n" + "

" + (success ? - _t("Saved {0} to the {1} addressbook, redirecting now.", host, tbook) : - _t("Failed to save {0} to the {1} addressbook, redirecting now.", host, tbook)) + + _t("Saved {0} to the {1} address book, redirecting now.", host, tbook) : + _t("Failed to save {0} to the {1} address book, redirecting now.", host, tbook)) + "

\n

" + _t("Click here if you are not redirected automatically.") + "

").getBytes("UTF-8")); @@ -402,7 +402,7 @@ public abstract class LocalHTTPServer { "\"I2P
\n" + "" + _t("Configuration") + " " + _t("Help") + "").getBytes("UTF-8")); if (pm.isRegistered(PortMapper.SVC_SUSIDNS)) - out.write((" " + _t("Addressbook") + "\n").getBytes("UTF-8")); + out.write((" " + _t("Address Book") + "\n").getBytes("UTF-8")); out.write(("" + "
\n" + "

" + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java index 76fe0c4f5..52b63d2b0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java @@ -246,7 +246,7 @@ public class ConfigClientsHelper extends HelperBase { else if (app.equals("imagegen")) desc = _t("Identification Image Generator"); else if (app.equals("susidns")) - desc = _t("Addressbook"); + desc = _t("Address Book"); else if (app.equals("susimail")) desc = _t("Email"); else diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java index ed06453fa..8648e6ee4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/HomeHelper.java @@ -45,7 +45,7 @@ public class HomeHelper extends HelperBase { _x("Hidden Services Manager") + S + _x("Control your client and server tunnels") + S + "/i2ptunnelmgr" + S + I + "server_32x32.png" + S + _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/torrents" + S + I + "i2psnark.png" + S + _x("Web Server") + S + _x("Local web server for hosting your own content on I2P") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S + - _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S + + _x("Address Book") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S + ""; /** @since 0.9.44 */ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java index 04c93048c..44dd70aac 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java @@ -540,9 +540,9 @@ class NetDbRenderer { String b32 = key.toBase32(); buf.append("").append(b32).append(""); if (linkSusi && !unpublished && host == null) { - buf.append("").append("").append("").append(_t("Add to local addressbook")).append(""); + .append(dest.toBase64()).append("#add\">").append(_t("Add to local address book")).append(""); } // else probably a client } } else { @@ -563,9 +563,9 @@ class NetDbRenderer { buf.append(" colspan=\"2\""); buf.append(">").append(b32).append("\n"); if (linkSusi && dest != null) { - buf.append("").append(_t("Add to local addressbook")).append(""); + .append(dest.toBase64()).append("#add\">").append(_t("Add to local address book")).append(""); } } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java index 61446bbe9..bbf222786 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java @@ -343,7 +343,7 @@ class SummaryBarRenderer { StringBuilder rbuf = new StringBuilder(128); PortMapper pm = _context.portMapper(); if (pm.isRegistered(PortMapper.SVC_SUSIDNS)) { - String tx = _t("Addressbook"); + String tx = _t("Address Book"); rbuf.append("") diff --git a/apps/routerconsole/jsp/configwebapps.jsp b/apps/routerconsole/jsp/configwebapps.jsp index f379a12c6..e7bd87acb 100644 --- a/apps/routerconsole/jsp/configwebapps.jsp +++ b/apps/routerconsole/jsp/configwebapps.jsp @@ -25,7 +25,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }

<%=intl._t("WebApp Configuration")%>

- <%=intl._t("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark), front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook).")%>  + <%=intl._t("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark), front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. address book).")%>  <%=intl._t("A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method.")%>

diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp index 5706c705f..57c5e2d4c 100644 --- a/apps/routerconsole/jsp/dns.jsp +++ b/apps/routerconsole/jsp/dns.jsp @@ -23,7 +23,7 @@ <%@include file="css.jsi" %> -<%=intl.title("addressbook")%> +<%=intl.title("Address Book")%> <%@include file="summaryajax.jsi" %> diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 0805063af..30b8d83cf 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -62,9 +62,9 @@
-

<%=intl._t("What is the addressbook?")%>

+

<%=intl._t("What is the address book?")%>

-<%=intl._t("The addressbook application is part of your I2P installation.")%> +<%=intl._t("The address book application is part of your I2P installation.")%> <%=intl._t("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%>

@@ -74,9 +74,9 @@

<%=intl._t("For more information on naming in I2P, see the overview.")%>

-

<%=intl._t("How does the addressbook application work?")%>

+

<%=intl._t("How does the address book application work?")%>

-<%=intl._t("The addressbook application regularly polls your subscriptions and merges their content into your \"router\" address book.")%> +<%=intl._t("The address book application regularly polls your subscriptions and merges their content into your \"router\" address book.")%> <%=intl._t("Then it merges your \"local\" address book into the router address book as well.")%> <%=intl._t("If configured, the router address book is now written to the \"published\" address book, which will be publicly available if you are running an I2P Site.")%>

diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index aa4405279..8c056283d 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -69,7 +69,7 @@

<%=intl._t("The subscription file contains a list of i2p URLs.")%> -<%=intl._t("The addressbook application regularly checks this list for new I2P Sites.")%> +<%=intl._t("The address book application regularly checks this list for new I2P Sites.")%> <%=intl._t("Those URLs refer to published hosts.txt files.")%> <%=intl._t("The default subscription is the hosts.txt from {0}, which is updated infrequently.", "i2p-projekt.i2p")%> <%=intl._t("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%> diff --git a/apps/susidns/src/themes/light/susidns.css b/apps/susidns/src/themes/light/susidns.css index 75c4338cd..064ff686a 100644 --- a/apps/susidns/src/themes/light/susidns.css +++ b/apps/susidns/src/themes/light/susidns.css @@ -589,7 +589,7 @@ textarea[name="config"]:focus, textarea[name="content"]:focus { margin: 2px 1px; padding: 4px 8px; border: 1px solid #dee2e6; - border-radius: 2px; + border-radius: 6px; color: #3b6bbf; text-align: center;