merge of '2c3eb1b692122c7c96b2c547532274f1068fc7f5'

and 'ed99c2a20da18fdc068fa77418f54a1857152a16'

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

@@ -267,7 +267,7 @@ public class SummaryBarRenderer {
            .append(":</b></td><td align=\"right\">");
         int active = _helper.getActivePeers();
         buf.append(active)
-           .append("&thinsp;/&thinsp;")
+           .append(SummaryHelper.THINSP)
            .append(Math.max(active, _helper.getActiveProfiles()))
            .append("</td></tr>\n" +
 
@@ -351,7 +351,7 @@ public class SummaryBarRenderer {
                    "<table>\n" +
 
                    "<tr><td align=\"left\"><b>")
-           .append(_("1 sec"))   // formatDuration2() would say 1000 ms
+           .append(DataHelper.formatDuration2(3 * 1000))   // lie and say 3 sec since 1 sec would appear as 1000 ms
            .append(":</b></td><td align=\"right\">")
            .append(_helper.getSecondKBps())
            .append("Bps</td></tr>\n");
@@ -376,7 +376,7 @@ public class SummaryBarRenderer {
            .append(_("Used"))
            .append(":</b></td><td align=\"right\">")
            .append(_helper.getInboundTransferred())
-           .append("&thinsp;/&thinsp;")
+           .append(SummaryHelper.THINSP)
            .append(_helper.getOutboundTransferred())
            .append("</td></tr></table>\n" +
 

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

@@ -29,6 +29,11 @@ import net.i2p.stat.RateStat;
  * the summary sections on the router console.  
  */
 public class SummaryHelper extends HelperBase {
+
+    // Opera 10.63 doesn't have the char, TODO check UA
+    //static final String THINSP = " / ";
+    static final String THINSP = " / ";
+
     /**
      * Retrieve the shortened 4 character ident for the router located within
      * the current JVM at the given context.
@@ -321,7 +326,7 @@ public class SummaryHelper extends HelperBase {
             fmt = new DecimalFormat("#0.0");
         else
             fmt = new DecimalFormat("#0.00");
-        return fmt.format(in) + " / " + fmt.format(out) + " " +
+        return fmt.format(in) + THINSP + fmt.format(out) + " " +
                (mega ? 'M' : 'K');
     }
 

apps/routerconsole/jsp/help_ru.jsp

@@ -172,5 +172,5 @@
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
 
- <p>Более подробный список изменений можно найти в файле history.txt в каталоге Вашего I2P.
+ <p>Более подробный список изменений можно найти в файле history.txt, который находится в директории установки I2P.
  </p><hr></div></body></html>