* Fixes after review:

- Fix Polish po file - Install as a service by default on Windows again - Change CPUID getters to package private - Split new jbigi install messages into two lines - Javadocs
2011-06-26 19:07:01 +00:00
parent 4ec4013a44
commit 2f10cca40f
24 changed files with 155 additions and 81 deletions
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -97,7 +97,6 @@ public class Daemon {
     * 
     * @param router
     *            The NamingService to update, generally the root NamingService from the context.
-     *            client applications.
     * @param published
     *            The published AddressBook. This address book is published on
     *            the user's eepsite so that others may subscribe to it.
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1304,6 +1304,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
        out.flush();
    }

+    /**
+     *  Decode %xx encoding
+     *  @since 0.8.7
+     */
    private static String decode(String s) {
        if (!s.contains("%"))
            return s;
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/package.html
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/package.html
@@ -1,7 +1,14 @@
 <html><body>
 <p>Implements a TCP-like (reliable, authenticated, in order) set of sockets for 
 communicating over the IP-like (unreliable, unauthenticated, unordered) I2P
-messages.</p>
+messages.
+Note that this class is split across two jars, streaming.jar and ministreaming.jar.
+The interfaces and some very old code are in ministreaming.jar, but the
+real work gets done in streaming.jar. Clients must have both jars
+in their classpath.
+Most clients will require (only) streaming.jar, ministreaming.jar, and i2p.jar
+in their classpath to communicate with the router.
+</p>

 <p>When an application wants to use streams, it must fetch an {@link
 net.i2p.client.streaming.I2PSocketManager} from the {@link 
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -46,6 +46,13 @@ public class ConfigUIHelper extends HelperBase {
         return rv;
    }

+    /**
+     *  Each language has the ISO code, the flag, and the name.
+     *  Alphabetical by the ISO code please.
+     *  See http://en.wikipedia.org/wiki/ISO_639-1 .
+     *  Any language-specific flag added to the icon set must be
+     *  added to the top-level build.xml for the updater.
+     */
    private static final String langs[] = {"ar", "de", "en", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru",
                                           "sv", "vi", "zh"};
    private static final String flags[] = {"lang_ar", "de", "us", "es", "fi", "fr", "it", "nl", "pl", "pt", "ru",
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
@@ -26,7 +26,7 @@ import org.jrobin.graph.RrdGraphDef;
 import org.jrobin.graph.RrdGraphDefTemplate;

 /**
- *  Creates and updates the in-memory RRD database,
+ *  Creates and updates the in-memory or on-disk RRD database,
 *  and provides methods to generate graphs of the data
 *
 *  @since 0.6.1.13
--- a/apps/routerconsole/jsp/css.jsi
+++ b/apps/routerconsole/jsp/css.jsi
@@ -36,20 +36,16 @@
 %>
 <link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
 <%
-   // make the fonts bigger for chinese
   if (intl.getLang().equals("zh")) {
+       // make the fonts bigger for chinese
 %>
 <link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_big.css" rel="stylesheet" type="text/css">
 <%
-   }
-%>
-<%
-   // Use RTL theme for Arabic
-   if (intl.getLang().equals("ar")) {
+   } else if (intl.getLang().equals("ar")) {
+       // Use RTL theme for Arabic
 %>
 <link href="<%=intl.getTheme(request.getHeader("User-Agent"))%>console_ar.css" rel="stylesheet" type="text/css">
 <%
   }
 %>
-
 <!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
--- a/apps/routerconsole/locale/messages_pl.po
+++ b/apps/routerconsole/locale/messages_pl.po
@@ -34,9 +34,9 @@ msgstr ""
 #, java-format
 msgid "1 ms"
 msgid_plural "{0,number,####} ms"
-msgstr[0] "ms"
-msgstr[1] "ms"
-msgstr[2] "ms"
+msgstr[0] "1 ms"
+msgstr[1] "{0,number,####} ms"
+msgstr[2] "{0,number,####} ms"

 #. seconds
 #. Note to translators: quantity will always be greater than one.
@@ -45,9 +45,9 @@ msgstr[2] "ms"
 #, java-format
 msgid "1 sec"
 msgid_plural "{0} sec"
-msgstr[0] "sek"
-msgstr[1] "sek"
-msgstr[2] "sek"
+msgstr[0] "1 sek"
+msgstr[1] "{0} sek"
+msgstr[2] "{0} sek"

 #. minutes
 #. Note to translators: quantity will always be greater than one.
@@ -56,9 +56,9 @@ msgstr[2] "sek"
 #, java-format
 msgid "1 min"
 msgid_plural "{0} min"
-msgstr[0] "min"
-msgstr[1] "min"
-msgstr[2] "min"
+msgstr[0] "1 min"
+msgstr[1] "{0} min"
+msgstr[2] "{0} min"

 #. hours
 #. Note to translators: quantity will always be greater than one.
@@ -67,9 +67,9 @@ msgstr[2] "min"
 #, java-format
 msgid "1 hour"
 msgid_plural "{0} hours"
-msgstr[0] "godz"
-msgstr[1] "godz"
-msgstr[2] "godz"
+msgstr[0] "1 godz"
+msgstr[1] "{0} godz"
+msgstr[2] "{0} godz"

 #: ../../../core/java/src/net/i2p/data/DataHelper.java:1209
 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:314
@@ -82,9 +82,9 @@ msgstr "nie dotyczy"
 #, java-format
 msgid "1 day"
 msgid_plural "{0} days"
-msgstr[0] "dzień"
-msgstr[1] "dni"
-msgstr[2] "dni"
+msgstr[0] "1 dzień"
+msgstr[1] "{0} dni"
+msgstr[2] "{0} dni"

 #: ../../../router/java/src/net/i2p/router/Blocklist.java:122
 #, java-format
@@ -222,7 +222,7 @@ msgid ""
 "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)."
 msgstr ""
 "Ponowne seedowanie: pobieranie informacji o routerze z URL seeda ({0} udane,"
-" {1} błędów})"
+" {1} błędów)"

 #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:512
 msgid "NetDb entry"
--- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
@@ -17,7 +17,6 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *  
- * @since 0.8.7
 */

 package i2p.susi.dns;
--- a/apps/susidns/src/jsp/details.jsp
+++ b/apps/susidns/src/jsp/details.jsp
@@ -1,7 +1,5 @@
 <%
 /*
- * Created on Sep 02, 2005
- * 
 *  This file is part of susidns project, see http://susi.i2p/
 *  
 *  Copyright (C) 2005 <susi23@mail.i2p>
@@ -20,7 +18,6 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *  
- * $Revision: 1.3 $
 */

    // http://www.crazysquirrel.com/computing/general/form-encoding.jspx