diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java index 65024a3d53..83ab392726 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java @@ -375,11 +375,15 @@ public class TunnelControllerGroup implements ClientApp { props = loadConfig(cfgFile); if (shouldMigrate && !dir.exists()) { boolean ok = migrate(props, cfgFile, dir); - if (!ok) + if (!ok) { shouldMigrate = false; + } else { + _log.logAlways(Log.WARN, "Using new tunnel configurations in " + dir + + " - ignoring old tunnel configuration in " + cfgFile); + } } else { - _log.logAlways(Log.WARN, "Using new tunnel configurations in " + dir + - " - ignoring old tunnel configuration in " + cfgFile); + _log.logAlways(Log.WARN, "Not migrating tunnel configurations on excluded platform " + + " - using tunnel configuration in " + cfgFile); } } catch (IOException ioe) { if (_log.shouldLog(Log.ERROR)) diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp index b998190863..ac042e4401 100644 --- a/apps/routerconsole/jsp/console.jsp +++ b/apps/routerconsole/jsp/console.jsp @@ -32,38 +32,7 @@
<% /* English, then alphabetical by English name please */ %> - English - Arabic عربية - Azerbaijani - Čeština - Chinese 中文 - Chinese 中文 (Taiwan) - Dansk - Deutsch - Eesti - Español - Français - Galician - Greek ελληνικά - bahasa Indonesia - Italiano - Japanese 日本語
- Korean 한국어 - Malagasy - Magyar - Norsk (bokmål) - Nederlands - Polski - Português - Português brasileiro - Română - Russian Русский - Slovenčina - Suomi - Svenska - Türkçe - Ukrainian Українська - Vietnamese Tiếng Việt + <%=intl._t("Configure>

<%=intl._t("Welcome to I2P")%>

diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index c83f5012d4..55f00c60e4 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -57,41 +57,9 @@ <% if (homehelper.shouldShowWelcome()) { %> -
"> -
- English - Arabic عربية - Azerbaijani - Čeština - Chinese 中文 - Chinese 中文 (Taiwan) - Dansk - Deutsch - Eesti - Español - Français - Galician - Greek ελληνικά - bahasa Indonesia - Italiano - Japanese 日本語 -
- Korean 한국어 - Malagasy - Magyar - Norsk (bokmål) - Nederlands - Polski - Português - Português brasileiro - Română - Russian Русский - Slovenčina - Suomi - Svenska - Türkçe - Ukrainian Українська - Vietnamese Tiếng Việt +
"> +
<% /* English, then alphabetical by English name please */ %> + <%=intl._t("Configure>

<%=intl._t("Welcome to I2P")%>

diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index e72c04e2c0..807ae92384 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -2031,7 +2031,7 @@ button:active { line-height: 16px; } -.langbox > select#langsettings { +.langbox > form > select#langsettings { height: unset; } diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 6b1fac29c6..39758ad248 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -3752,7 +3752,7 @@ div[lang="de"] .links li { opacity: 1 !important; } -.langbox > select#langsettings { +.langbox > form > select#langsettings { height: unset; }