merge of '484cb64d4b1b58d9f8ecb38e7502a128e18c030b'

and '9f73ccf73ff6b692ea790e91358cbd23bf8ac992'

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -595,7 +595,7 @@ public class SnarkManager implements Snark.CompleteListener {
                         //    addMessage(_("Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will announce to DHT only.", info.getName()));
                         } else {
                             //addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName()));
-                            addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers before starting the torrent.", info.getName()));
+                            addMessage(_("Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is enabled before starting this torrent.", info.getName()));
                             dontAutoStart = true;
                         }
                     }

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -1216,7 +1216,8 @@ public class I2PSnarkServlet extends Default {
         out.write("</option>\n");
         // todo remember this one with _lastAnnounceURL also
         out.write("<option value=\"none\">");
-        out.write(_("Open trackers and DHT only"));
+        //out.write(_("Open trackers and DHT only"));
+        out.write(_("Open trackers only"));
         out.write("</option>\n");
         Map trackers = _manager.getTrackers();
         for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {

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

@@ -197,9 +197,10 @@ public class StatsGenerator {
                     buf.append("; ");
                 }
 
-                buf.append(ngettext((int) curRate.getLastEventCount(), "There was 1 event", "There were {0} events"));
-                buf.append(' ');
-                buf.append(_("in this period which ended {0} ago.", DataHelper.formatDuration2(now - curRate.getLastCoalesceDate())));
+                // breaking the sentence like before makes translation in my language impossible.
+				buf.append(_("There were {0} event(s) in this period", curRate.getLastEventCount()));
+                // buf.append(' ');
+                buf.append(_(" which ended {0} ago.", DataHelper.formatDuration2(now - curRate.getLastCoalesceDate())));
             } else {
                 buf.append(" <i>").append(_("No events")).append("</i> ");
             }