Changeset 277a161


Ignore:
Timestamp:
May 28, 2018 5:49:47 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
278a814
Parents:
d128bab
Message:

Console: Tagged string fixes (ticket #2017)
CSS tweaks

Files:
14 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    rd128bab r277a161  
    16461646                    img = "seeding";
    16471647                    txt = _t("Seeding");
    1648                     tooltip = _t("Seeding to {0} of {1} peers in swarm", curPeers, knownPeers);
     1648                    tooltip = ngettext("Seeding to {0} peer", "Seeding to {0} peers", knownPeers);
    16491649                } else {
    16501650                    // partial
     
    16521652                    txt = _t("Complete");
    16531653                    tooltip = txt;
    1654                     if (curPeers > 0) {
    1655                         tooltip = txt + " (" + _t("Seeding to {0} of {1} peers in swarm", curPeers, knownPeers) + ")";
    1656                     }
    16571654                }
    16581655                if (curPeers > 0 && !showPeers) {
     
    16801677                               ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
    16811678            } else if (isRunning && curPeers > 0 && downBps > 0) {
    1682                 statusString = toThemeImg("downloading", "", _t("OK") + " (" + _t("Downloading from {0} of {1} peers in swarm", curPeers, knownPeers) + ")") + "</td>" +
     1679                statusString = toThemeImg("downloading", "", _t("OK") + ", " + ngettext("Downloading from {0} peer", "Downloading from {0} peers", curPeers)) + "</td>" +
    16831680                               "<td class=\"snarkTorrentStatus\"><b>" + _t("OK") +
    16841681                               ":</b> " + curPeers + thinsp(noThinsp) +
    16851682                               ngettext("1 peer", "{0} peers", knownPeers);
    16861683            } else if (isRunning && curPeers > 0 && !showPeers) {
    1687                 statusString = toThemeImg("stalled", "", _t("Stalled") + " (" + _t("Connected to {0} of {1} peers in swarm", curPeers, knownPeers) + ")") + "</td>" +
     1684                statusString = toThemeImg("stalled", "", _t("Stalled") + " (" + ngettext("Connected to {0} peer", "Connected to {0} peers", curPeers)) + "</td>" +
    16881685                               "<td class=\"snarkTorrentStatus\"><b>" + _t("Stalled") +
    16891686                               ":</b> <a href=\"" + uri + getQueryString(req, b64, null, null) + '#' + b64Short + "\">" +
     
    18931890                else
    18941891                    out.write("<input type=\"image\" name=\"action_Delete_" + b64 + "\" value=\"foo\" title=\"");
    1895                 out.write(_t("Delete the .torrent file and the associated data file(s)"));
     1892                out.write(_t("Delete the .torrent file and the associated data files"));
    18961893                out.write("\" onclick=\"if (!confirm('");
    18971894                // Can't figure out how to escape double quotes inside the onclick string.
     
    25032500                  + _manager.util().getMaxUploaders() + "\" size=\"4\" maxlength=\"3\""
    25042501                  + " title=\"");
    2505         out.write(_t("Maximum number of peers to upload to"));
     2502        out.write(_t("Maximum number of peers for uploading"));
    25062503        out.write("\"> ");
    25072504        out.write(_t("peers"));
     
    25282525                  + (useOpenTrackers ? "checked " : "")
    25292526                  + "title=\"");
    2530         out.write(_t("Announce torrents to open trackers as well as tracker(s) listed in the torrent file"));
     2527        out.write(_t("Announce torrents to open trackers as well as trackers listed in the torrent file"));
    25312528        out.write("\" ></td></tr>\n" +
    25322529
     
    32723269                    else
    32733270                        buf.append("\" class=\"reload\" title=\"")
    3274                            .append(_t("Check integrity of the downloaded file(s)"))
     3271                           .append(_t("Check integrity of the downloaded files"))
    32753272                           .append("\">\n");
    32763273                }
  • apps/i2ptunnel/jsp/editClient.jsi

    rd128bab r277a161  
    656656        <tr>
    657657            <td colspan="2">
    658                 <textarea rows="2" style="height: 8em;" cols="60" id="hostField" name="jumpList" title="<%=intl._t("List of helper URLs to offer jumplinks from the web proxy error page when a host is not found in your addressbook")%>" wrap="off" spellcheck="false"><%=editBean.getJumpList(curTunnel)%></textarea>
     658                <textarea rows="2" style="height: 8em;" cols="60" id="hostField" name="jumpList" title="<%=intl._t("List of helper URLs providing jump links when a host is not found in your addressbook")%>" wrap="off" spellcheck="false"><%=editBean.getJumpList(curTunnel)%></textarea>
    659659            </td>
    660660        </tr>
     
    670670        <tr>
    671671            <td colspan="2">
    672                 <input type="text" id="customOptions" name="nofilter_customOptions" size="60" title="<%=intl._t("Advanced options to control tunnel priority etc")%>" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" spellcheck="false"/>
     672                <input type="text" id="customOptions" name="nofilter_customOptions" size="60" title="<%=intl._t("Advanced tunnel, streaming, and I2CP options")%>" value="<%=editBean.getCustomOptions(curTunnel)%>" class="freetext" spellcheck="false"/>
    673673            </td>
    674674        </tr>
  • apps/i2ptunnel/jsp/editServer.jsi

    rd128bab r277a161  
    565565
    566566            <td>
    567                 <label title="<%=intl._t("Deny accesseses with referers (probably from inproxies)")%>"><input value="1" type="checkbox" name="rejectReferer"<%=(editBean.isRejectReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     567                <label><input value="1" type="checkbox" name="rejectReferer"<%=(editBean.isRejectReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    568568                <%=intl._t("Block Accesses containing Referers")%></label>
    569569            </td>
     
    943943        <tr>
    944944            <td colspan="2">
    945                 <input type="text" class="freetext" id="customOptions" name="nofilter_customOptions" size="60" title="<%=intl._t("Advanced options to control tunnel priority etc")%>" value="<%=editBean.getCustomOptions(curTunnel)%>" />
     945                <input type="text" class="freetext" id="customOptions" name="nofilter_customOptions" size="60" title="<%=intl._t("Advanced tunnel, streaming, and I2CP options")%>" value="<%=editBean.getCustomOptions(curTunnel)%>" />
    946946            </td>
    947947        </tr>
  • apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigUIHelper.java

    rd128bab r277a161  
    5050        buf.append("value=\"1\">")
    5151           .append(_t("Force the mobile console to be used"))
    52            .append("</label></br>\n");
     52           .append("</label><br>\n");
    5353        boolean embedApps = _context.getBooleanProperty(CSSHelper.PROP_EMBED_APPS);
    5454        buf.append("<label title=\"")
    55            .append(_t("Enabling the Universal Themeing option is recommended when embedding these applications"))
     55           .append(_t("Enabling the Universal Theming option is recommended when embedding these applications"))
    5656           .append("\"><input type=\"checkbox\" name=\"embedApps\" ");
    5757        if (embedApps)
    5858            buf.append(CHECKED);
    5959        buf.append("value=\"1\">")
    60            .append(_t("Embed I2PSnark and I2PMail in the console"))
     60           .append(_t("Embed Email and Torrent applications in the console"))
    6161           .append("</label></div>\n");
    6262        return buf.toString();
  • apps/routerconsole/jsp/help-reachability.jsi

    rd128bab r277a161  
    1414     <%=intl._t("However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port.")%>&nbsp;
    1515     <%=intl._t("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%>&nbsp;
    16      <%=intl._t("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%>&nbsp;
     16     <%=intl._t("However, you will get more participating traffic and help the network if you open your firewall.")%>&nbsp;
    1717     <%=intl._t("If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control.")%>&nbsp;
    1818     <%=intl._t("Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P.")%>
  • apps/susimail/src/src/i2p/susi/webmail/WebMail.java

    rd128bab r277a161  
    22852285                                        "<head>\n" +
    22862286                                        "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
    2287                                         "<title>" + _t("SusiMail") + " - " + subtitle + "</title>\n" +
     2287                                        "<title>" + _t("Email") + " - " + subtitle + "</title>\n" +
    22882288                                        "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + sessionObject.themePath + "susimail.css?" + CoreVersion.VERSION + "\">" );
    22892289                                if (sessionObject.isMobile ) {
     
    23082308                                sessionObject.addNonce(nonce);
    23092309                                out.println(
    2310                                         "<div class=\"page\"><div class=\"header\"><img class=\"header\" src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"></div>\n" +
     2310                                        "<div class=\"page\">" +
     2311                                        // hidden by CSS
     2312                                        //"<div class=\"header\"><img class=\"header\" src=\"" + sessionObject.imgPath + "susimail.png\" alt=\"Susimail\"></div>\n" +
    23112313                                        "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"" + myself + "\" accept-charset=\"UTF-8\">\n" +
    23122314                                        "<input type=\"hidden\" name=\"" + SUSI_NONCE + "\" value=\"" + nonce + "\">\n" +
     
    30463048                String smtp = Config.getProperty( CONFIG_PORTS_SMTP, "" + DEFAULT_SMTPPORT );
    30473049               
    3048                 out.println( "<div id=\"dologin\"><h1>" + _t("I2PMail Login") + "</h1><table cellspacing=\"3\" cellpadding=\"5\">\n" +
     3050                out.println( "<div id=\"dologin\"><h1>" + _t("Email Login") + "</h1><table cellspacing=\"3\" cellpadding=\"5\">\n" +
    30493051                        // current postman hq length limits 16/12, new postman version 32/32
    30503052                        "<tr><td align=\"right\" width=\"30%\">" + _t("User") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + USER + "\" value=\"" + "\"> @mail.i2p</td></tr>\n" +
     
    32453247                out.println(button(SWITCH_TO, _t("Change to Folder") + ':'));
    32463248                showFolderSelect(out, folderName, false);
    3247                 out.println("</td><td>");
    32483249                if (pages > 1) {
     3250                        out.println("</td><td>");
    32493251                        if (outputHidden)
    32503252                                out.println("<input type=\"hidden\" name=\"" + CUR_PAGE + "\" value=\"" + page + "\">");
  • installer/resources/themes/console/classic/console.css

    rd128bab r277a161  
    46644664}
    46654665
    4666 #themeoptions br {
    4667      display: none;
    4668 }
    4669 
    46704666#themeoptions label {
    46714667     white-space: nowrap;
  • installer/resources/themes/console/dark/console.css

    rd128bab r277a161  
    29782978     top: 8px;
    29792979     padding: 5px 10px 8px 5px;
    2980 }
    2981 
    2982 #themeoptions br {
    2983      display: none;
    29842980}
    29852981
  • installer/resources/themes/console/light/console.css

    rd128bab r277a161  
    47084708}
    47094709
    4710 #themeoptions br {
    4711      display: none;
    4712 }
    4713 
    47144710#themeoptions label {
    47154711     white-space: nowrap;
  • installer/resources/themes/console/midnight/console.css

    rd128bab r277a161  
    34403440}
    34413441
    3442 #themeoptions br {
    3443      display: none;
    3444 }
    3445 
    34463442#themeoptions label {
    34473443     white-space: nowrap;
  • installer/resources/themes/susimail/classic/susimail.css

    rd128bab r277a161  
    11581158}
    11591159
     1160table#pagenav td:nth-child(2) {
     1161     padding-left: 35px;
     1162}
     1163
    11601164table#pagenav td:last-child {
    11611165     text-align: left;
  • installer/resources/themes/susimail/dark/susimail.css

    rd128bab r277a161  
    969969
    970970table#pagenav td:nth-child(2) {
     971     padding-left: 35px;
     972}
     973
     974table#pagenav td:nth-child(3) {
    971975     text-align: center !important;
    972976     width: 4%;
  • installer/resources/themes/susimail/light/susimail.css

    rd128bab r277a161  
    12781278
    12791279table#pagenav td:nth-child(2) {
     1280     padding-left: 35px;
     1281}
     1282
     1283table#pagenav td:nth-child(3) {
    12801284     width: 2%;
    12811285     white-space: nowrap;
  • installer/resources/themes/susimail/midnight/susimail.css

    rd128bab r277a161  
    889889
    890890table#pagenav td:nth-child(2) {
     891     padding-left: 35px;
     892}
     893
     894table#pagenav td:nth-child(3) {
    891895     text-align: center !important;
    892896     min-width: 100px;
Note: See TracChangeset for help on using the changeset viewer.