From 163023ecc2e45e752ee82ea2cc9254115abf8b44 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 4 Jun 2017 04:59:46 +0000
Subject: [PATCH] String tweaks
---
.../src/net/i2p/router/web/ConfigLoggingHelper.java | 10 +++++++---
apps/routerconsole/jsp/confignet.jsp | 2 +-
apps/susidns/src/jsp/config.jsp | 2 +-
apps/susidns/src/jsp/subscriptions.jsp | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
index 26dbc53f44..3e8ef1cdd1 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
@@ -42,9 +42,13 @@ public class ConfigLoggingHelper extends HelperBase {
buf.append(prefix).append('=').append(level).append('\n');
}
buf.append("</textarea><br>\n");
- buf.append("<p>").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("<br>");
- buf.append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("<br>");
- buf.append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("</p>\n");
+ buf.append("<p>")
+ .append(_t("Add additional logging statements above (e.g. {0}).", "<b>net.i2p.router.tunnel=WARN</b>"))
+ .append("<br>")
+ .append(_t("Alternatively, put entries in the file {0} (e.g. {1}).", "<b>logger.config</b>", "<b>logger.record.net.i2p.router.tunnel=WARN</b>"))
+ .append("<br>")
+ .append(_t("Valid log levels are {0}.", "<b>DEBUG, INFO, WARN, ERROR, CRIT</b>"))
+ .append("</p>\n");
/****
// this is too big and ugly
diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp
index e46b4e8120..a3ef7433fc 100644
--- a/apps/routerconsole/jsp/confignet.jsp
+++ b/apps/routerconsole/jsp/confignet.jsp
@@ -104,7 +104,7 @@
</tr>
<tr>
<td class="infowarn">
- <b><%=intl._t("Do not reveal your port numbers to anyone as they can be used to discover your ip address.")%></b>
+ <b><%=intl._t("Do not reveal your port numbers to anyone, as they can be used to discover your IP address.")%></b>
</td>
</tr>
<tr>
diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp
index 31ad3a10ab..af8e1c86c4 100644
--- a/apps/susidns/src/jsp/config.jsp
+++ b/apps/susidns/src/jsp/config.jsp
@@ -67,7 +67,7 @@
<hr>
<div class="headline" id="configure">
<h3><%=intl._t("Configuration")%></h3>
-<h4><%=intl._t("Location:")%> ${cfg.fileName}</h4>
+<h4><%=intl._t("File location")%>: ${cfg.fileName}</h4>
</div>
<div id="messages">${cfg.messages}</div>
<form method="POST" action="config">
diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp
index e26be175e2..095d8b5d82 100644
--- a/apps/susidns/src/jsp/subscriptions.jsp
+++ b/apps/susidns/src/jsp/subscriptions.jsp
@@ -65,7 +65,7 @@
<hr>
<div class="headline" id="subscriptions">
<h3><%=intl._t("Subscriptions")%></h3>
-<h4><%=intl._t("Location:")%> ${subs.fileName}</h4>
+<h4><%=intl._t("File location")%>: ${subs.fileName}</h4>
</div>
<div id="messages">${subs.messages}</div>
<form method="POST" action="subscriptions">
--
GitLab