diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 21118f61e..bc204e9fc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -337,8 +337,7 @@ public class I2PSnarkServlet extends DefaultServlet { out.write(_("Status")); out.write("\" alt=\""); out.write(_("Status")); - out.write("\"> "); - out.write(_("Status")); + out.write("\">"); if (_manager.util().connected() && !snarks.isEmpty()) { out.write(" "); - out.write(_("Torrent")); + out.write("\">"); out.write("\n"); if (_manager.util().connected() && !snarks.isEmpty()) { - out.write("\"\""); + out.write("\" alt=\""); // Translators: Please keep short or translate as " " out.write(_("ETA")); + out.write("\">"); } out.write("\n"); - out.write("\"\""); + out.write("\" alt=\""); // Translators: Please keep short or translate as " " out.write(_("RX")); + out.write("\">"); out.write("\n"); if (_manager.util().connected() && !snarks.isEmpty()) { - out.write("\"\""); + out.write("\" alt=\""); // Translators: Please keep short or translate as " " out.write(_("TX")); + out.write("\">"); } out.write("\n"); if (_manager.util().connected() && !snarks.isEmpty()) { out.write("\"");"); // Translators: Please keep short or translate as " " - out.write(_("Rate")); + out.write(_("RX Rate")); + out.write(" \">"); } out.write("\n"); if (_manager.util().connected() && !snarks.isEmpty()) { out.write("\"");"); - out.write(_("Rate")); } out.write("\n"); @@ -973,25 +973,24 @@ public class I2PSnarkServlet extends DefaultServlet { if (err != null) { if (isRunning && curPeers > 0 && !showPeers) statusString = "\""" + - "" + _("Tracker Error") + - ": " + + "" + + "" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning) statusString = "\""" + - "" + _("Tracker Error") + - ": " + curPeers + thinsp(noThinsp) + + "" + + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); else { if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "…"; statusString = "\""" + - "" + _("Tracker Error") + - "
" + err; + ""; } } else if (snark.isStarting()) { statusString = "\""" + - "" + _("Starting"); + ""; } else if (remaining == 0 || needed == 0) { // < 0 means no meta size yet // partial complete or seeding if (isRunning) { @@ -1007,52 +1006,52 @@ public class I2PSnarkServlet extends DefaultServlet { } if (curPeers > 0 && !showPeers) statusString = "\""" + - "" + txt + - ": " + + "" + + "" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + ""; else statusString = "\""" + - "" + txt + - ": " + curPeers + thinsp(noThinsp) + + "" + + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); } else { statusString = "\""" + - "" + _("Complete"); + ""; } } else { if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) statusString = "\""" + - "" + _("OK") + - ": " + + "" + + "" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning && curPeers > 0 && downBps > 0) statusString = "\""" + - "" + _("OK") + - ": " + curPeers + thinsp(noThinsp) + + "" + + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning && curPeers > 0 && !showPeers) statusString = "\""" + - "" + _("Stalled") + - ": " + + "" + + "" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + ""; else if (isRunning && curPeers > 0) statusString = "\""" + - "" + _("Stalled") + - ": " + curPeers + thinsp(noThinsp) + + "" + + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning && knownPeers > 0) statusString = "\""" + - "" + _("No Peers") + - ": 0" + thinsp(noThinsp) + knownPeers ; + "" + + "0" + thinsp(noThinsp) + knownPeers ; else if (isRunning) statusString = "\""" + - "" + _("No Peers"); + ""; else statusString = "\""" + - "" + _("Stopped"); + ""; } out.write("");