propagate from branch 'i2p.i2p.zzz.test2' (head 9aee013cf961ba795a6b5333481634c52d43abc5)

to branch 'i2p.i2p' (head e439e67c49695a624fabdf6f3cd1a8f7a3fd7ea5)

apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java

@@ -174,7 +174,7 @@ public class CSSHelper extends HelperBase {
                                // text
                              !(ua.startsWith("Lynx") || ua.startsWith("w3m") ||
                                ua.startsWith("ELinks") || ua.startsWith("Links") ||
-                               ua.startsWith("Dillo") ||
+                               ua.startsWith("Dillo") || ua.startsWith("Emacs-w3m") ||
                                // mobile
                                // http://www.zytrax.com/tech/web/mobile_ids.html
                                // Android tablet UAs don't have "Mobile" in them

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

@@ -93,6 +93,7 @@ public class ConfigUIHelper extends HelperBase {
         { "pt_BR", "br", _x("Portuguese"), "Brazil" },
         { "ro", "ro", _x("Romanian"), null },
         { "ru", "ru", _x("Russian"), null },
+        { "sk", "sk", _x("Slovak"), null },
         { "sv", "se", _x("Swedish"), null },
         { "tr", "tr", _x("Turkish"), null },
         { "uk", "ua", _x("Ukrainian"), null },