diff --git a/apps/addressbook/web.xml b/apps/addressbook/web.xml index b791b4ea0e..1aebb0d096 100644 --- a/apps/addressbook/web.xml +++ b/apps/addressbook/web.xml @@ -4,6 +4,15 @@ "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + addressbook net.i2p.addressbook.Servlet diff --git a/apps/desktopgui/locale/messages_pt_BR.po b/apps/desktopgui/locale/messages_pt_BR.po index 6672690590..6f889afe44 100644 --- a/apps/desktopgui/locale/messages_pt_BR.po +++ b/apps/desktopgui/locale/messages_pt_BR.po @@ -4,14 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# testsubject67 , 2014 # blueboy, 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-03 18:29+0000\n" -"PO-Revision-Date: 2013-11-23 16:31+0000\n" -"Last-Translator: blueboy\n" +"POT-Creation-Date: 2014-01-09 19:27+0000\n" +"PO-Revision-Date: 2014-07-05 17:40+0000\n" +"Last-Translator: testsubject67 \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,11 +34,11 @@ msgstr "Conectando" #: src/net/i2p/desktopgui/InternalTrayManager.java:26 msgid "Launch I2P Browser" -msgstr "" +msgstr "Lançar o navegador I2P " #: src/net/i2p/desktopgui/InternalTrayManager.java:50 msgid "Configure desktopgui" -msgstr "" +msgstr "Configurar desktopgui" #: src/net/i2p/desktopgui/InternalTrayManager.java:67 msgid "Restart I2P" @@ -47,10 +48,10 @@ msgstr "Reinicializar o roteador I2P" msgid "Stop I2P" msgstr "Interromper o roteador I2P" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44 +#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43 msgid "Tray icon configuration" -msgstr "" +msgstr "Configuração de ícone de bandeja" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47 +#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46 msgid "Should tray icon be enabled?" -msgstr "" +msgstr "Ativar ícone de bandeja?" diff --git a/apps/desktopgui/locale/messages_uk.po b/apps/desktopgui/locale/messages_uk.po index e827777391..e3ad0d9f67 100644 --- a/apps/desktopgui/locale/messages_uk.po +++ b/apps/desktopgui/locale/messages_uk.po @@ -3,20 +3,22 @@ # This file is distributed under the same license as the desktopgui package. # To contribute translations, see http://www.i2p2.de/newdevelopers # -# , 2011. +# Translators: +# Denis Blank , 2011 +# LinuxChata, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" -"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" -"POT-Creation-Date: 2011-03-03 18:29+0000\n" -"PO-Revision-Date: 2011-06-19 14:01+0000\n" -"Last-Translator: Pharmasolin \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-09 19:27+0000\n" +"PO-Revision-Date: 2014-06-22 10:20+0000\n" +"Last-Translator: LinuxChata\n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk_UA\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/net/i2p/desktopgui/ExternalTrayManager.java:23 msgid "Start I2P" @@ -46,12 +48,10 @@ msgstr "Перезапустити I2P" msgid "Stop I2P" msgstr "Зупинити I2P" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44 +#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43 msgid "Tray icon configuration" msgstr "Настройка трей-іконки" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47 +#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46 msgid "Should tray icon be enabled?" -msgstr "Чм повинна трей-іконка бути включена?" - - +msgstr "Чи повинна трей-іконка бути включена?" diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index c43651610d..3dcb535cb4 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -1202,22 +1202,23 @@ class PeerCoordinator implements PeerListener boolean skipped = false; for(Piece piece : wantedPieces) { if (piece.getId() == savedPiece) { - if (peer.isCompleted() && piece.getPeerCount() > 1) { + if (peer.isCompleted() && piece.getPeerCount() > 1 && + wantedPieces.size() > 2*END_GAME_THRESHOLD) { // Try to preserve rarest-first - // by not requesting a partial piece that non-seeders also have + // by not requesting a partial piece that at least two non-seeders also have // from a seeder - boolean nonSeeds = false; + int nonSeeds = 0; for (Peer pr : peers) { PeerState state = pr.state; if (state == null) continue; BitField bf = state.bitfield; if (bf == null) continue; if (bf.get(savedPiece) && !pr.isCompleted()) { - nonSeeds = true; - break; + if (++nonSeeds > 1) + break; } } - if (nonSeeds) { + if (nonSeeds > 1) { skipped = true; break; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index ba6733bcc6..073748d59a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -241,7 +241,20 @@ public class SnarkManager implements CompleteListener { private static final int MAX_MESSAGES = 100; + /** + * Use if it does not include a link. + * Escapes '<' and '>' before queueing + */ public void addMessage(String message) { + addMessageNoEscape(message.replace("<", "<").replace(">", ">")); + } + + /** + * Use if it includes a link. + * Does not escape '<' and '>' before queueing + * @since 0.9.14.1 + */ + public void addMessageNoEscape(String message) { _messages.offer(message); while (_messages.size() > MAX_MESSAGES) { _messages.poll(); @@ -579,7 +592,7 @@ public class SnarkManager implements CompleteListener { } if (dataDir != null && !dataDir.equals(getDataDir().getAbsolutePath())) { - dataDir = dataDir.trim(); + dataDir = DataHelper.stripHTML(dataDir.trim()); File dd = new File(dataDir); if (!dd.isAbsolute()) { addMessage(_("Data directory must be an absolute path") + ": " + dataDir); @@ -609,7 +622,7 @@ public class SnarkManager implements CompleteListener { } Map opts = new HashMap(); - if (i2cpOpts == null) i2cpOpts = ""; + i2cpOpts = DataHelper.stripHTML(i2cpOpts); StringTokenizer tok = new StringTokenizer(i2cpOpts, " \t\n"); while (tok.hasMoreTokens()) { String pair = tok.nextToken(); @@ -1557,7 +1570,7 @@ public class SnarkManager implements CompleteListener { if (meta.getFiles() != null) buf.append('/'); buf.append("\">").append(storage.getBaseName()).append(""); - addMessage(_("Download finished: {0}", buf.toString())); // + " (" + _("size: {0}B", DataHelper.formatSize2(len)) + ')'); + addMessageNoEscape(_("Download finished: {0}", buf.toString())); // + " (" + _("size: {0}B", DataHelper.formatSize2(len)) + ')'); updateStatus(snark); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java index 1a1d2b2d26..d24d4f87c8 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java @@ -86,7 +86,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl * Set off by startTorrent() */ public void run() { - _mgr.addMessage(_("Fetching {0}", urlify(_url))); + _mgr.addMessageNoEscape(_("Fetching {0}", urlify(_url))); File file = get(); if (!_isRunning) // stopped? return; @@ -96,7 +96,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl _mgr.deleteMagnet(this); add(file); } else { - _mgr.addMessage(_("Torrent was not retrieved from {0}", urlify(_url)) + + _mgr.addMessageNoEscape(_("Torrent was not retrieved from {0}", urlify(_url)) + ((_failCause != null) ? (": " + DataHelper.stripHTML(_failCause)) : "")); } if (file != null) @@ -150,7 +150,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl * This Snark may then be deleted. */ private void add(File file) { - _mgr.addMessage(_("Torrent fetched from {0}", urlify(_url))); + _mgr.addMessageNoEscape(_("Torrent fetched from {0}", urlify(_url))); FileInputStream in = null; try { in = new FileInputStream(file); @@ -184,9 +184,9 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl throw new IOException("Unknown error - check logs"); } } catch (IOException ioe) { - _mgr.addMessage(_("Torrent at {0} was not valid", urlify(_url)) + ": " + ioe.getMessage()); + _mgr.addMessageNoEscape(_("Torrent at {0} was not valid", urlify(_url)) + ": " + DataHelper.stripHTML(ioe.getMessage())); } catch (OutOfMemoryError oom) { - _mgr.addMessage(_("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + oom.getMessage()); + _mgr.addMessageNoEscape(_("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + DataHelper.stripHTML(oom.getMessage())); } finally { try { if (in != null) in.close(); } catch (IOException ioe) {} } 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 db5ec397fd..527227081b 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -159,6 +159,8 @@ public class I2PSnarkServlet extends BasicServlet { // this is the part after /i2psnark String path = req.getServletPath(); resp.setHeader("X-Frame-Options", "SAMEORIGIN"); + resp.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"); + resp.setHeader("X-XSS-Protection", "1; mode=block"); String peerParam = req.getParameter("p"); String stParam = req.getParameter("st"); @@ -167,9 +169,10 @@ public class I2PSnarkServlet extends BasicServlet { peerParam.replaceAll("[a-zA-Z0-9~=-]", "").length() > 0) { // XSS peerString = ""; } else { - peerString = "?p=" + peerParam; + peerString = "?p=" + DataHelper.stripHTML(peerParam); } if (stParam != null && !stParam.equals("0")) { + stParam = DataHelper.stripHTML(stParam); if (peerString.length() > 0) peerString += "&st=" + stParam; else @@ -708,7 +711,7 @@ public class I2PSnarkServlet extends BasicServlet { // return; //} if ("Add".equals(action)) { - String newURL = req.getParameter("newURL"); + String newURL = req.getParameter("nofilter_newURL"); /****** // NOTE - newFile currently disabled in HTML form - see below File f = null; @@ -744,7 +747,13 @@ public class I2PSnarkServlet extends BasicServlet { } else *****/ if (newURL != null) { - if (newURL.startsWith("http://")) { + if (newURL.contains("<") || newURL.contains(">") || + newURL.contains("%3C") || newURL.contains("%3E") || + newURL.contains("%3c") || newURL.contains("%3e") || + newURL.contains("\"") || newURL.contains("'") || + newURL.contains("%22") || newURL.contains("%27")) { + _manager.addMessage("Invalid URL"); + } else if (newURL.startsWith("http://")) { FetchAndAdd fetch = new FetchAndAdd(_context, _manager, newURL); _manager.addDownloader(fetch); } else if (newURL.startsWith(MagnetURI.MAGNET) || newURL.startsWith(MagnetURI.MAGGOT)) { @@ -934,7 +943,7 @@ public class I2PSnarkServlet extends BasicServlet { if (k.startsWith("backup_")) { String url = k.substring(7); if (!url.equals(announceURL)) - backupURLs.add(url); + backupURLs.add(DataHelper.stripHTML(url)); } } List> announceList = null; @@ -1033,7 +1042,7 @@ public class I2PSnarkServlet extends BasicServlet { Tracker t; if ((t = trackers.remove(k)) != null) { removed.add(t.announceURL); - _manager.addMessage(_("Removed") + ": " + k); + _manager.addMessage(_("Removed") + ": " + DataHelper.stripHTML(k)); changed = true; } } else if (k.startsWith("open_")) { @@ -1067,9 +1076,9 @@ public class I2PSnarkServlet extends BasicServlet { String hurl = req.getParameter("thurl"); String aurl = req.getParameter("taurl"); if (name != null && hurl != null && aurl != null) { - name = name.trim(); - hurl = hurl.trim(); - aurl = aurl.trim().replace("=", "="); + name = DataHelper.stripHTML(name.trim()); + hurl = DataHelper.stripHTML(hurl.trim()); + aurl = DataHelper.stripHTML(aurl.trim()).replace("=", "="); if (name.length() > 0 && hurl.startsWith("http://") && TrackerClient.isValidAnnounce(aurl)) { Map trackers = _manager.getTrackerMap(); trackers.put(name, new Tracker(name, aurl, hurl)); @@ -1713,7 +1722,7 @@ public class I2PSnarkServlet extends BasicServlet { private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException { // display incoming parameter if a GET so links will work - String newURL = req.getParameter("newURL"); + String newURL = req.getParameter("nofilter_newURL"); if (newURL == null || newURL.trim().length() <= 0 || req.getMethod().equals("POST")) newURL = ""; else @@ -1729,13 +1738,13 @@ public class I2PSnarkServlet extends BasicServlet { // don't lose peer setting String peerParam = req.getParameter("p"); if (peerParam != null) - out.write("\n"); + out.write("\n"); out.write("
"); out.write("\"\" "); out.write(_("Add Torrent")); out.write("
\n<% if (tunnelIsClient) { %> <% } %> \n"); + boolean allowEdit = isClientChangeEnabled(); List clients = ClientAppConfig.getClientApps(_context); for (int cur = 0; cur < clients.size(); cur++) { ClientAppConfig ca = clients.get(cur); @@ -117,18 +131,20 @@ public class ConfigClientsHelper extends HelperBase { // dangerous, but allow editing the console args too //"webConsole".equals(ca.clientName) || "Web console".equals(ca.clientName), false, RouterConsoleRunner.class.getName().equals(ca.className), - // description, edit - ca.className + ((ca.args != null) ? " " + ca.args : ""), (""+cur).equals(_edit), + // description + ca.className + ((ca.args != null) ? " " + ca.args : ""), + // edit + allowEdit && (""+cur).equals(_edit), // show edit button, show update button // Don't allow edit if it's running, or else we would lose the "handle" to the ClientApp to stop it. - !showStop, false, + allowEdit && !showStop, false, // show stop button showStop, // show delete button, show start button !isConsole, showStart); } - if ("new".equals(_edit)) + if (allowEdit && "new".equals(_edit)) renderForm(buf, "" + clients.size(), "", false, false, false, false, "", true, false, false, false, false, false); buf.append("
"); out.write(_("From URL")); - out.write(": \n"); @@ -1767,7 +1776,7 @@ public class I2PSnarkServlet extends BasicServlet { // don't lose peer setting String peerParam = req.getParameter("p"); if (peerParam != null) - out.write("\n"); + out.write("\n"); out.write(""); out.write("\"\" "); out.write(_("Create Torrent")); @@ -2199,6 +2208,7 @@ public class I2PSnarkServlet extends BasicServlet { /** @since 0.8.13 */ private static String urlEncode(String s) { return s.replace(";", "%3B").replace("&", "&").replace(" ", "%20") + .replace("<", "<").replace(">", ">") .replace("[", "%5B").replace("]", "%5D"); } diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po index 18e21c25cd..b9b23c89a8 100644 --- a/apps/i2psnark/locale/messages_en.po +++ b/apps/i2psnark/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-09 19:27+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -19,386 +19,386 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ../java/src/org/klomp/snark/IdleChecker.java:69 -#: ../java/src/org/klomp/snark/SnarkManager.java:1949 -#: ../java/src/org/klomp/snark/SnarkManager.java:1960 +#: ../java/src/org/klomp/snark/SnarkManager.java:1953 +#: ../java/src/org/klomp/snark/SnarkManager.java:1964 msgid "I2P tunnel closed." msgstr "" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1655 +#: ../java/src/org/klomp/snark/SnarkManager.java:1659 msgid "Magnet" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:515 +#: ../java/src/org/klomp/snark/SnarkManager.java:519 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:517 +#: ../java/src/org/klomp/snark/SnarkManager.java:521 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:529 +#: ../java/src/org/klomp/snark/SnarkManager.java:533 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:531 +#: ../java/src/org/klomp/snark/SnarkManager.java:535 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:543 +#: ../java/src/org/klomp/snark/SnarkManager.java:547 #, java-format msgid "Startup delay changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:554 +#: ../java/src/org/klomp/snark/SnarkManager.java:558 #, java-format msgid "Refresh time changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:556 +#: ../java/src/org/klomp/snark/SnarkManager.java:560 msgid "Refresh disabled" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:572 +#: ../java/src/org/klomp/snark/SnarkManager.java:576 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:581 +#: ../java/src/org/klomp/snark/SnarkManager.java:585 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:583 +#: ../java/src/org/klomp/snark/SnarkManager.java:587 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:585 +#: ../java/src/org/klomp/snark/SnarkManager.java:589 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:587 +#: ../java/src/org/klomp/snark/SnarkManager.java:591 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:592 +#: ../java/src/org/klomp/snark/SnarkManager.java:596 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:647 +#: ../java/src/org/klomp/snark/SnarkManager.java:651 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:651 +#: ../java/src/org/klomp/snark/SnarkManager.java:655 #, java-format msgid "I2CP options changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:657 +#: ../java/src/org/klomp/snark/SnarkManager.java:661 msgid "Disconnecting old I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:659 +#: ../java/src/org/klomp/snark/SnarkManager.java:663 #, java-format msgid "I2CP settings changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:664 +#: ../java/src/org/klomp/snark/SnarkManager.java:668 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:668 +#: ../java/src/org/klomp/snark/SnarkManager.java:672 msgid "Unable to reconnect with the old settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:670 +#: ../java/src/org/klomp/snark/SnarkManager.java:674 msgid "Reconnected on the new I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:677 +#: ../java/src/org/klomp/snark/SnarkManager.java:681 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:691 +#: ../java/src/org/klomp/snark/SnarkManager.java:695 msgid "New files will be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:693 +#: ../java/src/org/klomp/snark/SnarkManager.java:697 msgid "New files will not be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:700 +#: ../java/src/org/klomp/snark/SnarkManager.java:704 msgid "Enabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:702 +#: ../java/src/org/klomp/snark/SnarkManager.java:706 msgid "Disabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:708 +#: ../java/src/org/klomp/snark/SnarkManager.java:712 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:710 +#: ../java/src/org/klomp/snark/SnarkManager.java:714 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:717 +#: ../java/src/org/klomp/snark/SnarkManager.java:721 msgid "Enabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:719 +#: ../java/src/org/klomp/snark/SnarkManager.java:723 msgid "Disabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:721 +#: ../java/src/org/klomp/snark/SnarkManager.java:725 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:728 +#: ../java/src/org/klomp/snark/SnarkManager.java:732 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:738 +#: ../java/src/org/klomp/snark/SnarkManager.java:742 msgid "Configuration unchanged." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:770 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:780 +#: ../java/src/org/klomp/snark/SnarkManager.java:784 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:830 #, java-format msgid "Unable to save the config to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 msgid "Connecting to I2P" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:907 +#: ../java/src/org/klomp/snark/SnarkManager.java:911 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:916 -#: ../java/src/org/klomp/snark/SnarkManager.java:1692 +#: ../java/src/org/klomp/snark/SnarkManager.java:920 +#: ../java/src/org/klomp/snark/SnarkManager.java:1696 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:938 +#: ../java/src/org/klomp/snark/SnarkManager.java:942 #, java-format msgid "Cannot open \"{0}\"" msgstr "" #. TODO - if the existing one is a magnet, delete it and add the metainfo instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:957 -#: ../java/src/org/klomp/snark/SnarkManager.java:1058 -#: ../java/src/org/klomp/snark/SnarkManager.java:1140 +#: ../java/src/org/klomp/snark/SnarkManager.java:961 +#: ../java/src/org/klomp/snark/SnarkManager.java:1062 +#: ../java/src/org/klomp/snark/SnarkManager.java:1144 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:162 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:963 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:965 +#: ../java/src/org/klomp/snark/SnarkManager.java:969 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and " "DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:968 +#: ../java/src/org/klomp/snark/SnarkManager.java:972 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:970 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " "disabled, you should enable open trackers or DHT before starting the torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:992 +#: ../java/src/org/klomp/snark/SnarkManager.java:996 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:999 -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:186 +#: ../java/src/org/klomp/snark/SnarkManager.java:1003 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:189 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1011 +#: ../java/src/org/klomp/snark/SnarkManager.java:1015 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1013 +#: ../java/src/org/klomp/snark/SnarkManager.java:1017 #, java-format msgid "Torrent added: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1069 +#: ../java/src/org/klomp/snark/SnarkManager.java:1073 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:89 #, java-format msgid "Fetching {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1075 +#: ../java/src/org/klomp/snark/SnarkManager.java:1079 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " "succeed until you start another torrent, enable open trackers, or enable DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1079 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Adding {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1111 +#: ../java/src/org/klomp/snark/SnarkManager.java:1115 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1150 -#: ../java/src/org/klomp/snark/SnarkManager.java:1173 -#: ../java/src/org/klomp/snark/SnarkManager.java:1611 +#: ../java/src/org/klomp/snark/SnarkManager.java:1154 +#: ../java/src/org/klomp/snark/SnarkManager.java:1177 +#: ../java/src/org/klomp/snark/SnarkManager.java:1615 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1400 +#: ../java/src/org/klomp/snark/SnarkManager.java:1404 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1402 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1404 +#: ../java/src/org/klomp/snark/SnarkManager.java:1408 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1406 +#: ../java/src/org/klomp/snark/SnarkManager.java:1410 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1408 +#: ../java/src/org/klomp/snark/SnarkManager.java:1412 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1409 +#: ../java/src/org/klomp/snark/SnarkManager.java:1413 #, java-format msgid "Limit is {0}B" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1411 +#: ../java/src/org/klomp/snark/SnarkManager.java:1415 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1419 +#: ../java/src/org/klomp/snark/SnarkManager.java:1423 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1435 +#: ../java/src/org/klomp/snark/SnarkManager.java:1439 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1456 -#: ../java/src/org/klomp/snark/SnarkManager.java:1474 +#: ../java/src/org/klomp/snark/SnarkManager.java:1460 +#: ../java/src/org/klomp/snark/SnarkManager.java:1478 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1495 +#: ../java/src/org/klomp/snark/SnarkManager.java:1499 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1503 +#: ../java/src/org/klomp/snark/SnarkManager.java:1507 #, java-format msgid "Adding torrents in {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1534 +#: ../java/src/org/klomp/snark/SnarkManager.java:1538 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1556 +#: ../java/src/org/klomp/snark/SnarkManager.java:1560 #, java-format msgid "Download finished: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1607 +#: ../java/src/org/klomp/snark/SnarkManager.java:1611 #, java-format msgid "Metainfo received for {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1608 -#: ../java/src/org/klomp/snark/SnarkManager.java:1837 +#: ../java/src/org/klomp/snark/SnarkManager.java:1612 +#: ../java/src/org/klomp/snark/SnarkManager.java:1841 #, java-format msgid "Starting up torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1623 +#: ../java/src/org/klomp/snark/SnarkManager.java:1627 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1686 +#: ../java/src/org/klomp/snark/SnarkManager.java:1690 msgid "Unable to connect to I2P!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1836 +#: ../java/src/org/klomp/snark/SnarkManager.java:1840 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:126 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1860 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 msgid "Opening the I2P tunnel and starting all torrents." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1923 +#: ../java/src/org/klomp/snark/SnarkManager.java:1927 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1942 +#: ../java/src/org/klomp/snark/SnarkManager.java:1946 msgid "Closing I2P tunnel after notifying trackers." msgstr "" -#: ../java/src/org/klomp/snark/TrackerClient.java:234 +#: ../java/src/org/klomp/snark/TrackerClient.java:240 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "" @@ -438,801 +438,803 @@ msgstr "" msgid "Torrent already in the queue: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:184 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:187 #, java-format msgid "Torrent at {0} was not valid" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:247 -msgid "I2PSnark - Anonymous BitTorrent Client" -msgstr "" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:260 -msgid "Router is down" -msgstr "" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:277 -msgid "Torrents" -msgstr "" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:281 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:291 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:251 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:292 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:302 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2301 msgid "I2PSnark" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:287 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:256 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1840 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 +msgid "Configuration" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:258 +msgid "Anonymous BitTorrent Client" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:271 +msgid "Router is down" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288 +msgid "Torrents" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298 msgid "Refresh page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:295 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306 msgid "Forum" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:319 msgid "Click \"Add torrent\" button to fetch torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:345 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:357 msgid "clear messages" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:398 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:400 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2427 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2429 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:409 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2499 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2501 msgid "Status" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:411 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:413 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:422 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:424 msgid "Hide Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:423 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:436 msgid "Show Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:432 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:434 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2236 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2256 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:443 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2295 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2315 msgid "Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:442 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453 msgid "Estimated time remaining" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:445 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:456 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:450 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 msgid "Downloaded" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:464 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:458 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:469 msgid "Uploaded" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:472 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:478 msgid "Down Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:470 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:481 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:476 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:487 msgid "Up Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:479 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:505 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:507 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:519 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:524 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:521 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:533 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:559 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:554 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:579 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:604 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:626 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:626 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:661 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:650 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:661 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:671 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:660 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:671 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:744 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:755 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:785 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:814 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:796 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825 #, java-format msgid "Magnet deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:820 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:804 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:831 #, java-format msgid "Torrent file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:812 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837 #, java-format msgid "Data file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:828 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:839 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:850 #, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:861 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:933 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:946 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:957 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977 #, java-format msgid "Torrent created for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:979 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:981 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:974 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:988 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2018 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1019 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1008 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2019 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1019 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2079 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1025 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1036 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1054 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2017 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2022 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1065 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2077 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1077 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1088 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2021 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1093 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1096 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1206 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1216 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1217 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1209 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1210 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1219 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1224 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1241 msgid "Tracker Error" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1226 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1254 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1275 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1236 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1264 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1280 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1285 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1291 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1296 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1234 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1245 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1243 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1247 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2369 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2483 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2441 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2555 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1266 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1267 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1273 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1276 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283 msgid "OK" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1277 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1278 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1283 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1294 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1298 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1299 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1302 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1303 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1296 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1305 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1306 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1329 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1335 msgid "Torrent details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1358 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1371 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1360 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1402 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1415 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1404 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1417 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1416 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1429 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1418 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1431 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1430 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1443 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1435 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1448 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1438 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1451 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1450 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1455 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1468 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1458 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1471 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2048 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507 msgid "Unknown" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1542 msgid "Uninteresting (The peer has no pieces we need)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1566 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1607 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1666 #, java-format msgid "Details at {0} tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1624 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1683 msgid "Info" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1735 msgid "Add Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1737 msgid "From URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1740 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or " "info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1745 msgid "Add torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1688 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1748 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1690 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 msgid "Removing a .torrent will cause it to stop." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1773 msgid "Create Torrent" msgstr "" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1776 msgid "Data to seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1720 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780 msgid "File or directory to seed (must be within the specified path)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1782 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2026 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1724 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1784 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1786 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1729 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1789 msgid "Create torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1807 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2033 -msgid "Configuration" -msgstr "" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1784 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1844 msgid "Data directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1788 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1848 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1792 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1852 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1796 -msgid "Auto start" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1856 +msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1800 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1860 msgid "If checked, automatically start torrents that are added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1804 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1864 msgid "Theme" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1817 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1877 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1830 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1890 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896 msgid "Startup delay" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1898 msgid "minutes" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1842 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1902 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1844 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1904 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1868 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1928 msgid "Total uploader limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1871 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1931 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1875 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1935 msgid "Up bandwidth limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1878 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1938 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1880 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1940 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1884 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1944 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1888 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1948 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed " "in the torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1892 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1952 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1896 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1956 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1912 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1972 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1918 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1978 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1926 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1986 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1931 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1991 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1946 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2006 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1951 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2011 msgid "Save configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2033 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1975 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2517 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2590 msgid "Open" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1977 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1979 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2039 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2009 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2069 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2109 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2057 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2117 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2058 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2118 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2265 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2324 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2278 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2341 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2287 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2311 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2320 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2383 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2340 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2347 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2419 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2357 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2421 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2423 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2429 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2495 msgid "Size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2446 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2381 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2453 msgid "Files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2386 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2458 msgid "Pieces" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2390 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2462 msgid "Piece size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2413 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2417 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2485 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2489 msgid "Directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2506 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2508 msgid "Priority" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2442 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2514 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2544 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2480 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2552 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2565 msgid "complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2494 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2616 msgid "High" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2621 msgid "Normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2553 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2626 msgid "Skip" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2562 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2635 msgid "Save priorities" msgstr "" diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po index 40c42d73cb..c4cd9702e9 100644 --- a/apps/i2psnark/locale/messages_ru.po +++ b/apps/i2psnark/locale/messages_ru.po @@ -4,22 +4,23 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# IOException , 2013 +# Aleksey Orekhov , 2013 # mama__1 , 2013 # ducki2p , 2011 -# varnav, 2013 +# Eugene, 2013 # foo , 2009 # mama__1 , 2013 -# Роман Азаренко , 2013 +# Roman A. , 2013 # sr4d , 2014 -# Роман Азаренко , 2013 +# Roman A. , 2013 +# yume, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-09 19:27+0000\n" -"PO-Revision-Date: 2014-01-11 08:49+0000\n" -"Last-Translator: sr4d \n" +"PO-Revision-Date: 2014-07-19 18:13+0000\n" +"Last-Translator: yume\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -824,7 +825,7 @@ msgstr "Простаивает" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 msgid "No Peers" -msgstr "Нет Пиров" +msgstr "Нет пиров" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1296 diff --git a/apps/i2psnark/web.xml b/apps/i2psnark/web.xml index 2925ff00e3..68e6abd641 100644 --- a/apps/i2psnark/web.xml +++ b/apps/i2psnark/web.xml @@ -4,6 +4,15 @@ "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + org.klomp.snark.web.I2PSnarkServlet org.klomp.snark.web.I2PSnarkServlet diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index 019e1faaa3..0597db5f19 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -17,6 +17,7 @@ import java.util.TreeMap; import net.i2p.client.I2PClient; import net.i2p.crypto.SigType; import net.i2p.data.Base64; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.PrivateKeyFile; import net.i2p.data.Signature; @@ -57,7 +58,7 @@ public class EditBean extends IndexBean { public String getTargetHost(int tunnel) { TunnelController tun = getController(tunnel); if (tun != null && tun.getTargetHost() != null) - return tun.getTargetHost(); + return DataHelper.escapeHTML(tun.getTargetHost()); else return "127.0.0.1"; } @@ -65,7 +66,7 @@ public class EditBean extends IndexBean { public String getTargetPort(int tunnel) { TunnelController tun = getController(tunnel); if (tun != null && tun.getTargetPort() != null) - return tun.getTargetPort(); + return DataHelper.escapeHTML(tun.getTargetPort()); else return ""; } @@ -73,7 +74,7 @@ public class EditBean extends IndexBean { public String getSpoofedHost(int tunnel) { TunnelController tun = getController(tunnel); if (tun != null && tun.getSpoofedHost() != null) - return tun.getSpoofedHost(); + return DataHelper.escapeHTML(tun.getSpoofedHost()); else return ""; } @@ -294,44 +295,44 @@ public class EditBean extends IndexBean { } /** all of these are @since 0.8.3 */ - public String getLimitMinute(int tunnel) { - return getProperty(tunnel, PROP_MAX_CONNS_MIN, "0"); + public int getLimitMinute(int tunnel) { + return getProperty(tunnel, PROP_MAX_CONNS_MIN, 0); } - public String getLimitHour(int tunnel) { - return getProperty(tunnel, PROP_MAX_CONNS_HOUR, "0"); + public int getLimitHour(int tunnel) { + return getProperty(tunnel, PROP_MAX_CONNS_HOUR, 0); } - public String getLimitDay(int tunnel) { - return getProperty(tunnel, PROP_MAX_CONNS_DAY, "0"); + public int getLimitDay(int tunnel) { + return getProperty(tunnel, PROP_MAX_CONNS_DAY, 0); } - public String getTotalMinute(int tunnel) { - return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_MIN, "0"); + public int getTotalMinute(int tunnel) { + return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_MIN, 0); } - public String getTotalHour(int tunnel) { - return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_HOUR, "0"); + public int getTotalHour(int tunnel) { + return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_HOUR, 0); } - public String getTotalDay(int tunnel) { - return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_DAY, "0"); + public int getTotalDay(int tunnel) { + return getProperty(tunnel, PROP_MAX_TOTAL_CONNS_DAY, 0); } - public String getMaxStreams(int tunnel) { - return getProperty(tunnel, PROP_MAX_STREAMS, "0"); + public int getMaxStreams(int tunnel) { + return getProperty(tunnel, PROP_MAX_STREAMS, 0); } /** * POST limits * @since 0.9.9 */ - public String getPostMax(int tunnel) { - return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, "0"); + public int getPostMax(int tunnel) { + return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_MAX, 0); } - public String getPostTotalMax(int tunnel) { - return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, "0"); + public int getPostTotalMax(int tunnel) { + return getProperty(tunnel, I2PTunnelHTTPServer.OPT_POST_TOTAL_MAX, 0); } public int getPostCheckTime(int tunnel) { @@ -370,8 +371,11 @@ public class EditBean extends IndexBean { TunnelController tun = getController(tunnel); if (tun != null) { Properties opts = getOptions(tun); - if (opts != null) - return opts.getProperty(prop, def); + if (opts != null) { + String rv = opts.getProperty(prop); + if (rv != null) + return DataHelper.escapeHTML(rv); + } } return def; } @@ -452,7 +456,7 @@ public class EditBean extends IndexBean { space = true; buf.append(e.getKey()).append('=').append(e.getValue()); } - return buf.toString(); + return DataHelper.escapeHTML(buf.toString()); } else { return ""; } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index fc5ca687b7..06558d78e5 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -728,7 +728,7 @@ public class IndexBean { _tunnelBackupQuantity = (tunnelBackupQuantity != null ? tunnelBackupQuantity.trim() : null); } /** what I2P session overrides should be used */ - public void setCustomOptions(String customOptions) { + public void setNofilter_customOptions(String customOptions) { _customOptions = (customOptions != null ? customOptions.trim() : null); } /** what HTTP outproxies should be used (httpclient specific) */ @@ -927,7 +927,7 @@ public class IndexBean { _newProxyUser = s.trim(); } - public void setProxyPassword(String s) { + public void setNofilter_proxyPassword(String s) { if (s != null) _newProxyPW = s.trim(); } @@ -941,7 +941,7 @@ public class IndexBean { _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, s.trim()); } - public void setOutproxyPassword(String s) { + public void setNofilter_outproxyPassword(String s) { if (s != null) _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, s.trim()); } diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp index c61d4de71b..08b07c7a59 100644 --- a/apps/i2ptunnel/jsp/edit.jsp +++ b/apps/i2ptunnel/jsp/edit.jsp @@ -2,6 +2,8 @@ // NOTE: Do the header carefully so there is no whitespace before the <%@page pageEncoding="UTF-8" %><%@page trimDirectiveWhitespaces="true" diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index 46d6090e12..cbfc8b7130 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -52,10 +52,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>

<%=intl._("Edit proxy settings")%>

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); - tunnelType = request.getParameter("type"); + tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); %>

<%=intl._("New proxy settings")%>

<% } %> - " /> + @@ -546,7 +546,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } - +
@@ -570,7 +570,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } - +
@@ -593,7 +593,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } - +
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 49ccf20bdd..6ceacc787d 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -52,10 +52,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>

<%=intl._("Edit server settings")%>

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); - tunnelType = request.getParameter("type"); + tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); %>

<%=intl._("New server settings")%>

<% } %> - " /> + @@ -617,7 +617,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } - +
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 5f7140a21d..f1117a272a 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -6,6 +6,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %><%@page pageEncoding="UTF-8" %><%@page trimDirectiveWhitespaces="true" diff --git a/apps/i2ptunnel/jsp/web.xml b/apps/i2ptunnel/jsp/web.xml index d8d51c8239..1fd11c13d8 100644 --- a/apps/i2ptunnel/jsp/web.xml +++ b/apps/i2ptunnel/jsp/web.xml @@ -4,6 +4,15 @@ "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index 52ae0336b0..0749bb54ab 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -6,6 +6,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %><%@page pageEncoding="UTF-8" %><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean" @@ -39,6 +41,7 @@ /* Fetch and format a couple of regularly-used values */ boolean tunnelIsClient = Boolean.valueOf(request.getParameter("isClient")); String tunnelType = request.getParameter("type"); + tunnelType = net.i2p.data.DataHelper.stripHTML(tunnelType); /* Special case - don't display page 4 for server tunnels */ if (curPage == 4 && !tunnelIsClient) { if ("Previous page".equals(request.getParameter("action"))) { @@ -224,17 +227,17 @@ - " class="freetext" /> + " class="freetext" />
- " class="freetext" /> + " class="freetext" />
<% } else { - %>" /> - " /><% + %>" /> + " /><% } /* curPage 3 */ /* End page 3 */ %> @@ -252,10 +255,10 @@ - " class="freetext" /> + " class="freetext" /> <% } else { - %>" /><% + %>" /><% } /* curPage 4 */ } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) { if (curPage == 4) { @@ -267,7 +270,7 @@ - " class="freetext" /> + " class="freetext" /> (<%=intl._("name, name:port, or destination")%> <% if ("streamrclient".equals(tunnelType)) { /* deferred resolution unimplemented in streamr client */ %> - <%=intl._("b32 not recommended")%> @@ -275,7 +278,7 @@ <% } else { - %>" /><% + %>" /><% } /* curPage 4 */ } } /* tunnelIsClient */ @@ -294,10 +297,10 @@ - " class="freetext" /> + " class="freetext" /> <% } else { - %>" /><% + %>" /><% } /* curPage 5 */ } /* streamrclient or !streamrserver */ %> <% @@ -310,10 +313,10 @@ - " class="freetext" /> + " class="freetext" /> <% } else { - %>" /><% + %>" /><% } /* curPage 5 */ } /* !tunnelIsClient */ %> <% @@ -327,10 +330,10 @@ - " class="freetext" /> + " class="freetext" /> <% } else { - %>" /><% + %>" /><% } /* curPage 5 */ } /* tunnelIsClient or httpbidirserver */ %> <% @@ -366,7 +369,7 @@ <% } else { - %>" /><% + %>" /><% } /* curPage 5 */ } /* (tunnelIsClient && !streamrclient) || httpbidirserver || streamrserver */ @@ -388,7 +391,7 @@ <% } else { if ("1".equals(request.getParameter("startOnLoad"))) { - %>" /><% + %>" /><% } } /* curPage 6 */ @@ -436,30 +439,30 @@ } %>
<%=intl._("Tunnel name and description")%> - <%=request.getParameter("name")%>
- <%=request.getParameter("description")%> + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("name"))%>
+ <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("description"))%>
<%=intl._("Tunnel destination")%><% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %> - <%=request.getParameter("proxyList")%><% + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("proxyList"))%><% } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) { %> - <%=request.getParameter("targetDestination")%><% + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetDestination"))%><% } %>
<%=intl._("Binding address and port")%><% if ((tunnelIsClient && "streamrclient".equals(tunnelType)) || (!tunnelIsClient && !"streamrserver".equals(tunnelType))) { %> - <%=request.getParameter("targetHost")%>
<% + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost"))%>
<% } if (!tunnelIsClient) { %> - <%=request.getParameter("targetPort")%>
<% + <%=net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort"))%>
<% } if (tunnelIsClient || "httpbidirserver".equals(tunnelType)) { %> -
<%=request.getParameter("port")%><% +
<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("port"))%><% } if ((tunnelIsClient && !"streamrclient".equals(tunnelType)) || "httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { %> -
<%=request.getParameter("reachableBy")%><% +
<%=net.i2p.data.DataHelper.stripHTML(request.getParameter("reachableBy"))%><% } %>
<%=intl._("Tunnel auto-start")%><% diff --git a/apps/i2ptunnel/locale-proxy/messages_en.po b/apps/i2ptunnel/locale-proxy/messages_en.po index d3a4fa3eb3..47ea523c03 100644 --- a/apps/i2ptunnel/locale-proxy/messages_en.po +++ b/apps/i2ptunnel/locale-proxy/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2ptunnel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,343 +18,369 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11 -msgid "Warning: Outproxy Not Found" +#: ../java/build/Proxy.java:5 +msgid "Information: New Host Name" msgstr "" #: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18 -#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:40 -#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:61 -#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78 -#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:104 -#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:126 +#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38 +#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57 +#: ../java/build/Proxy.java:66 ../java/build/Proxy.java:75 +#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:98 +#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:121 +#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:142 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:204 msgid "Router Console" msgstr "" #: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19 -#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:41 -#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:62 -#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79 -#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:105 -#: ../java/build/Proxy.java:117 ../java/build/Proxy.java:127 +#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39 +#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58 +#: ../java/build/Proxy.java:67 ../java/build/Proxy.java:76 +#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:99 +#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:122 +#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:143 msgid "I2P Router Console" msgstr "" #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20 -#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:42 -#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:63 -#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:80 -#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:106 -#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:128 +#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40 +#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59 +#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:77 +#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:100 +#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:123 +#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:144 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205 msgid "Configuration" msgstr "" #: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21 -#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:43 -#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:64 -#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:81 -#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:107 -#: ../java/build/Proxy.java:119 ../java/build/Proxy.java:129 +#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41 +#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60 +#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78 +#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:101 +#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:124 +#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:145 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205 msgid "Help" msgstr "" #: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22 -#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:44 -#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:65 -#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:82 -#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:108 -#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:130 +#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42 +#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61 +#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79 +#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:102 +#: ../java/build/Proxy.java:112 ../java/build/Proxy.java:125 +#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:146 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:205 msgid "Addressbook" msgstr "" +#: ../java/build/Proxy.java:11 +msgid "Information: New Host Name with Address Helper" +msgstr "" + #: ../java/build/Proxy.java:12 -msgid "The HTTP Outproxy was not found." +msgid "" +"The address helper link you followed is for a new host name that is not in " +"your address book." msgstr "" #: ../java/build/Proxy.java:13 -msgid "" -"It is offline, there is network congestion, or your router is not yet well-" -"integrated with peers." +msgid "You may save this host name to your local address book." msgstr "" #: ../java/build/Proxy.java:14 -#, java-format msgid "" -"You may want to {0}retry{1} as this will randomly reselect an outproxy from " -"the pool you have defined {2}here{3} (if you have more than one configured)." +"If you save it to your address book, you will not see this message again." msgstr "" #: ../java/build/Proxy.java:15 -#, java-format msgid "" -"If you continue to have trouble you may want to edit your outproxy list {0}" -"here{1}." +"If you do not save it, the host name will be forgotten after the next router " +"restart." msgstr "" -#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:38 -#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:102 -msgid "Could not find the following destination:" -msgstr "" - -#: ../java/build/Proxy.java:17 -msgid "Error: Request Denied" -msgstr "" - -#: ../java/build/Proxy.java:23 -msgid "Error: Local Access" -msgstr "" - -#: ../java/build/Proxy.java:24 -msgid "Your browser is misconfigured." -msgstr "" - -#: ../java/build/Proxy.java:25 +#: ../java/build/Proxy.java:16 msgid "" -"Do not use the proxy to access the router console, localhost, or local LAN " -"destinations." +"If you do not wish to visit this host, click the \"back\" button on your " +"browser." msgstr "" -#: ../java/build/Proxy.java:26 -msgid "Warning: Eepsite Unknown" -msgstr "" - -#: ../java/build/Proxy.java:32 -msgid "Warning: Eepsite Not Found in Addressbook" -msgstr "" - -#: ../java/build/Proxy.java:33 -msgid "The eepsite was not found in your router's addressbook." -msgstr "" - -#: ../java/build/Proxy.java:34 -msgid "Check the link or find a Base 32 or Base 64 address." -msgstr "" - -#: ../java/build/Proxy.java:35 -#, java-format -msgid "If you have the Base 64 address, {0}add it to your addressbook{1}." -msgstr "" - -#: ../java/build/Proxy.java:36 -msgid "" -"Otherwise, find a Base 32 or address helper link, or use a jump service link " -"below." -msgstr "" - -#: ../java/build/Proxy.java:37 -#, java-format -msgid "" -"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some " -"subscriptions{3} to your addressbook." -msgstr "" - -#: ../java/build/Proxy.java:39 ../java/build/Proxy.java:45 -msgid "Warning: Invalid Request URI" -msgstr "" - -#: ../java/build/Proxy.java:46 -msgid "The request URI is invalid, and probably contains illegal characters." -msgstr "" - -#: ../java/build/Proxy.java:47 -msgid "" -"If you clicked a link, check the end of the URI for any characters the " -"browser has mistakenly added on." -msgstr "" - -#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:54 -msgid "Warning: Invalid Destination" -msgstr "" - -#: ../java/build/Proxy.java:55 -msgid "" -"The eepsite destination specified was not valid, or was otherwise " -"unreachable." -msgstr "" - -#: ../java/build/Proxy.java:56 -msgid "" -"Perhaps you pasted in the wrong Base 64 string or the link you are following " -"is bad." -msgstr "" - -#: ../java/build/Proxy.java:57 -msgid "The I2P host could also be offline." -msgstr "" - -#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:101 -#, java-format -msgid "You may want to {0}retry{1}." -msgstr "" - -#: ../java/build/Proxy.java:60 ../java/build/Proxy.java:66 -msgid "Warning: Request Denied" -msgstr "" - -#: ../java/build/Proxy.java:67 -msgid "You attempted to connect to a non-I2P website or location." -msgstr "" - -#: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74 -msgid "Warning: No Outproxy Configured" -msgstr "" - -#: ../java/build/Proxy.java:75 -msgid "" -"Your request was for a site outside of I2P, but you have no HTTP outproxy " -"configured." -msgstr "" - -#: ../java/build/Proxy.java:76 -msgid "Please configure an outproxy in I2PTunnel." -msgstr "" - -#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:83 +#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23 msgid "Warning: Destination Key Conflict" msgstr "" -#: ../java/build/Proxy.java:84 +#: ../java/build/Proxy.java:24 msgid "" "The addresshelper link you followed specifies a different destination key " "than a host entry in your host database." msgstr "" -#: ../java/build/Proxy.java:85 +#: ../java/build/Proxy.java:25 msgid "" "Someone could be trying to impersonate another eepsite, or people have given " "two eepsites identical names." msgstr "" -#: ../java/build/Proxy.java:86 +#: ../java/build/Proxy.java:26 msgid "" "You can resolve the conflict by considering which key you trust, and either " "discarding the addresshelper link, discarding the host entry from your host " "database, or naming one of them differently." msgstr "" -#: ../java/build/Proxy.java:87 +#: ../java/build/Proxy.java:27 ../java/build/Proxy.java:33 +msgid "Warning: Bad Address Helper" +msgstr "" + +#: ../java/build/Proxy.java:34 +#, java-format +msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable." +msgstr "" + +#: ../java/build/Proxy.java:35 +msgid "It seems to be garbage data, or a mistyped Base 32 address." +msgstr "" + +#: ../java/build/Proxy.java:36 +msgid "" +"Check your URL to try and fix the helper key to be a valid Base 32 hostname " +"or Base 64 key." +msgstr "" + +#: ../java/build/Proxy.java:37 ../java/build/Proxy.java:43 +msgid "Warning: Request Denied" +msgstr "" + +#: ../java/build/Proxy.java:44 +msgid "You attempted to connect to a non-I2P website or location." +msgstr "" + +#: ../java/build/Proxy.java:45 ../java/build/Proxy.java:51 +#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:80 +msgid "Warning: Eepsite Unreachable" +msgstr "" + +#: ../java/build/Proxy.java:52 +msgid "The eepsite was not reachable, because its lease set was not found." +msgstr "" + +#: ../java/build/Proxy.java:53 +msgid "The eepsite is probably down." +msgstr "" + +#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:83 +#: ../java/build/Proxy.java:95 +#, java-format +msgid "You may want to {0}retry{1}." +msgstr "" + +#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:84 +#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:119 +#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:152 +msgid "Could not find the following destination:" +msgstr "" + +#: ../java/build/Proxy.java:56 +msgid "Error: Request Denied" +msgstr "" + +#: ../java/build/Proxy.java:62 +msgid "Error: Local Access" +msgstr "" + +#: ../java/build/Proxy.java:63 +msgid "Your browser is misconfigured." +msgstr "" + +#: ../java/build/Proxy.java:64 +msgid "" +"Do not use the proxy to access the router console, localhost, or local LAN " +"destinations." +msgstr "" + +#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:71 +msgid "Warning: No Outproxy Configured" +msgstr "" + +#: ../java/build/Proxy.java:72 +msgid "" +"Your request was for a site outside of I2P, but you have no HTTP outproxy " +"configured." +msgstr "" + +#: ../java/build/Proxy.java:73 +msgid "Please configure an outproxy in I2PTunnel." +msgstr "" + +#: ../java/build/Proxy.java:81 +msgid "The eepsite was not reachable." +msgstr "" + +#: ../java/build/Proxy.java:82 +msgid "" +"The eepsite is offline, there is network congestion, or your router is not " +"yet well-integrated with peers." +msgstr "" + +#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91 +msgid "Warning: Invalid Destination" +msgstr "" + +#: ../java/build/Proxy.java:92 +msgid "" +"The eepsite destination specified was not valid, or was otherwise " +"unreachable." +msgstr "" + +#: ../java/build/Proxy.java:93 +msgid "" +"Perhaps you pasted in the wrong Base 64 string or the link you are following " +"is bad." +msgstr "" + +#: ../java/build/Proxy.java:94 +msgid "The I2P host could also be offline." +msgstr "" + +#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:103 +msgid "Warning: Non-HTTP Protocol" +msgstr "" + +#: ../java/build/Proxy.java:104 +msgid "The request uses a bad protocol." +msgstr "" + +#: ../java/build/Proxy.java:105 +msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only." +msgstr "" + +#: ../java/build/Proxy.java:106 +msgid "Other protocols such as FTP are not allowed." +msgstr "" + +#: ../java/build/Proxy.java:107 +msgid "Warning: Eepsite Unknown" +msgstr "" + +#: ../java/build/Proxy.java:113 +msgid "Warning: Eepsite Not Found in Addressbook" +msgstr "" + +#: ../java/build/Proxy.java:114 +msgid "The eepsite was not found in your router's addressbook." +msgstr "" + +#: ../java/build/Proxy.java:115 +msgid "Check the link or find a Base 32 or Base 64 address." +msgstr "" + +#: ../java/build/Proxy.java:116 +#, java-format +msgid "If you have the Base 64 address, {0}add it to your addressbook{1}." +msgstr "" + +#: ../java/build/Proxy.java:117 +msgid "" +"Otherwise, find a Base 32 or address helper link, or use a jump service link " +"below." +msgstr "" + +#: ../java/build/Proxy.java:118 +#, java-format +msgid "" +"Seeing this page often? See {0}the FAQ{1} for help in {2}adding some " +"subscriptions{3} to your addressbook." +msgstr "" + +#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:126 +msgid "Warning: Invalid Request URI" +msgstr "" + +#: ../java/build/Proxy.java:127 +msgid "The request URI is invalid, and probably contains illegal characters." +msgstr "" + +#: ../java/build/Proxy.java:128 +msgid "" +"If you clicked a link, check the end of the URI for any characters the " +"browser has mistakenly added on." +msgstr "" + +#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:135 +#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:147 +msgid "Warning: Outproxy Not Found" +msgstr "" + +#: ../java/build/Proxy.java:136 +msgid "" +"The HTTP outproxy was not reachable, because its lease set was not found." +msgstr "" + +#: ../java/build/Proxy.java:137 +msgid "The outproxy is probably down." +msgstr "" + +#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:150 +#, java-format +msgid "" +"You may want to {0}retry{1} as this will randomly reselect an outproxy from " +"the pool you have defined {2}here{3} (if you have more than one configured)." +msgstr "" + +#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:151 +#, java-format +msgid "" +"If you continue to have trouble you may want to edit your outproxy list {0}" +"here{1}." +msgstr "" + +#: ../java/build/Proxy.java:148 +msgid "The HTTP Outproxy was not found." +msgstr "" + +#: ../java/build/Proxy.java:149 +msgid "" +"It is offline, there is network congestion, or your router is not yet well-" +"integrated with peers." +msgstr "" + +#: ../java/build/Proxy.java:153 msgid "Proxy Authorization Required" msgstr "" -#: ../java/build/Proxy.java:88 +#: ../java/build/Proxy.java:154 msgid "I2P HTTP Proxy Authorization Required" msgstr "" -#: ../java/build/Proxy.java:89 +#: ../java/build/Proxy.java:155 msgid "This proxy is configured to require a username and password for access." msgstr "" -#: ../java/build/Proxy.java:90 +#: ../java/build/Proxy.java:156 #, java-format msgid "" "Please enter your username and password, or check your {0}router " "configuration{1} or {2}I2PTunnel configuration{3}." msgstr "" -#: ../java/build/Proxy.java:91 +#: ../java/build/Proxy.java:157 #, java-format msgid "" "To disable authorization, remove the configuration {0}i2ptunnel.proxy." "auth=basic{1}, then stop and restart the HTTP Proxy tunnel." msgstr "" -#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:98 -msgid "Warning: Eepsite Unreachable" -msgstr "" - -#: ../java/build/Proxy.java:99 -msgid "The eepsite was not reachable." -msgstr "" - -#: ../java/build/Proxy.java:100 -msgid "" -"The eepsite is offline, there is network congestion, or your router is not " -"yet well-integrated with peers." -msgstr "" - -#: ../java/build/Proxy.java:103 -msgid "Information: New Host Name" -msgstr "" - -#: ../java/build/Proxy.java:109 -msgid "Information: New Host Name with Address Helper" -msgstr "" - -#: ../java/build/Proxy.java:110 -msgid "" -"The address helper link you followed is for a new host name that is not in " -"your address book." -msgstr "" - -#: ../java/build/Proxy.java:111 -msgid "You may save this host name to your local address book." -msgstr "" - -#: ../java/build/Proxy.java:112 -msgid "" -"If you save it to your address book, you will not see this message again." -msgstr "" - -#: ../java/build/Proxy.java:113 -msgid "" -"If you do not save it, the host name will be forgotten after the next router " -"restart." -msgstr "" - -#: ../java/build/Proxy.java:114 -msgid "" -"If you do not wish to visit this host, click the \"back\" button on your " -"browser." -msgstr "" - -#: ../java/build/Proxy.java:115 ../java/build/Proxy.java:121 -msgid "Warning: Bad Address Helper" -msgstr "" - -#: ../java/build/Proxy.java:122 -#, java-format -msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable." -msgstr "" - -#: ../java/build/Proxy.java:123 -msgid "It seems to be garbage data, or a mistyped Base 32 address." -msgstr "" - -#: ../java/build/Proxy.java:124 -msgid "" -"Check your URL to try and fix the helper key to be a valid Base 32 hostname " -"or Base 64 key." -msgstr "" - -#: ../java/build/Proxy.java:125 ../java/build/Proxy.java:131 -msgid "Warning: Non-HTTP Protocol" -msgstr "" - -#: ../java/build/Proxy.java:132 -msgid "The request uses a bad protocol." -msgstr "" - -#: ../java/build/Proxy.java:133 -msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only." -msgstr "" - -#: ../java/build/Proxy.java:134 -msgid "Other protocols such as FTP are not allowed." -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601 msgid "This seems to be a bad destination:" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:595 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:601 msgid "i2paddresshelper cannot help you with a destination like that!" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:662 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:667 #, java-format msgid "" "To visit the destination in your host database, click herehere." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1151 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1034 +msgid "Destination lease set not found" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1162 msgid "Host" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1155 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1166 msgid "Base 32" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1159 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1165 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1176 #, java-format msgid "Continue to {0} without saving" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1170 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1181 #, java-format msgid "Save {0} to router address book and continue to eepsite" msgstr "" #. only blockfile supports multiple books -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1173 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1184 #, java-format msgid "Save {0} to master address book and continue to eepsite" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1174 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1185 #, java-format msgid "Save {0} to private address book and continue to eepsite" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1290 -msgid "HTTP Outproxy" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1326 -msgid "" -"Click a link below to look for an address helper by using a \"jump\" service:" -msgstr "" - -#. Translators: parameter is a host name -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1334 -#, java-format -msgid "{0} jump service" -msgstr "" - #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:162 #, java-format msgid "Added via address helper from {0}" diff --git a/apps/i2ptunnel/locale-proxy/messages_it.po b/apps/i2ptunnel/locale-proxy/messages_it.po index 505d2b9b41..042b2e194f 100644 --- a/apps/i2ptunnel/locale-proxy/messages_it.po +++ b/apps/i2ptunnel/locale-proxy/messages_it.po @@ -4,19 +4,20 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# BadCluster , 2012 +# Bad Cluster , 2012 # Leelium , 2012 # , 2012 -# giuseppep , 2014 +# Giuseppe Pignataro , 2014 # mkkid , 2011 -# Tony Goodyear , 2012 +# spawned76 , 2012 +# Tummarellox , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-04-21 22:54+0000\n" -"Last-Translator: giuseppep \n" +"PO-Revision-Date: 2014-07-06 10:16+0000\n" +"Last-Translator: Tummarellox \n" "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -207,7 +208,7 @@ msgstr "" #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74 msgid "Warning: No Outproxy Configured" -msgstr "" +msgstr "Attenzione: Nessun Proxy di uscita configurato" #: ../java/build/Proxy.java:75 msgid "" @@ -253,7 +254,7 @@ msgstr "Autorizzazione Outproxy" #: ../java/build/Proxy.java:89 msgid "" "This proxy is configured to require a username and password for access." -msgstr "" +msgstr "Questo proxy necessita username e password per l'accesso" #: ../java/build/Proxy.java:90 #, java-format diff --git a/apps/i2ptunnel/locale/messages_de.po b/apps/i2ptunnel/locale/messages_de.po index 0b93304a92..93afa11bc9 100644 --- a/apps/i2ptunnel/locale/messages_de.po +++ b/apps/i2ptunnel/locale/messages_de.po @@ -5,13 +5,14 @@ # # Translators: # blabla, 2011 +# blabla , 2014 # blabla , 2011-2012 # D.A. Loader, 2012 # driz , 2012 # ducki2p , 2011 # Ettore Atalan , 2014 # foo , 2009 -# echeloni2p , 2014 +# Lars Schimmer , 2014 # mixxy, 2011 # nextloop , 2013 # pirr , 2012 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-05-08 11:41+0000\n" -"Last-Translator: echeloni2p \n" +"PO-Revision-Date: 2014-05-21 18:11+0000\n" +"Last-Translator: blabla \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,8 +40,8 @@ msgstr "intern" #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" -msgstr[0] "{0} eingehendes, {0} ausgehendes Tunnel" -msgstr[1] "{0} eingehende, {0} ausgehende Tunnels" +msgstr[0] "{0} eingehender, {0} ausgehender Tunnel" +msgstr[1] "{0} eingehende, {0} ausgehende Tunnel" #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 msgid "lower bandwidth and reliability" @@ -56,7 +57,7 @@ msgstr "hohe Bandbreite und Zuverlässlichkeit" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 msgid "Tunnels are not initialized yet, please reload in two minutes." -msgstr "Tunnel sind noch nicht initialisiert. Bitte aktualisiere die Seite in zwei Minuten." +msgstr "Die Tunnel sind noch nicht initialisiert. Bitte aktualisiere die Seite in zwei Minuten." #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 msgid "" @@ -493,7 +494,7 @@ msgstr "deaktiviert" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453 msgid "Delay tunnel open until required" -msgstr "Aufbau des Tunnela verzögern, bis dieser benötigt wird" +msgstr "Aufbau des Tunnels verzögern, bis dieser benötigt wird" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 msgid "Persistent private key" @@ -890,13 +891,13 @@ msgstr "Wizard abgeschlossen" msgid "" "This wizard will take you through the various options available for creating" " tunnels in I2P." -msgstr "Dieser Assisten wird durch die unterschiedlichen Optionen führen die zur Erstellung von I2P Tunneln verfügbar sind." +msgstr "Dieser Assistent wird durch die unterschiedlichen Optionen führen, die zur Erstellung von I2P Tunneln verfügbar stehen." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191 msgid "" "The first thing to decide is whether you want to create a server or a client" " tunnel." -msgstr "Das erste zu entscheiden ist, ob es ein Server oder Client Tunnel werden soll." +msgstr "Die erste Frage ist, ob ein Server- oder Kliententunnel gewünscht ist." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193 msgid "" @@ -920,7 +921,7 @@ msgstr "Client Tunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217 msgid "There are several types of tunnels to choose from:" -msgstr "Es gibt mehrere unterschiedliche Typen von Tunneln aus denen gewählt werden kann:" +msgstr "Es gibt mehrere unterschiedliche Typen von Tunneln, aus denen gewählt werden kann:" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225 msgid "Basic tunnel for connecting to a single service inside I2P." @@ -1076,7 +1077,7 @@ msgstr "Trenne mehrere Proxies mit Kommas." msgid "" "Type in the I2P destination of the service that this client tunnel should " "connect to." -msgstr "Gib das Ziel des I2P Dienstes ein zu dem dieser Tunnel verbinden soll." +msgstr "Gib das Ziel des I2P-Dienstes ein zu dem dieser Tunnel verbinden soll." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376 msgid "" diff --git a/apps/i2ptunnel/locale/messages_en.po b/apps/i2ptunnel/locale/messages_en.po index 6282ceb518..7fb394c66b 100644 --- a/apps/i2ptunnel/locale/messages_en.po +++ b/apps/i2ptunnel/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2ptunnel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,141 +18,145 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:407 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:417 msgid "internal" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:493 #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:497 msgid "lower bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:499 msgid "standard bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:501 msgid "higher bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:124 msgid "Tunnels are not initialized yet, please reload in two minutes." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:197 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " "button on your browser. Please resubmit." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:199 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:245 msgid "Configuration reloaded for all tunnels" msgstr "" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:258 msgid "Starting tunnel" msgstr "" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:271 msgid "Stopping tunnel" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:337 msgid "Configuration changes saved" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:340 msgid "Failed to save configuration" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:462 msgid "New Tunnel" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:485 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:505 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:623 msgid "Port not set" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:488 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:625 msgid "Invalid port" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:491 msgid "Warning - ports less than 1024 are not recommended" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 -msgid "Standard client" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 -msgid "HTTP/HTTPS client" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 -msgid "IRC client" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 -msgid "Standard server" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 -msgid "HTTP server" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 -msgid "SOCKS 4/4a/5 proxy" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 -msgid "SOCKS IRC proxy" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 -msgid "CONNECT/SSL/HTTPS proxy" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 -msgid "IRC server" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 -msgid "Streamr client" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516 -msgid "Streamr server" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:500 +msgid "Warning - duplicate port" msgstr "" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517 +msgid "Standard client" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:518 +msgid "HTTP/HTTPS client" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:519 +msgid "IRC client" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:520 +msgid "Standard server" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:521 +msgid "HTTP server" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:522 +msgid "SOCKS 4/4a/5 proxy" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:523 +msgid "SOCKS IRC proxy" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:524 +msgid "CONNECT/SSL/HTTPS proxy" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:525 +msgid "IRC server" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:526 +msgid "Streamr client" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:527 +msgid "Streamr server" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:528 msgid "HTTP bidir" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:617 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313 msgid "Host not set" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:619 msgid "Invalid address" msgstr "" @@ -276,7 +280,7 @@ msgid "Enable DCC" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:272 msgid "Advanced networking options" msgstr "" @@ -287,125 +291,125 @@ msgid "" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:274 msgid "Tunnel Options" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276 msgid "Length" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:283 msgid "0 hop tunnel (no anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:287 msgid "1 hop tunnel (low anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291 msgid "2 hop tunnel (medium anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:295 msgid "3 hop tunnel (high anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:303 msgid "hop tunnel (very poor performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:308 msgid "Variance" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:315 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:319 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:327 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:331 msgid "+/- 0-2 hop variance (not recommended)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:342 msgid "hop variance" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347 msgid "Count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351 msgid "Backup Count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:378 msgid "backup tunnels" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:385 msgid "Profile" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:392 msgid "interactive connection" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 msgid "bulk connection (downloads/websites/BT)" msgstr "" @@ -418,20 +422,20 @@ msgid "for request/response connections" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:400 msgid "Router I2CP Address" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 msgid "Host" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:295 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:434 @@ -439,7 +443,7 @@ msgid "Port" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526 msgid "Reduce tunnel quantity when idle" msgstr "" @@ -449,20 +453,26 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:505 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:555 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:420 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:466 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528 msgid "Enable" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532 msgid "Reduced tunnel count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536 msgid "Idle minutes" msgstr "" @@ -475,7 +485,7 @@ msgid "New Keys on Reopen" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436 msgid "Disable" msgstr "" @@ -501,45 +511,70 @@ msgid "Local Base 32" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 -msgid "Local Authorization" +msgid "Pass User-Agent header through" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 -msgid "Username" +msgid "Pass Referer header through" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 -msgid "Password" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 +msgid "Pass Accept headers through" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 -msgid "Outproxy Authorization" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509 +msgid "Allow SSL to I2P addresses" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:577 +msgid "Signature type" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:520 +msgid "Experts only!" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:543 +msgid "Local Authorization" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:549 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:559 +msgid "Username" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:563 +msgid "Password" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:553 +msgid "Outproxy Authorization" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:570 msgid "Jump URL List" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:576 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:601 msgid "Custom options" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:580 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702 msgid "Cancel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:584 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:609 msgid "Delete" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:586 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:611 msgid "Save" msgstr "" @@ -571,131 +606,106 @@ msgstr "" msgid "Private key file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:253 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:258 msgid "Add to local addressbook" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:260 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Hostname Signature" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418 msgid "Encrypt Leaseset" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424 msgid "Encryption Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428 msgid "Generate New Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 msgid "Generate" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:426 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:546 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:432 msgid "(Tunnel must be stopped first)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434 msgid "Restricted Access List" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:434 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440 msgid "Whitelist" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444 msgid "Blacklist" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:442 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448 msgid "Access List" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446 -msgid "Inbound connection limits (0=unlimited)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:455 +msgid "Block Access via Inproxies" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:479 -msgid "Per client" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:450 -msgid "Per minute" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454 -msgid "Per hour" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:458 -msgid "Per day" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:489 -msgid "Total" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464 +msgid "Unique Local Address per Client" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470 +msgid "Inbound connection limits (0=unlimited)" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503 +msgid "Per client" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474 +msgid "Per minute" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478 +msgid "Per hour" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482 +msgid "Per day" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:513 +msgid "Total" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:494 msgid "Max concurrent connections (0=unlimited)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501 msgid "POST limits (0=unlimited)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:505 msgid "Per period" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:509 msgid "Ban minutes" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:519 msgid "POST limit period (minutes)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516 -msgid "New Certificate type" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518 -msgid "None" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522 -msgid "Hashcash (effort)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528 -msgid "Hashcash Calc Time" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530 -msgid "Estimate" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532 -msgid "Hidden" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536 -msgid "Signed (signed by)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:542 -msgid "Modify Certificate" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544 -msgid "Modify" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:579 +msgid "Experts only! Changes B32!" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:83 diff --git a/apps/i2ptunnel/locale/messages_nl.po b/apps/i2ptunnel/locale/messages_nl.po index 2cf9e4b017..67232a4808 100644 --- a/apps/i2ptunnel/locale/messages_nl.po +++ b/apps/i2ptunnel/locale/messages_nl.po @@ -6,13 +6,14 @@ # Translators: # ducki2p , 2011 # foo , 2009 +# Desirius , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:06+0000\n" -"PO-Revision-Date: 2013-11-20 09:42+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"PO-Revision-Date: 2014-07-02 12:21+0000\n" +"Last-Translator: Desirius \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,143 +21,143 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:350 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:360 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373 msgid "internal" msgstr "intern" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:436 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449 #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} inkomende, {0} uitgaande tunnel" +msgstr[1] "{0} inkomende, {0} uitgaande tunnels" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:440 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 msgid "lower bandwidth and reliability" -msgstr "" +msgstr "verlaag bandbreedte en betrouwbaarheid" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:442 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455 msgid "standard bandwidth and reliability" -msgstr "" +msgstr "standaard bandbreedte en betrouwbaarheid" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457 msgid "higher bandwidth and reliability" -msgstr "" +msgstr "hogere bandbreedte en betrouwbaarheid" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:121 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 msgid "Tunnels are not initialized yet, please reload in two minutes." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:194 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " "button on your browser. Please resubmit." msgstr "Ongeldige formulier verzonden, waarschijnlijk doordat je de 'back' of 'reload' button van je browser hebt gebruikt. Verzend opnieuw." -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:242 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244 msgid "Configuration reloaded for all tunnels" msgstr "Configuratie van alle tunnels opnieuw geladen" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:255 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257 msgid "Starting tunnel" msgstr "Opstarten van tunnel" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:268 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270 msgid "Stopping tunnel" msgstr "Stoppen van tunnel" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:334 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336 msgid "Configuration changes saved" msgstr "Configuratie wijzigingen opgeslagen" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:337 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339 msgid "Failed to save configuration" msgstr "Opslaan van de configuratie mislukt" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461 msgid "New Tunnel" msgstr "Nieuwe Tunnel" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:482 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:492 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:609 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 msgid "Port not set" msgstr "Poort niet opgegeven" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:485 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613 msgid "Invalid port" -msgstr "" +msgstr "Ongeldige poort" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:488 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490 msgid "Warning - ports less than 1024 are not recommended" -msgstr "" +msgstr "Waarschuwing - poorten lager dan 1024 worden niet aangeraden" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:504 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 msgid "Standard client" msgstr "Standaard client" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:505 -msgid "HTTP client" -msgstr "HTTP client" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +msgid "HTTP/HTTPS client" +msgstr "HTTP/HTTPS cliënt" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 msgid "IRC client" msgstr "IRC client" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 msgid "Standard server" msgstr "Standaard server" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 msgid "HTTP server" msgstr "HTTP server" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 msgid "SOCKS 4/4a/5 proxy" msgstr "SOCKS 4/4a/5 proxy" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 msgid "SOCKS IRC proxy" msgstr "SOCKS IRC proxy" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 msgid "CONNECT/SSL/HTTPS proxy" msgstr "CONNECT/SSL/HTTPS proxy" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 msgid "IRC server" msgstr "IRC server" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 msgid "Streamr client" msgstr "Streamr client" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516 msgid "Streamr server" msgstr "Streamr server" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517 msgid "HTTP bidir" msgstr "HTTP bidir" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313 msgid "Host not set" msgstr "Host niet opgegeven" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607 msgid "Invalid address" -msgstr "" +msgstr "Ongeldig adres" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82 msgid "I2P Tunnel Manager - Edit Client Tunnel" @@ -190,7 +191,7 @@ msgstr "Type" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330 msgid "Description" msgstr "Omschrijving" @@ -208,7 +209,7 @@ msgstr "Toegangspunt" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236 @@ -227,202 +228,211 @@ msgid "Outproxies" msgstr "Uitgaande proxies" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 -msgid "Tunnel Destination" -msgstr "Tunnel Destinations" +msgid "SSL Outproxies" +msgstr "SSL Outproxies" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:215 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 -msgid "name, name:port, or destination" -msgstr "" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209 +msgid "Use Outproxy Plugin" +msgstr "Gebruik Outproxy Plugin" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 -msgid "b32 not recommended" -msgstr "b32 niet aanbevolen" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224 -msgid "Shared Client" -msgstr "Gedeelde Client" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228 -msgid "" -"(Share tunnels with other clients and irc/httpclients? Change requires " -"restart of client proxy)" -msgstr "(Deel tunnels met andere clients en irc/httpclients? Wijziging vereist herstart van de client proxy)" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 -msgid "Auto Start" -msgstr "Auto Start" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:244 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526 msgid "(Check the Box for 'YES')" msgstr "(Markeer de Box voor 'JA')" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240 -msgid "Enable DCC" -msgstr "" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 +msgid "Tunnel Destination" +msgstr "Tunnel Destinations" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 +msgid "name, name:port, or destination" +msgstr "naam, naam:poort, of bestemming" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 +msgid "b32 not recommended" +msgstr "b32 niet aanbevolen" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239 +msgid "Shared Client" +msgstr "Gedeelde Client" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243 +msgid "" +"(Share tunnels with other clients and irc/httpclients? Change requires " +"restart of client proxy)" +msgstr "(Deel tunnels met andere clients en irc/httpclients? Wijziging vereist herstart van de client proxy)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 +msgid "Auto Start" +msgstr "Auto Start" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255 +msgid "Enable DCC" +msgstr "DCC inschakelen" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Advanced networking options" msgstr "Geavanceerde netwerk opties" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 msgid "" "(NOTE: when this client proxy is configured to share tunnels, then these " "options are for all the shared proxy clients!)" msgstr "(OPMERKING: wanneer deze client proxy is geconfigureerd om tunnels te delen, dan zijn deze opties van toepassing voor alle gedeelde proxy clients!)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 msgid "Tunnel Options" msgstr "Tunnel Opties" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 msgid "Length" msgstr "Lengte" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 msgid "0 hop tunnel (no anonymity)" -msgstr "" +msgstr "0 hop tunnel (geen anoniemiteit)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 msgid "1 hop tunnel (low anonymity)" -msgstr "" +msgstr "1 hop tunnel (lage anonimiteit)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 msgid "2 hop tunnel (medium anonymity)" -msgstr "" +msgstr "2 hops tunnel (gemiddelde anonimiteit)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 msgid "3 hop tunnel (high anonymity)" -msgstr "" +msgstr "3 hops tunnel (hoge anonimiteit)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297 msgid "hop tunnel (very poor performance)" msgstr "hop tunnel (zeer slechte prestatie)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302 msgid "Variance" msgstr "Variantie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "0 hop variantie (geen randomisatie, consistente prestatie)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "+ 0-1 hop variantie (gemiddeld toegevoegde randomisatie, minder prestatie)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "+ 0-2 hop variantie (hoge toegevoegde randomisatie, minder prestatie)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "+/- 0-1 hop variantie (standaard randomisatie, standaard prestatie)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 msgid "+/- 0-2 hop variance (not recommended)" msgstr "+/- 0-2 hop variantie (niet aanbevolen)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 msgid "hop variance" msgstr "hop variantie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 msgid "Count" msgstr "Aantal" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345 msgid "Backup Count" msgstr "Backup Aantal" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "0 backup tunnels (0 redundantie, geen additionele bronnen gebruikt)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "1 backup tunnel in beide richting (lage redundantie, lage aantal bronnen gebruikt)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "2 backup tunnels in beide richting (gemiddelde redundantie, gemiddeld aantal bronnen gebruikt)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "3 backup tunnels in beide richting (hoge redundantie, hoog aantal bronnen gebruikt)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 msgid "backup tunnels" msgstr "backup tunnels" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 msgid "Profile" msgstr "Profiel" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 msgid "interactive connection" msgstr "interactieve connectie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 msgid "bulk connection (downloads/websites/BT)" msgstr "bulk connection (downloads/websites/BT)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391 msgid "Delay Connect" msgstr "Vertraagde Connectie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395 msgid "for request/response connections" msgstr "voor request/response connecties" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 msgid "Router I2CP Address" msgstr "Router I2CP Adres" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 msgid "Host" msgstr "Host" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 @@ -431,107 +441,107 @@ msgstr "Host" msgid "Port" msgstr "Poort" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502 msgid "Reduce tunnel quantity when idle" msgstr "Verminder tunnel aantal in ruststand" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 msgid "Enable" msgstr "Ingeschakeld" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 msgid "Reduced tunnel count" msgstr "Verminder tunnel aantal" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:414 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512 msgid "Idle minutes" msgstr "Rust minuten" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433 msgid "Close tunnels when idle" msgstr "Sluit tunnels wanneer in rust" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439 msgid "New Keys on Reopen" msgstr "Nieuwe Sleutels bij Heropenen" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 msgid "Disable" msgstr "Uitgeschakeld" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453 msgid "Delay tunnel open until required" msgstr "Vertraag tunnel opening totdat het nodig is" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 msgid "Persistent private key" msgstr "Persistente private sleutel" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 msgid "File" msgstr "Bestand" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243 msgid "Local destination" msgstr "Lokale destination" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462 -msgid "(if known)" -msgstr "(indien bekend)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 +msgid "Local Base 32" +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 msgid "Local Authorization" msgstr "Lokale Autorisatie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:473 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 msgid "Username" msgstr "Gebruikersnaam" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 msgid "Password" msgstr "Wachtwoord" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 msgid "Outproxy Authorization" msgstr "Uitgaande Proxy Autorisatie" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 msgid "Jump URL List" msgstr "Spring URL Lijst" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 msgid "Custom options" msgstr "Aangepaste opties" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702 msgid "Cancel" msgstr "Annuleer" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556 msgid "Delete" msgstr "Verwijder" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 msgid "Save" msgstr "Opslaan" @@ -550,7 +560,7 @@ msgstr "Nieuwe server instellingen" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:179 msgid "Use SSL?" -msgstr "" +msgstr "SSL gebruiken?" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:222 msgid "Website name" @@ -641,19 +651,19 @@ msgstr "Maximum gelijktijdige connecties (0=onbeperkt)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477 msgid "POST limits (0=unlimited)" -msgstr "" +msgstr "POST limiet (0=ongelimiteerd)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:481 msgid "Per period" -msgstr "" +msgstr "Per periode" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:485 msgid "Ban minutes" -msgstr "" +msgstr "Ban minuten" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:495 msgid "POST limit period (minutes)" -msgstr "" +msgstr "POST limiet periode (minuten)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516 msgid "New Certificate type" @@ -705,7 +715,7 @@ msgstr "Ververs" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109 msgid "Tunnel Wizard" -msgstr "" +msgstr "Tunnel Setup" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113 msgid "Stop All" @@ -782,7 +792,7 @@ msgid "New server tunnel" msgstr "Nieuwe server tunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295 @@ -792,7 +802,7 @@ msgid "Standard" msgstr "Standaard" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:425 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434 msgid "Create" msgstr "Creëer" @@ -817,37 +827,41 @@ msgstr "Uitgaande proxy" msgid "Destination" msgstr "Destination" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:408 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395 +msgid "internal plugin" +msgstr "interne plugin" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414 msgid "none" msgstr "geen" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430 msgid "New client tunnel" msgstr "Nieuwe client tunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:119 msgid "I2P Tunnel Manager - Tunnel Creation Wizard" -msgstr "" +msgstr "I2P Tunnel Manager - Tunnel Aanmaken Setup" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:139 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:567 msgid "Server or client tunnel?" -msgstr "" +msgstr "Server of cliënt tunnel?" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571 msgid "Tunnel type" -msgstr "" +msgstr "Tunnel type" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:151 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:601 msgid "Tunnel name and description" -msgstr "" +msgstr "Tunnel naam en beschijving" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:157 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:610 msgid "Tunnel destination" -msgstr "" +msgstr "Tunnel bestemming" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:163 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:626 @@ -857,11 +871,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:169 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:652 msgid "Tunnel auto-start" -msgstr "" +msgstr "Tunnel auto-start" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:175 msgid "Wizard completed" -msgstr "" +msgstr "Setup voltooid" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189 msgid "" @@ -889,15 +903,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197 msgid "Server Tunnel" -msgstr "" +msgstr "Server Tunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199 msgid "Client Tunnel" -msgstr "" +msgstr "Cliënt Tunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:217 msgid "There are several types of tunnels to choose from:" -msgstr "" +msgstr "Er zijn verschillende types tunnel waar je uit kan kiezen:" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:225 msgid "Basic tunnel for connecting to a single service inside I2P." @@ -925,7 +939,7 @@ msgstr "" msgid "" "Websites outside I2P can also be reached if an HTTP proxy within I2P is " "known." -msgstr "" +msgstr "Websites buiten I2P kunnen ook bereikt worden als een HTTP proxy in I2P bekend is." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235 msgid "Customised client tunnel specific for IRC connections." @@ -951,7 +965,7 @@ msgstr "" msgid "" "This enables both TCP and UDP connections to be made through a SOCKS " "outproxy within I2P." -msgstr "" +msgstr "Dit zorgt ervoor dat zowel TCP als UDP connecties gemaakt kunnen worden via een SOCKS outproxy in I2P." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245 msgid "" @@ -964,102 +978,102 @@ msgid "" "With this tunnel type, IRC networks in I2P can be reached by typing the I2P " "address into your IRC client, and configuring the IRC client to use this " "SOCKS tunnel." -msgstr "" +msgstr "Met dit tunnel type, kunnen IRC netwerken in I2P bereikt worden door het I2P adres in je IRC cliënt in te voeren en de IRC cliënt te configureren om deze SOCKS tunnel te gebruiken." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249 msgid "" "This means that only one I2P tunnel is required rather than a separate " "tunnel per IRC network." -msgstr "" +msgstr "Dit betekend dat er maar één I2P tunnel nodig is in plaats van een aparte tunnel voor elk IRC netwerk." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251 msgid "" "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P " "is known, though it depends on whether or not the outproxy has been blocked " "by the IRC network." -msgstr "" +msgstr "IRC netwerken buiten I2P kunnen ook bereikt worden als een SOCKS outproxy in I2P bekend is, hoewel het er ook vanaf hangt of de outproxy is geblokkeerd door het IRC netwerk of niet." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253 msgid "A client tunnel that implements the HTTP CONNECT command." -msgstr "" +msgstr "Een cliënt tunnel die de HTTP CONNECT command implementeert." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255 msgid "" "This enables TCP connections to be made through an HTTP outproxy, assuming " "the proxy supports the CONNECT command." -msgstr "" +msgstr "Dit zorgt ervoor dat TCP connecties gemaakt kunnen worden door een HTTP outproxy, zolang de proxy de CONNECT command ondersteunt." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257 msgid "A customised client tunnel for Streamr." -msgstr "" +msgstr "Een aangepaste cliënt tunnel voor Streamr." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:267 msgid "A basic server tunnel for hosting a generic service inside I2P." -msgstr "" +msgstr "Een basis server tunnel voor het hosten van een algemene service in I2P." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271 msgid "A server tunnel that is customised for HTTP connections." -msgstr "" +msgstr "Een server tunnel die is aangepast voor HTTP connecties." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273 msgid "Use this tunnel type if you want to host an eepsite." -msgstr "" +msgstr "Gebruik dit tunnel type als je een eepsite wil hosten." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275 msgid "" "A customised server tunnel that can both serve HTTP data and connect to " "other server tunnels." -msgstr "" +msgstr "Een aangepaste server tunnel die HTTP data aankan en met andere server tunnels kan verbinden." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277 msgid "This tunnel type is predominantly used when running a Seedless server." -msgstr "" +msgstr "Dit tunnel type wordt voornamelijk gebruikt om Seedless servers te runnen." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279 msgid "A customised server tunnel for hosting IRC networks inside I2P." -msgstr "" +msgstr "Een aangepaste server tunnel voor het hosten van IRC netwerken binnen I2P." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281 msgid "" "Usually, a separate tunnel needs to be created for each IRC server that is " "to be accessible inside I2P." -msgstr "" +msgstr "Meestal moet er een aparte tunnel gemaakt worden voor elke IRC server die toegankelijk moet zijn binnen I2P." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283 msgid "A customised server tunnel for Streamr." -msgstr "" +msgstr "Een aangepaste server tunnel voor Streamr." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:322 msgid "Choose a name and description for your tunnel." -msgstr "" +msgstr "Kies een naam en beschrijving voor je tunnel." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:324 msgid "" "These can be anything you want - they are just for ease of identifying the " "tunnel in the routerconsole." -msgstr "" +msgstr "Deze kunnen alles zijn wat je wil - ze zijn alleen voor het makkelijker identificeren van de tunnel in de routerconsole." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:354 msgid "" "If you know of any outproxies for this type of tunnel (either HTTP or " "SOCKS), fill them in below." -msgstr "" +msgstr "Als je een outproxy kent voor dit type tunnel (HTTP of SOCKS), kan je hem hier invullen." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:356 msgid "Separate multiple proxies with commas." -msgstr "" +msgstr "Scheid meerdere proxies met komma's." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:374 msgid "" "Type in the I2P destination of the service that this client tunnel should " "connect to." -msgstr "" +msgstr "Vul de I2P bestemming in van de service waarmee deze cliënt tunnel moet verbinden." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:376 msgid "" "This could be the full base 64 destination key, or an I2P URL from your " "address book." -msgstr "" +msgstr "Dit kan de volle base 64 bestemming sleutel zijn, of een I2P URL uit je adresboek." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:409 msgid "" @@ -1100,39 +1114,39 @@ msgid "" "This can be useful for frequently-used tunnels (especially server tunnels), " "but for tunnels that are only used occassionally it would mean that the I2P " "router is creating and maintaining unnecessary tunnels." -msgstr "" +msgstr "Dit kan handig zijn voor veelgebruikte tunnels (vooral server tunnels), maar voor tunnels die maar af en toe gebruikt worden betekent het dat de I2P router onnodige tunnels maakt en bijhoudt." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546 msgid "The wizard has now collected enough information to create your tunnel." -msgstr "" +msgstr "De setup heeft genoeg informatie verzameld om de tunnel te maken." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:548 msgid "" "Upon clicking the Save button below, the wizard will set up the tunnel, and " "take you back to the main I2PTunnel page." -msgstr "" +msgstr "Als je op de Opslaan knop hier onder drukt, zal de setup de tunnel maken en de hoofd I2PTunnel pagina weergeven." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:553 msgid "" "Because you chose to automatically start the tunnel when the router starts, " "you don't have to do anything further." -msgstr "" +msgstr "Omdat je ervoor gekozen hebt om de tunnel automatisch te starten als de router start, hoef je niks meer te doen." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:555 msgid "The router will start the tunnel once it has been set up." -msgstr "" +msgstr "De router start de tunnel als hij klaar is." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559 msgid "" "Because you chose not to automatically start the tunnel, you will have to " "manually start it." -msgstr "" +msgstr "Omdat je ervoor gekozen hebt de tunnel niet automatisch te laten starten, moet je hem zelf nog starten." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:561 msgid "" "You can do this by clicking the Start button on the main page which " "corresponds to the new tunnel." -msgstr "" +msgstr "Dit kan je doen door op de Start knop, op de hoofd pagina van de nieuwe tunnel, te klikken." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565 msgid "Below is a summary of the options you chose:" @@ -1142,7 +1156,7 @@ msgstr "" msgid "" "Alongside these basic settings, there are a number of advanced options for " "tunnel configuration." -msgstr "" +msgstr "Naast de basis instellingen, zijn er een aantal geavanceerde opties voor tunnel configuratie." #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:665 msgid "" @@ -1153,16 +1167,16 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707 msgid "Previous" -msgstr "" +msgstr "Vorige" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:715 msgid "Save Tunnel" -msgstr "" +msgstr "Tunnel Opslaan" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:721 msgid "Finish" -msgstr "" +msgstr "Klaar" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:727 msgid "Next" -msgstr "" +msgstr "Volgende" diff --git a/apps/i2ptunnel/locale/messages_pt_BR.po b/apps/i2ptunnel/locale/messages_pt_BR.po index 980a6ad773..266a82bdfd 100644 --- a/apps/i2ptunnel/locale/messages_pt_BR.po +++ b/apps/i2ptunnel/locale/messages_pt_BR.po @@ -4,15 +4,16 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# testsubject67 , 2014 # blueboy, 2013 # blueboy, 2013-2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-09 19:27+0000\n" -"PO-Revision-Date: 2014-01-29 00:58+0000\n" -"Last-Translator: blueboy\n" +"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"PO-Revision-Date: 2014-07-05 18:15+0000\n" +"Last-Translator: testsubject67 \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,141 +21,141 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:350 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:360 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373 msgid "internal" -msgstr "" +msgstr "internal" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:436 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449 #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:440 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 msgid "lower bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:442 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455 msgid "standard bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457 msgid "higher bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:121 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 msgid "Tunnels are not initialized yet, please reload in two minutes." msgstr "Os túneis não foram inicializados ainda, por favor, recarregue em dois minutos." -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:194 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " "button on your browser. Please resubmit." -msgstr "" +msgstr "Forma de submissão inválida, porque provavelmente você usou o botão \"para trás\" ou \"recarregar\" no navegador. Submite de novo." -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Se o problema persistir, verifique se o seu navegador está configurado para permitir cookies." -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:242 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244 msgid "Configuration reloaded for all tunnels" -msgstr "" +msgstr "Configuração regarregada para todos os túneis" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:255 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257 msgid "Starting tunnel" msgstr "Inicializando túnel" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:268 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270 msgid "Stopping tunnel" msgstr "Parando túnel" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:334 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336 msgid "Configuration changes saved" msgstr "As alterações na configuração foram salvas" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:337 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339 msgid "Failed to save configuration" -msgstr "" +msgstr "Falha ao salvar configurações" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461 msgid "New Tunnel" msgstr "Novo túnel" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:482 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:492 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:609 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 msgid "Port not set" msgstr "Porta não especificada" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:485 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613 msgid "Invalid port" msgstr "Porta inválida" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:488 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490 msgid "Warning - ports less than 1024 are not recommended" msgstr "Aviso - portas abaixo de 1024 não são recomendadas" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:504 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 msgid "Standard client" msgstr "Cliente padrão" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:505 -msgid "HTTP client" -msgstr "Cliente HTTP" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +msgid "HTTP/HTTPS client" +msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 msgid "IRC client" msgstr "Cliente IRC" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 msgid "Standard server" msgstr "Servidor padrão" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 msgid "HTTP server" msgstr "servidor HTTP" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 -msgid "SOCKS 4/4a/5 proxy" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 -msgid "SOCKS IRC proxy" -msgstr "" - #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 -msgid "CONNECT/SSL/HTTPS proxy" -msgstr "" +msgid "SOCKS 4/4a/5 proxy" +msgstr "SOCKS 4/4a/5 proxy" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 +msgid "SOCKS IRC proxy" +msgstr "SOCKS IRC proxy" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 +msgid "CONNECT/SSL/HTTPS proxy" +msgstr "CONNECT/SSL/HTTPS proxy" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 msgid "IRC server" msgstr "servidor IRC" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 -msgid "Streamr client" -msgstr "" - -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 -msgid "Streamr server" -msgstr "" - #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 -msgid "HTTP bidir" -msgstr "" +msgid "Streamr client" +msgstr "Cliente streamr" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516 +msgid "Streamr server" +msgstr "Servidor streamr" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517 +msgid "HTTP bidir" +msgstr "HTTP bidir" + +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313 msgid "Host not set" msgstr "Host não especificado" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607 msgid "Invalid address" msgstr "Endereço inválido" @@ -190,7 +191,7 @@ msgstr "Tipo" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330 msgid "Description" msgstr "Descrição" @@ -198,7 +199,7 @@ msgstr "Descrição" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:143 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:153 msgid "Target" -msgstr "" +msgstr "Alvo" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:147 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:149 @@ -208,7 +209,7 @@ msgstr "Ponto de acesso" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236 @@ -227,202 +228,211 @@ msgid "Outproxies" msgstr "Proxies de saída" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 -msgid "Tunnel Destination" -msgstr "Destino do túnel" +msgid "SSL Outproxies" +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:215 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 -msgid "name, name:port, or destination" -msgstr "nome, nome:porta ou destino" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209 +msgid "Use Outproxy Plugin" +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 -msgid "b32 not recommended" -msgstr "b32 não recomendado" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224 -msgid "Shared Client" -msgstr "Cliente compartilhado" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228 -msgid "" -"(Share tunnels with other clients and irc/httpclients? Change requires " -"restart of client proxy)" -msgstr "(Compartilhar túneis com outros clientes e clientes irc/http? Alterar requer a reinicialização do proxy de cliente)" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 -msgid "Auto Start" -msgstr "Inicialização automática" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:244 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526 msgid "(Check the Box for 'YES')" msgstr "(Selecione a caixa para 'SIM')" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 +msgid "Tunnel Destination" +msgstr "Destino do túnel" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 +msgid "name, name:port, or destination" +msgstr "nome, nome:porta ou destino" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 +msgid "b32 not recommended" +msgstr "b32 não recomendado" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239 +msgid "Shared Client" +msgstr "Cliente compartilhado" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243 +msgid "" +"(Share tunnels with other clients and irc/httpclients? Change requires " +"restart of client proxy)" +msgstr "(Compartilhar túneis com outros clientes e clientes irc/http? Alterar requer a reinicialização do proxy de cliente)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 +msgid "Auto Start" +msgstr "Inicialização automática" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255 msgid "Enable DCC" msgstr "Permitir DCC" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Advanced networking options" msgstr "Opções de rede avançadas" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 msgid "" "(NOTE: when this client proxy is configured to share tunnels, then these " "options are for all the shared proxy clients!)" -msgstr "" +msgstr "(NOTA: quando este client proxy é configurado para compartilhar túneis, estas opções se aplicam para todos os proxy clients compartilhados!)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 msgid "Tunnel Options" msgstr "Opções de túneis" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 msgid "Length" msgstr "Comprimento" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 msgid "0 hop tunnel (no anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 msgid "1 hop tunnel (low anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 msgid "2 hop tunnel (medium anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 msgid "3 hop tunnel (high anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297 msgid "hop tunnel (very poor performance)" -msgstr "" +msgstr "Túnel hop (execução ruim)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302 msgid "Variance" msgstr "Variação" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 msgid "0 hop variance (no randomisation, consistant performance)" -msgstr "" +msgstr "Variação de hop 0 (sem randomização, execução consistente)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" -msgstr "" +msgstr "Variação de hop + 0-1 (randomização adicional média, execução subtrativa)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 -msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 -msgid "+/- 0-2 hop variance (not recommended)" -msgstr "" +msgstr "Variação de hop + 0-2 (randomização adicional alta, execução subtrativa)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 +msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" +msgstr "Variação de hop +/- 0-1 (randomização padrão, execução padrão)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 +msgid "+/- 0-2 hop variance (not recommended)" +msgstr "Variação de hop +/- 0-2 (não recomendada)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 msgid "hop variance" -msgstr "" +msgstr "Variação de hop" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 msgid "Count" msgstr "Contagem" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345 msgid "Backup Count" -msgstr "" +msgstr "Contagem de backup" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 msgid "0 backup tunnels (0 redundancy, no added resource usage)" -msgstr "" +msgstr "0 túneis de backup (redundância 0, sem recursos adicionais)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" -msgstr "" +msgstr "1 túnel de backup (redundância mínima, utilização de recursos baixa)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 -msgid "3 backup tunnels each direction (high redundancy, high resource usage)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 -msgid "backup tunnels" -msgstr "" +msgstr "2 túneis de backup em cada direção (redundância média, utilização de recursos média)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 +msgid "3 backup tunnels each direction (high redundancy, high resource usage)" +msgstr "3 túneis de backup em cada direção (redundância alta, utilização de recursos alta)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 +msgid "backup tunnels" +msgstr "túneis de backup" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 msgid "Profile" msgstr "Perfil" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 msgid "interactive connection" msgstr "conexão interativa" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 msgid "bulk connection (downloads/websites/BT)" -msgstr "" +msgstr "conexão em massa (downloads/websites/BT)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391 msgid "Delay Connect" -msgstr "" +msgstr "Atrasar Conexão" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395 msgid "for request/response connections" -msgstr "" +msgstr "para conexões de pedidos/respostas" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 msgid "Router I2CP Address" msgstr "Endereço I2CP do roteador" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 msgid "Host" msgstr "Host" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 @@ -431,107 +441,107 @@ msgstr "Host" msgid "Port" msgstr "Porta" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502 msgid "Reduce tunnel quantity when idle" -msgstr "" +msgstr "Reduzir quantidade de túneis quando inativo" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 msgid "Enable" msgstr "Permitir" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 msgid "Reduced tunnel count" -msgstr "" +msgstr "Quantidade de túnel reduzida" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:414 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512 msgid "Idle minutes" -msgstr "" +msgstr "Minutos inativos" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433 msgid "Close tunnels when idle" -msgstr "" +msgstr "Fechar túneis quando morto" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439 msgid "New Keys on Reopen" -msgstr "" +msgstr "Novas Chaves em Reabrir" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 msgid "Disable" msgstr "Desabilitar" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453 msgid "Delay tunnel open until required" -msgstr "" +msgstr "Túnel atrasado aberto até ser requerido" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 msgid "Persistent private key" msgstr "Chave privada persistente" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 msgid "File" msgstr "Arquivo" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243 msgid "Local destination" msgstr "Destino local" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 msgid "Local Base 32" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:476 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 msgid "Local Authorization" msgstr "Autorização local" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:492 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 msgid "Username" msgstr "Nome de usuário" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:484 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 msgid "Password" msgstr "Senha" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 msgid "Outproxy Authorization" msgstr "Autorização de proxy de saída" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 msgid "Jump URL List" msgstr "Pular lista de URLs" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:509 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 msgid "Custom options" msgstr "Opções personalizadas" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:513 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702 msgid "Cancel" msgstr "Cancelar" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:517 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556 msgid "Delete" msgstr "Deletar" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:519 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 msgid "Save" msgstr "Salvar" @@ -574,7 +584,7 @@ msgstr "Assinatura do nome do host" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:412 msgid "Encrypt Leaseset" -msgstr "" +msgstr "Criptografar Leaseset" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:418 msgid "Encryption Key" @@ -637,7 +647,7 @@ msgstr "Total" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:470 msgid "Max concurrent connections (0=unlimited)" -msgstr "" +msgstr "Conexões concorrentes máximas (0=ilimitada)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:477 msgid "POST limits (0=unlimited)" @@ -665,11 +675,11 @@ msgstr "Nenhum" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522 msgid "Hashcash (effort)" -msgstr "" +msgstr "Hashcas (esforço)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528 msgid "Hashcash Calc Time" -msgstr "" +msgstr "Hashcash Calcular Tempo" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530 msgid "Estimate" @@ -701,7 +711,7 @@ msgstr "Mensagens de Estado" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:101 msgid "Refresh" -msgstr "" +msgstr "Recarregar" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:109 msgid "Tunnel Wizard" @@ -726,7 +736,7 @@ msgstr "Túneis de servidor I2P" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:149 msgid "Points at" -msgstr "" +msgstr "Aponta paraq" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:182 @@ -782,7 +792,7 @@ msgid "New server tunnel" msgstr "Novo túnel servidor" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295 @@ -792,7 +802,7 @@ msgid "Standard" msgstr "Padrão" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:425 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434 msgid "Create" msgstr "Criar" @@ -817,11 +827,15 @@ msgstr "Proxy de saída" msgid "Destination" msgstr "Destino" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:408 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395 +msgid "internal plugin" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414 msgid "none" msgstr "nenhum" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430 msgid "New client tunnel" msgstr "Novo túnel de cliente" diff --git a/apps/i2ptunnel/locale/messages_uk.po b/apps/i2ptunnel/locale/messages_uk.po index cb1054a67a..e38e821ae2 100644 --- a/apps/i2ptunnel/locale/messages_uk.po +++ b/apps/i2ptunnel/locale/messages_uk.po @@ -4,15 +4,16 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Денис Лысенко , 2011 -# Денис Лысенко , 2012 +# Denis Blank , 2011 +# Denis Blank , 2012 +# LinuxChata, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:06+0000\n" -"PO-Revision-Date: 2013-11-20 09:42+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"PO-Revision-Date: 2014-06-22 10:21+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,12 +21,12 @@ msgstr "" "Language: uk_UA\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:350 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:360 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373 msgid "internal" msgstr "внутрішній" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:436 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449 #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" @@ -33,129 +34,129 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:440 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 msgid "lower bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:442 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455 msgid "standard bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457 msgid "higher bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:121 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 msgid "Tunnels are not initialized yet, please reload in two minutes." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:194 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " "button on your browser. Please resubmit." msgstr "Неправильно передана форма, можливо ви використовуєте дію браузера \"назад\" або \"оновити\". Будь-ласка повторіть спробу." -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:242 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244 msgid "Configuration reloaded for all tunnels" msgstr "Конфігурація для всіх тунелів перечитана" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:255 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257 msgid "Starting tunnel" -msgstr "Випуск тунелю" +msgstr "Запуск тунелю" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:268 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270 msgid "Stopping tunnel" msgstr "Зупинка тунелю" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:334 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336 msgid "Configuration changes saved" msgstr "Налаштування збережені" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:337 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339 msgid "Failed to save configuration" msgstr "Помилка під час зберігання налаштувань" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461 msgid "New Tunnel" msgstr "Новий тунель" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:482 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:492 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:609 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 msgid "Port not set" msgstr "Порт не заданий" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:485 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613 msgid "Invalid port" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:488 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490 msgid "Warning - ports less than 1024 are not recommended" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:504 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 msgid "Standard client" msgstr "Звичайний клієнт" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:505 -msgid "HTTP client" -msgstr "HTTP клієнт" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +msgid "HTTP/HTTPS client" +msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 msgid "IRC client" msgstr "IRC клієнт" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 msgid "Standard server" msgstr "Звичайний сервер" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 msgid "HTTP server" msgstr "HTTP сервер" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 msgid "SOCKS 4/4a/5 proxy" msgstr "SOCKS 4/4a/5 проксі" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 msgid "SOCKS IRC proxy" msgstr "SOCKS IRC проксі" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 msgid "CONNECT/SSL/HTTPS proxy" msgstr "CONNECT/SSL/HTTPS проксі" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 msgid "IRC server" msgstr "IRC сервер" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 msgid "Streamr client" msgstr "Streamr клієнт" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516 msgid "Streamr server" msgstr "Streamr сервер" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517 msgid "HTTP bidir" msgstr "HTTP bidir (експерементальний двухнаправлений режим, інструкцію запитуйте у sponge)" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313 msgid "Host not set" msgstr "Хост не заданий" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607 msgid "Invalid address" msgstr "" @@ -191,7 +192,7 @@ msgstr "Тип" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330 msgid "Description" msgstr "Опис" @@ -209,7 +210,7 @@ msgstr "Точка доступу" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236 @@ -228,202 +229,211 @@ msgid "Outproxies" msgstr "Список вихідних проксі (Outproxies)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 -msgid "Tunnel Destination" -msgstr "Адреса Призначення Тунелю" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:215 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 -msgid "name, name:port, or destination" +msgid "SSL Outproxies" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 -msgid "b32 not recommended" -msgstr "b32 не рекомендується" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209 +msgid "Use Outproxy Plugin" +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224 -msgid "Shared Client" -msgstr "Колективний Клієнт" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228 -msgid "" -"(Share tunnels with other clients and irc/httpclients? Change requires " -"restart of client proxy)" -msgstr "(Використовувати тунелі спільно з іншими клієнтами і irc/httpclients? Зміна налаштування потребує перезапуску тунелю)" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 -msgid "Auto Start" -msgstr "Автозапуск" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:244 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526 msgid "(Check the Box for 'YES')" msgstr "(Виберіть чекбокс 'ТАК')" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 +msgid "Tunnel Destination" +msgstr "Адреса Призначення Тунелю" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 +msgid "name, name:port, or destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 +msgid "b32 not recommended" +msgstr "b32 не рекомендується" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239 +msgid "Shared Client" +msgstr "Колективний Клієнт" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243 +msgid "" +"(Share tunnels with other clients and irc/httpclients? Change requires " +"restart of client proxy)" +msgstr "(Використовувати тунелі спільно з іншими клієнтами і irc/httpclients? Зміна налаштування потребує перезапуску тунелю)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 +msgid "Auto Start" +msgstr "Автозапуск" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255 msgid "Enable DCC" msgstr "Включити DCC" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Advanced networking options" msgstr "Розширені мережеві опції" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 msgid "" "(NOTE: when this client proxy is configured to share tunnels, then these " "options are for all the shared proxy clients!)" msgstr "(Зверніть увагу: коли цей клієнтський проксі настроєний ділитись тунелями, то ці опції будуть дійсні для всіх проксі клієнтів з якими ви ділитесь!)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 msgid "Tunnel Options" msgstr "Опції Тунелю" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 msgid "Length" msgstr "Довжина" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 msgid "0 hop tunnel (no anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 msgid "1 hop tunnel (low anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 msgid "2 hop tunnel (medium anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 msgid "3 hop tunnel (high anonymity)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297 msgid "hop tunnel (very poor performance)" msgstr "хоп тунель (дуже погана продуктивність (комп'ютера))" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302 msgid "Variance" msgstr "Розбіжність" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "0 хоп розкид (без рандомізації, фіксована продуктивність)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "+0-1 хоп розкид (помірна збільшена рандомізація, понижена продуктивність)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "+0-2 хоп розкид (дуже збільшена рандомізація, понижена продуктивність)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "+/- 0-1 хоп розкид (стандартна рандомізація, стандартна продуктивнсть)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 msgid "+/- 0-2 hop variance (not recommended)" msgstr "+/- 0-2 хоп розкид (не рекомендовано)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 msgid "hop variance" msgstr "хоп розбіжність" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 msgid "Count" msgstr "Кількість" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345 msgid "Backup Count" msgstr "Резервна кількість" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "0 резервних тунелів (0 надлишок, відсутність додаткового навантаження на систему) " -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "1 резервний тунель в кожному напрямку (низька надлишковість, низьке використання ресурсів системи)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "2 резервні тунелі в кожному напрямку (середня надмірність, середнє навантаження на систему)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "3 резервні тунелі в кожному напрямку (висока надмірність, високе навантаження на систему)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 msgid "backup tunnels" msgstr "резервних тунелів" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 msgid "Profile" msgstr "Режим" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 msgid "interactive connection" msgstr "оптимізувати для малих затримок (irc)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 msgid "bulk connection (downloads/websites/BT)" msgstr "оптимізувати для великого об'єму (завантаження/веб-серфінг/Бітторрент)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391 msgid "Delay Connect" msgstr "Затримка Зєднання" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395 msgid "for request/response connections" msgstr "оптимізація для з'єднань, які починаються з запиту клієнта/відповіді сервера. " -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 msgid "Router I2CP Address" msgstr "I2CP Адрес Роутера" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 msgid "Host" msgstr "Адрес" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 @@ -432,107 +442,107 @@ msgstr "Адрес" msgid "Port" msgstr "Порт" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502 msgid "Reduce tunnel quantity when idle" msgstr "Зменьшувати кількість тунелів при простої" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 msgid "Enable" msgstr "Включити" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 msgid "Reduced tunnel count" msgstr "Зменшення числа тунелів" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:414 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512 msgid "Idle minutes" msgstr "Хвилин простою" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433 msgid "Close tunnels when idle" msgstr "Закривати тунелі при простою" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439 msgid "New Keys on Reopen" msgstr "Генерувати новий ключ при перезапуску" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 msgid "Disable" msgstr "Вимкнути" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453 msgid "Delay tunnel open until required" msgstr "Відкласти запуск до першого запиту" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 msgid "Persistent private key" msgstr "Постійний секретний ключ" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 msgid "File" msgstr "Файл" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243 msgid "Local destination" msgstr "Локальний адрес призначення" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462 -msgid "(if known)" -msgstr "(Якщо відомий)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 +msgid "Local Base 32" +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 msgid "Local Authorization" msgstr "Локальна Авторизація" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:473 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 msgid "Username" msgstr "Ім'я користувача" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 msgid "Password" msgstr "Пароль" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 msgid "Outproxy Authorization" msgstr "Авторизація outproxy" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 msgid "Jump URL List" msgstr "URL спиок \"Jump\"-сервісів" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 msgid "Custom options" msgstr "Вибіркові параметри" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702 msgid "Cancel" msgstr "Відмінити" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556 msgid "Delete" msgstr "Удалити" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 msgid "Save" msgstr "Зберегти" @@ -783,7 +793,7 @@ msgid "New server tunnel" msgstr "Новий серверний тунель" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295 @@ -793,7 +803,7 @@ msgid "Standard" msgstr "Стандартний" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:425 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434 msgid "Create" msgstr "Створити" @@ -818,11 +828,15 @@ msgstr "Outproxy (зовнішній проксі)" msgid "Destination" msgstr "Адреса призначення" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:408 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395 +msgid "internal plugin" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414 msgid "none" msgstr "ні" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430 msgid "New client tunnel" msgstr "Новий клієнтський тунель" diff --git a/apps/i2ptunnel/locale/messages_zh.po b/apps/i2ptunnel/locale/messages_zh.po index cd200e6685..1128c5e145 100644 --- a/apps/i2ptunnel/locale/messages_zh.po +++ b/apps/i2ptunnel/locale/messages_zh.po @@ -2,165 +2,164 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the i2ptunnel package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # ducki2p , 2011 -# nametooshort , 2013 +# linloveliang , 2013 +# xkimo_daeee , 2014 # walking , 2011 # walking , 2013 # walking , 2011 # wwj402 , 2013 +# YF , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 19:56+0000\n" -"PO-Revision-Date: 2013-11-22 05:52+0000\n" -"Last-Translator: wwj402 \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/" -"language/zh_CN/)\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"PO-Revision-Date: 2014-06-30 11:27+0000\n" +"Last-Translator: xkimo_daeee \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:350 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:360 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:363 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:373 msgid "internal" msgstr "内部" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:436 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:449 #, java-format msgid "{0} inbound, {0} outbound tunnel" msgid_plural "{0} inbound, {0} outbound tunnels" msgstr[0] "{0}入站, {0}出站隧道" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:440 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:453 msgid "lower bandwidth and reliability" msgstr "较低的带宽和稳定性" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:442 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:455 msgid "standard bandwidth and reliability" msgstr "标准带宽和稳定性" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:457 msgid "higher bandwidth and reliability" msgstr "较高的带宽和稳定性" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:121 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:123 msgid "Tunnels are not initialized yet, please reload in two minutes." msgstr "隧道尚未初始化，请两分钟后刷新。" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:194 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " "button on your browser. Please resubmit." -msgstr "" -"网页提交无效，可能的原因是您使用了浏览器的“后退”和“刷新”按钮，导致表单过期，" -"请重新提交。" +msgstr "网页提交无效，可能的原因是您使用了浏览器的“后退”和“刷新”按钮，导致表单过期，请重新提交。" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:196 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:198 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "如果问题持续，请确认您的浏览器支持Cookie。" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:242 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:244 msgid "Configuration reloaded for all tunnels" msgstr "所有隧道都已根据当前配置重启" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:255 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:257 msgid "Starting tunnel" msgstr "正在启动隧道" #. and give them something to look at in any case -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:268 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:270 msgid "Stopping tunnel" msgstr "正在关闭隧道" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:334 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:336 msgid "Configuration changes saved" msgstr "配置修改成功" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:337 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:339 msgid "Failed to save configuration" msgstr "配置保存失败" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:459 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:461 msgid "New Tunnel" msgstr "新建隧道" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:482 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:492 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:609 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:484 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:494 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 msgid "Port not set" msgstr "端口未设置" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:485 -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:611 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:487 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:613 msgid "Invalid port" msgstr "无效端口" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:488 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:490 msgid "Warning - ports less than 1024 are not recommended" msgstr "警告 - 不推荐低于 1024 的端口" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:504 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 msgid "Standard client" msgstr "标准客户端" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:505 -msgid "HTTP client" -msgstr "HTTP 客户端" +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +msgid "HTTP/HTTPS client" +msgstr "HTTP/HTTPS 客户端" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:506 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 msgid "IRC client" msgstr "IRC 客户端" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:507 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 msgid "Standard server" msgstr "标准服务器" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:508 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 msgid "HTTP server" msgstr "HTTP 服务器" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:509 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 msgid "SOCKS 4/4a/5 proxy" msgstr "SOCKS4/4A/5 代理" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:510 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 msgid "SOCKS IRC proxy" msgstr "SOCKS IRC 代理" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:511 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 msgid "CONNECT/SSL/HTTPS proxy" msgstr "CONNECT/SSL/HTTPS 代理" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:512 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 msgid "IRC server" msgstr "IRC 服务器" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:513 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 msgid "Streamr client" msgstr "Streamr 客户端" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:514 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:516 msgid "Streamr server" msgstr "Streamr 服务器" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:515 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:517 msgid "HTTP bidir" msgstr "双向http" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:603 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:313 msgid "Host not set" msgstr "主机未设置" -#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:605 +#: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:607 msgid "Invalid address" msgstr "无效地址" @@ -196,7 +195,7 @@ msgstr "类型" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:137 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:255 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:422 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330 msgid "Description" msgstr "描述" @@ -214,7 +213,7 @@ msgstr "接入点" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:154 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:191 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:236 @@ -233,204 +232,211 @@ msgid "Outproxies" msgstr "出口代理" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:203 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 -msgid "Tunnel Destination" -msgstr "隧道目标" +msgid "SSL Outproxies" +msgstr "SSL 出口代理" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:215 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 -msgid "name, name:port, or destination" -msgstr "名称, 名称:端口, 或目标" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:209 +msgid "Use Outproxy Plugin" +msgstr "使用出口代理插件" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 -msgid "b32 not recommended" -msgstr "请避免使用b32地址。" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:224 -msgid "Shared Client" -msgstr "共享客户端" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:228 -msgid "" -"(Share tunnels with other clients and irc/httpclients? Change requires " -"restart of client proxy)" -msgstr "(与其他客户端例如IRC/HTTP共享隧道？修改需要重新启动)" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 -msgid "Auto Start" -msgstr "自动启动" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:244 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:213 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:259 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526 msgid "(Check the Box for 'YES')" msgstr "(选中表示\"是\")" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:240 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 +msgid "Tunnel Destination" +msgstr "隧道目标" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 +msgid "name, name:port, or destination" +msgstr "名称, 名称:端口, 或目标" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 +msgid "b32 not recommended" +msgstr "请避免使用b32地址。" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:239 +msgid "Shared Client" +msgstr "共享客户端" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:243 +msgid "" +"(Share tunnels with other clients and irc/httpclients? Change requires " +"restart of client proxy)" +msgstr "(与其他客户端例如IRC/HTTP共享隧道？修改需要重新启动)" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:247 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:141 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 +msgid "Auto Start" +msgstr "自动启动" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255 msgid "Enable DCC" msgstr "启用聊天直连(DCC)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:263 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:266 msgid "Advanced networking options" msgstr "高级网络设置" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 msgid "" "(NOTE: when this client proxy is configured to share tunnels, then these " "options are for all the shared proxy clients!)" -msgstr "" -"(注意:此客户代理被设置使用共享隧道时，这些设置将影响所有使用共享隧道的客户" -"端!)" +msgstr "(注意:此客户代理被设置使用共享隧道时，这些设置将影响所有使用共享隧道的客户端!)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:267 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:268 msgid "Tunnel Options" msgstr "隧道选项" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:254 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:270 msgid "Length" msgstr "长度" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:261 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:276 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:277 msgid "0 hop tunnel (no anonymity)" msgstr "0跳隧道（非匿名）" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:265 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:280 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:281 msgid "1 hop tunnel (low anonymity)" msgstr "1跳隧道（低匿名性）" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:284 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:285 msgid "2 hop tunnel (medium anonymity)" msgstr "2跳隧道（中等匿名性）" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:273 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:288 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:289 msgid "3 hop tunnel (high anonymity)" msgstr "3跳隧道（高匿名性）" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:296 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:297 msgid "hop tunnel (very poor performance)" msgstr "跳点隧道(严重影响性能)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:286 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:302 msgid "Variance" msgstr "随机变化" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:308 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "隧道长度恒定(随机性无,性能稳定)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:297 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:312 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:313 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "隧道长度+ 0-1(随机性中,影响性能)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:316 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "隧道长度+ 0-2(随机性高,影响性能)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:321 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "隧道长度+/- 0-1(随机性标准,正常性能)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:324 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:325 msgid "+/- 0-2 hop variance (not recommended)" msgstr "隧道程度+/- 0-2(不推荐)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 msgid "hop variance" msgstr "节点数量" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:341 msgid "Count" msgstr "计数" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:345 msgid "Backup Count" msgstr "备用数量" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:351 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "无备用隧道(无冗余,不增加资源占用)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:355 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:356 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "备用隧道对x1 (低冗余,低资源占用)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:359 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:360 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "备用隧道对x2 (中冗余,中资源占用)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:348 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:364 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "备用隧道对x3 (高冗余,高资源占用)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:356 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:371 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:372 msgid "backup tunnels" msgstr "备用隧道" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:378 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:379 msgid "Profile" msgstr "连接类型" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:370 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:385 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 msgid "interactive connection" msgstr "速度连接" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:389 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:390 msgid "bulk connection (downloads/websites/BT)" msgstr "效率连接(下载/WEB/BT)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:376 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:391 msgid "Delay Connect" msgstr "连接延迟断开" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:395 msgid "for request/response connections" msgstr "单请求/响应连接" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:384 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:399 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 msgid "Router I2CP Address" msgstr "路由器I2CP地址" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:159 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:396 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 msgid "Host" msgstr "主机" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:409 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:165 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:404 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 @@ -439,107 +445,107 @@ msgstr "主机" msgid "Port" msgstr "端口" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:419 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:502 msgid "Reduce tunnel quantity when idle" msgstr "空闲时缩减隧道数量" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:406 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:420 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:428 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:440 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:450 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:503 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 msgid "Enable" msgstr "启用" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:410 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:425 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 msgid "Reduced tunnel count" msgstr "削减后的隧道数量" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:414 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:434 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:449 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:512 msgid "Idle minutes" msgstr "空闲时间(分钟)" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:433 msgid "Close tunnels when idle" msgstr "空闲时关闭隧道" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:439 msgid "New Keys on Reopen" msgstr "重新打开隧道时使用新密钥" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:432 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:447 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:430 msgid "Disable" msgstr "禁用" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:453 msgid "Delay tunnel open until required" msgstr "仅在请求时打开" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:448 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:463 msgid "Persistent private key" msgstr "永久私有密钥" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:469 msgid "File" msgstr "文件" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:458 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:478 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:243 msgid "Local destination" msgstr "本地目标" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462 -msgid "(if known)" -msgstr "(如果已知)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:482 +msgid "Local Base 32" +msgstr "本地基数32" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:491 msgid "Local Authorization" msgstr "本地认证" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:473 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:507 msgid "Username" msgstr "用户名" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:475 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:511 msgid "Password" msgstr "密码" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:501 msgid "Outproxy Authorization" msgstr "出口代理认证" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:518 msgid "Jump URL List" msgstr "跳转服务列表" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:548 msgid "Custom options" msgstr "自定义选项" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:528 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:552 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:702 msgid "Cancel" msgstr "取消" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:556 msgid "Delete" msgstr "删除" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:534 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:558 msgid "Save" msgstr "保存" @@ -790,7 +796,7 @@ msgid "New server tunnel" msgstr "新建服务器隧道" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:432 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:223 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:265 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:295 @@ -800,7 +806,7 @@ msgid "Standard" msgstr "标准" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:425 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:434 msgid "Create" msgstr "创建" @@ -825,11 +831,15 @@ msgstr "出口代理" msgid "Destination" msgstr "目标" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:408 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:395 +msgid "internal plugin" +msgstr "内部插件" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:414 msgid "none" msgstr "无" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:430 msgid "New client tunnel" msgstr "新建客户隧道" @@ -873,23 +883,21 @@ msgstr "向导完成" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:189 msgid "" -"This wizard will take you through the various options available for creating " -"tunnels in I2P." +"This wizard will take you through the various options available for creating" +" tunnels in I2P." msgstr "本向导将帮助您配置I2P隧道创建中的各种选项。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:191 msgid "" -"The first thing to decide is whether you want to create a server or a client " -"tunnel." +"The first thing to decide is whether you want to create a server or a client" +" tunnel." msgstr "首先您需要确定，创建的是服务端还是客户端隧道。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193 msgid "" -"If you need to connect to a remote service, such as an IRC server inside I2P " -"or a code repository, then you will require a CLIENT tunnel." -msgstr "" -"如果您想通过隧道访问远程的服务，例如I2P的IRC聊天服务器或代码库，那么请选择*客" -"户隧道*。" +"If you need to connect to a remote service, such as an IRC server inside I2P" +" or a code repository, then you will require a CLIENT tunnel." +msgstr "如果您想通过隧道访问远程的服务，例如I2P的IRC聊天服务器或代码库，那么请选择*客户隧道*。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195 msgid "" @@ -927,11 +935,9 @@ msgstr "访问HTTP代理的隧道，用来访问I2P中的站点。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231 msgid "" "Set your browser to use this tunnel as an http proxy, or set your " -"\"http_proxy\" environment variable for command-line applications in GNU/" -"Linux." -msgstr "" -"设置您的浏览器将此隧道作为 HTTP 代理，在 GNU/Linux 的命令行环境中请使用 " -"\"http_proxy\" 环境变量。" +"\"http_proxy\" environment variable for command-line applications in " +"GNU/Linux." +msgstr "设置您的浏览器将此隧道作为 HTTP 代理，在 GNU/Linux 的命令行环境中请使用 \"http_proxy\" 环境变量。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233 msgid "" @@ -976,9 +982,7 @@ msgid "" "With this tunnel type, IRC networks in I2P can be reached by typing the I2P " "address into your IRC client, and configuring the IRC client to use this " "SOCKS tunnel." -msgstr "" -"使用此隧道类型时，可以在IRC客户端中设置使用此Socks隧道，通过I2P地址访问I2P中" -"的IRC网络。" +msgstr "使用此隧道类型时，可以在IRC客户端中设置使用此Socks隧道，通过I2P地址访问I2P中的IRC网络。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249 msgid "" @@ -991,9 +995,7 @@ msgid "" "IRC networks outside I2P can also be reached if a SOCKS outproxy within I2P " "is known, though it depends on whether or not the outproxy has been blocked " "by the IRC network." -msgstr "" -"如果设置SOCKS出口代理，I2P之外的IRC网络也可以访问，尽管这取决于IRC网络是否允" -"许您的出口代理连接。" +msgstr "如果设置SOCKS出口代理，I2P之外的IRC网络也可以访问，尽管这取决于IRC网络是否允许您的出口代理连接。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253 msgid "A client tunnel that implements the HTTP CONNECT command." @@ -1081,9 +1083,7 @@ msgstr "即一个完整的 Base64编码的目标密钥或您地址簿中的I2P msgid "" "This is the IP that your service is running on, this is usually on the same " "machine so 127.0.0.1 is autofilled." -msgstr "" -"这是您的服务当前运行的 IP，通常服务跟I2P在同一电脑上，所以自动填写为 " -"127.0.0.1 。" +msgstr "这是您的服务当前运行的 IP，通常服务跟I2P在同一电脑上，所以自动填写为 127.0.0.1 。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:432 msgid "This is the port that the service is accepting connections on." @@ -1118,9 +1118,7 @@ msgid "" "This can be useful for frequently-used tunnels (especially server tunnels), " "but for tunnels that are only used occassionally it would mean that the I2P " "router is creating and maintaining unnecessary tunnels." -msgstr "" -"这适用于经常使用的隧道(尤其是服务端隧道)，但如果隧道仅偶尔使用，会不必要地占" -"用I2P的资源。" +msgstr "这适用于经常使用的隧道(尤其是服务端隧道)，但如果隧道仅偶尔使用，会不必要地占用I2P的资源。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:546 msgid "The wizard has now collected enough information to create your tunnel." @@ -1169,9 +1167,7 @@ msgid "" "The wizard will set reasonably sensible default values for these, but you " "can view and/or edit these by clicking on the tunnel's name in the main " "I2PTunnel page." -msgstr "" -"向导会设置合理的默认值，不过您仍可通过在I2PTunnel主页中点击隧道名称来查看/编" -"辑它们。" +msgstr "向导会设置合理的默认值，不过您仍可通过在I2PTunnel主页中点击隧道名称来查看/编辑它们。" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:707 msgid "Previous" diff --git a/apps/jetty/.externalToolBuilders/jetty-makejar.launch b/apps/jetty/.externalToolBuilders/jetty-makejar.launch index c12b8bd753..e842e57811 100644 --- a/apps/jetty/.externalToolBuilders/jetty-makejar.launch +++ b/apps/jetty/.externalToolBuilders/jetty-makejar.launch @@ -6,6 +6,12 @@ + + + + + + diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/XSSFilter.java b/apps/jetty/java/src/net/i2p/servlet/filters/XSSFilter.java new file mode 100644 index 0000000000..b29892e70f --- /dev/null +++ b/apps/jetty/java/src/net/i2p/servlet/filters/XSSFilter.java @@ -0,0 +1,30 @@ +package net.i2p.servlet.filters; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +/** + * @since 0.9.14 + */ +public class XSSFilter implements Filter { + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void destroy() { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + chain.doFilter(new XSSRequestWrapper((HttpServletRequest) request), response); + } +} diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java new file mode 100644 index 0000000000..b8b8d39919 --- /dev/null +++ b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java @@ -0,0 +1,123 @@ +package net.i2p.servlet.filters; + +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +//import org.owasp.esapi.ESAPI; + +import net.i2p.I2PAppContext; +import net.i2p.util.Log; + +/** + * @since 0.9.14 + */ +public class XSSRequestWrapper extends HttpServletRequestWrapper { + // Adapted from https://owasp-esapi-java.googlecode.com/svn/trunk/configuration/esapi/ESAPI.properties + private static final Pattern parameterValuePattern = Pattern.compile("^[\\p{L}\\p{Nd}.,:\\-\\/+=~\\[\\]?@_ \r\n]*$"); + private static final Pattern headerValuePattern = Pattern.compile("^[a-zA-Z0-9()\\-=\\*\\.\\?;,+\\/:&_ ]*$"); + private static final String NOFILTER = "nofilter_"; + + public XSSRequestWrapper(HttpServletRequest servletRequest) { + super(servletRequest); + } + + /** + * Parameter names starting with "nofilter_" will not be filtered. + */ + @Override + public String[] getParameterValues(String parameter) { + String[] values = super.getParameterValues(parameter); + if (parameter.startsWith(NOFILTER)) + return values; + + if (values == null) { + return null; + } + + int count = values.length; + String[] encodedValues = new String[count]; + int good = 0; + for (int i = 0; i < count; i++) { + String value = values[i]; + String v2 = stripXSS(value, parameterValuePattern); + if (v2 != null) { + encodedValues[good++] = v2; + } else if (value != null) { + Log log = I2PAppContext.getGlobalContext().logManager().getLog(XSSRequestWrapper.class); + log.logAlways(Log.WARN, "URL \"" + getServletPath() + "\" Stripped param \"" + parameter + "\" : \"" + value + '"'); + } + } + if (good <= 0) + return null; + if (good < count) { + // shrink array + String[] rv = new String[good]; + System.arraycopy(encodedValues, 0, rv, 0, good); + encodedValues = rv; + } + return encodedValues; + } + + /** + * Parameter names starting with "nofilter_" will not be filtered. + */ + @Override + public String getParameter(String parameter) { + String value = super.getParameter(parameter); + if (parameter.startsWith(NOFILTER)) + return value; + String rv = stripXSS(value, parameterValuePattern); + if (value != null && rv == null) { + Log log = I2PAppContext.getGlobalContext().logManager().getLog(XSSRequestWrapper.class); + log.logAlways(Log.WARN, "URL \"" + getServletPath() + "\" Stripped param \"" + parameter + "\" : \"" + value + '"'); + } + return rv; + } + + /** + * Parameter names starting with "nofilter_" will not be filtered. + */ + @Override + public Map getParameterMap() { + Map rv = new HashMap(); + for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) { + String k = (String) keys.nextElement(); + String[] v = getParameterValues(k); + if (v != null) + rv.put(k, v); + } + return Collections.unmodifiableMap(rv); + } + + @Override + public String getHeader(String name) { + String value = super.getHeader(name); + String rv = stripXSS(value, headerValuePattern); + if (value != null && rv == null) { + Log log = I2PAppContext.getGlobalContext().logManager().getLog(XSSRequestWrapper.class); + log.logAlways(Log.WARN, "URL \"" + getServletPath() + "\" Stripped header \"" + name + "\" : \"" + value + '"'); + } + return rv; + } + + private static String stripXSS(String value, Pattern whitelistPattern) { + if (value != null) { + // NOTE: It's highly recommended to use the ESAPI library and uncomment the following line to + // avoid encoded attacks. + //value = ESAPI.encoder().canonicalize(value); + + // Remove bad parameters entirely. + // NOTE: This doesn't consider whether null is acceptable. + if (!whitelistPattern.matcher(value).matches()) { + value = null; + } + } + return value; + } +} diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java index d532a9c5c6..580948fc03 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java @@ -10,7 +10,9 @@ import java.util.Properties; import net.i2p.CoreVersion; import net.i2p.crypto.TrustedUpdate; +import net.i2p.data.DataFormatException; import net.i2p.data.DataHelper; +import net.i2p.data.SigningPublicKey; import net.i2p.router.RouterContext; import net.i2p.router.web.ConfigClientsHelper; import net.i2p.router.web.ConfigUpdateHandler; @@ -54,6 +56,7 @@ class PluginUpdateRunner extends UpdateRunner { private static final String XPI2P = "app.xpi2p"; private static final String ZIP = XPI2P + ".zip"; public static final String PLUGIN_DIR = PluginStarter.PLUGIN_DIR; + private static final String PROP_ALLOW_NEW_KEYS = "routerconsole.allowUntrustedPlugins"; public PluginUpdateRunner(RouterContext ctx, ConsoleUpdateManager mgr, List uris, String appName, String oldVersion ) { @@ -162,7 +165,7 @@ class PluginUpdateRunner extends UpdateRunner { // ok, now we check sigs and deal with a bad sig String pubkey = props.getProperty("key"); - String signer = props.getProperty("signer"); + String signer = DataHelper.stripHTML(props.getProperty("signer")); if (pubkey == null || signer == null || pubkey.length() != 172 || signer.length() <= 0) { f.delete(); to.delete(); @@ -170,6 +173,15 @@ class PluginUpdateRunner extends UpdateRunner { statusDone("" + _("Plugin from {0} contains an invalid key", url) + ""); return; } + SigningPublicKey spk; + try { + spk = new SigningPublicKey(pubkey); + } catch (DataFormatException dfe) { + f.delete(); + to.delete(); + statusDone("" + _("Plugin from {0} contains an invalid key", url) + ""); + return; + } // add all existing plugin keys, so any conflicts with existing keys // will be discovered and rejected @@ -179,12 +191,21 @@ class PluginUpdateRunner extends UpdateRunner { up.addKey(e.getKey(), e.getValue()); } + // add all trusted plugin keys, so any conflicts with trusted keys + // will be discovered and rejected + Map trustedKeys = TrustedPluginKeys.getKeys(); + for (Map.Entry e : trustedKeys.entrySet()) { + // ignore dups/bad keys + up.addKey(e.getKey(), e.getValue()); + } + if (up.haveKey(pubkey)) { // the key is already in the TrustedUpdate keyring // verify the sig and verify that it is signed by the signer in the plugin.config file // Allow "" as the previously-known signer - String signingKeyName = up.verifyAndGetSigner(f); - if (!(signer.equals(signingKeyName) || "".equals(signingKeyName))) { + boolean ok = up.verify(f, spk); + String signingKeyName = up.getKeys().get(spk); + if ((!ok) || !(signer.equals(signingKeyName) || "".equals(signingKeyName))) { f.delete(); to.delete(); if (signingKeyName == null) @@ -194,7 +215,7 @@ class PluginUpdateRunner extends UpdateRunner { statusDone("" + _("Plugin signature verification of {0} failed", url) + ""); return; } - } else { + } else if (_context.getBooleanProperty(PROP_ALLOW_NEW_KEYS)) { // add to keyring... if(!up.addKey(pubkey, signer)) { // bad or duplicate key @@ -218,6 +239,14 @@ class PluginUpdateRunner extends UpdateRunner { statusDone("" + _("Plugin signature verification of {0} failed", url) + ""); return; } + } else { + // unknown key + f.delete(); + to.delete(); + _log.error("Untrusted plugin key \"" + pubkey + "\" for plugin signer \"" + signer + "\""); + // don't display signer, we're really checking the key not the signer name + statusDone("" + _("Plugin not installed - signer is untrusted") + ""); + return; } String sudVersion = TrustedUpdate.getVersionString(f); diff --git a/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java new file mode 100644 index 0000000000..798782fb25 --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/update/TrustedPluginKeys.java @@ -0,0 +1,52 @@ +package net.i2p.router.update; + +import java.util.HashMap; +import java.util.Map; + +/** + * Plugin keys we know about. + * Contact I2P devs to be added to this list. + * + * @since 0.9.14.1 + */ +class TrustedPluginKeys { + + private static final String[] KEYS = { + + "sponge-plugin@mail.i2p", + "BS8TvZgt7WNkbwCXtwMFsrRALSxjP4P7V5Yl3CATT9VBWjF4UtnDZ4JTQYPbEjCI~3cwPI6tk6X72jRr5ZNJy0v2EA9Kf2QS05O6GjqiXANLqZfXDDjmjPxdaaEJ2L~U36gEbQ8rfeHCKny4tKlLpCIzpNK3psWEt~erBPM1rBA=", + + "volvagia@mail.i2p", + "ksgA0OByutKGRquqc4H6kR~VNrpq2t5JllEvUfHt~Qp1mcsyT3UfP8fXFPPakN9RDkjibfVngx9LnD6KHz72O21JK0tKquKydtaDtCsXw1EZxPEzsIfsy3mJAwtmoMo0mXIReCadl4MgPz5xVjd68i2qdN03i9shxpn0BF68dhY=", + + "dev@robertfoss.se", + "kAOpTC~9jfieoQBFfgQM-Krb2iYYjXsPH1vsWZPqsYDeaRX8~mQotm3M5duYBVa17A1usYodlZbEB2Q2CW0Aub7EiYBYsz1AQYlFrH47Yfl440kbo8Uwjf-SULW7LW9L5rBV~yzDHHmPjuob743o52CKAIM3KDZKNE7eGlLAuOI=", + + "killyourtv@mail.i2p", + "DAVvT6zMcRuzJi3V8DKKV6o0GjXoQsEwnJsFMaVG1Se-KPQjfP8PbgKJDcrFe0zNJfh3yPdsocA~A~s9U6pvimlCXH2pnJGlNNojtFCZC3DleROl5-4EkYw~UKAg940o5yg1OCBVlRZBSrRAQIIjFGkxxPQc12dA~cfpryNk7Dc=", + + "chisquare@mail.i2p", + "MT2mCbqCv2F3m9kXFsk3TKKZJ0xOHcYQ6hBzDqdOPtn2pbjwjve0~4R0uMhMCOvHbQoGRE6W2O~EJbhkIK5vlFQz~OtlzXTZ20N5oqt8KYt9RpbfSxT0LzY23sZd5dAMre9T7xbgrPzp2s94i2WOLK7lBBt59CWlcao194WfWA8=", + + "bitbuck3t@mail.i2p", + "mLLpV1sH1CSgultEHI7TGE6uA0vjl-DYFuhdIPFWTNUTxkXq3U4YogYQmNlOwMcl9bqDHzcMelxyvARe-EQSTlZ846DUfzRqI3B3ANJDVbQr4RIJDkqvp1oKf57B7mZpIoqc6QJC0PG7cpShWBXsTknG1u7lKgjIKhbHDQaOqz0=", + + "HungryHobo@mail.i2p", + "l3G6um9nB9EDLkT9cUusz5fX-GxXSWE5zaj2~V8lUL~XsGuFf8gKqzJLKNkAw0CgDIDsLRHHuUaF7ZHo5Z7HG~9JJU9Il4G2jyNYtg5S8AzG0UxkEt-JeBEqIxv5GDn6OFKr~wTI0UafJbegEWokl-8m-GPWf0vW-yPMjL7y5MI=", + + "zzz-plugin@mail.i2p", + "Z3xbCcZiIA44W65~q4u5Rm9ZZWvBIv1bCvTx8DrbsKefu0PZ1134xzkI~vyXuRmmujvSwTVTfgEnxL81hwmpuB4aXMBLDlBmckspFnGKte~HefYI-6WcK79rnZPvNQCffdgi~EgWnUMYDR20PBWQKaGwajkSb-LOK~l2Z69G6aI=" + + }; + + /** + * @return map of B64 DSA keys to signer names + */ + public static Map getKeys() { + Map rv = new HashMap(KEYS.length / 2); + for (int i = 0; i < KEYS.length; i += 2) { + rv.put(KEYS[i+1], KEYS[i]); + } + return rv; + } +} diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index 32c3f9304e..a13a432f2c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -57,7 +57,8 @@ public class CSSHelper extends HelperBase { */ public void setLang(String lang) { // Protected with nonce in css.jsi - if (lang != null && lang.length() > 0) { + if (lang != null && lang.length() >= 2 && lang.length() <= 6 && + lang.replaceAll("[a-zA-Z_]", "").length() == 0) { Map m = new HashMap(2); int under = lang.indexOf('_'); if (under < 0) { @@ -105,9 +106,9 @@ public class CSSHelper extends HelperBase { try { if (Integer.parseInt(r) < MIN_REFRESH) r = "" + MIN_REFRESH; + _context.router().saveConfig(PROP_REFRESH, r); } catch (Exception e) { } - _context.router().saveConfig(PROP_REFRESH, r); } /** @return refresh time in seconds, as a string */ @@ -117,6 +118,7 @@ public class CSSHelper extends HelperBase { if (Integer.parseInt(r) < MIN_REFRESH) r = "" + MIN_REFRESH; } catch (Exception e) { + r = "" + MIN_REFRESH; } return r; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java index cac07deee0..e5db97f116 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java @@ -21,7 +21,10 @@ public class ConfigAdvancedHandler extends FormHandler { @Override protected void processForm() { if (_shouldSave) { - saveChanges(); + if (isAdvanced()) + saveChanges(); + else + addFormError("Save disabled, edit the router.config file to make changes") ; } else { // noop } @@ -30,7 +33,7 @@ public class ConfigAdvancedHandler extends FormHandler { public void setShouldsave(String moo) { _shouldSave = true; } //public void setRestart(String moo) { _forceRestart = true; } - public void setConfig(String val) { + public void setNofilter_config(String val) { _config = val; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java index d42934e9f2..cbdad00372 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java @@ -3,6 +3,7 @@ package net.i2p.router.web; import java.util.Map; import java.util.TreeMap; +import net.i2p.data.DataHelper; public class ConfigAdvancedHelper extends HelperBase { public ConfigAdvancedHelper() {} @@ -12,10 +13,15 @@ public class ConfigAdvancedHelper extends HelperBase { TreeMap sorted = new TreeMap(); sorted.putAll(_context.router().getConfigMap()); for (Map.Entry e : sorted.entrySet()) { - String name = e.getKey(); - String val = e.getValue(); + String name = DataHelper.escapeHTML(e.getKey()); + String val = DataHelper.escapeHTML(e.getValue()); buf.append(name).append('=').append(val).append('\n'); } return buf.toString(); } + + /** @since 0.9.14.1 */ + public String getConfigFileName() { + return _context.router().getConfigFilename(); + } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index 1c1c28568d..5acdf313b2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -49,16 +49,28 @@ public class ConfigClientsHandler extends FormHandler { saveWebAppChanges(); return; } + boolean pluginsEnabled = PluginStarter.pluginsEnabled(_context); if (_action.equals(_("Save Plugin Configuration"))) { - savePluginChanges(); + if (pluginsEnabled) + savePluginChanges(); + else + addFormError("Plugins disabled"); return; } if (_action.equals(_("Install Plugin"))) { - installPlugin(); + if (pluginsEnabled && + (_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_PLUGIN_INSTALL) || + isAdvanced())) + installPlugin(); + else + addFormError("Plugins disabled"); return; } if (_action.equals(_("Update All Installed Plugins"))) { - updateAllPlugins(); + if (pluginsEnabled) + updateAllPlugins(); + else + addFormError("Plugins disabled"); return; } // value @@ -72,10 +84,14 @@ public class ConfigClientsHandler extends FormHandler { startClient(appnum); } else { List plugins = PluginStarter.getPlugins(); - if (plugins.contains(app)) - startPlugin(app); - else + if (plugins.contains(app)) { + if (pluginsEnabled) + startPlugin(app); + else + addFormError("Plugins disabled"); + } else { startWebApp(app); + } } return; } @@ -89,7 +105,7 @@ public class ConfigClientsHandler extends FormHandler { } catch (NumberFormatException nfe) {} if (appnum >= 0) { deleteClient(appnum); - } else { + } else if (pluginsEnabled) { try { PluginStarter.stopPlugin(_context, app); } catch (ClassNotFoundException cnfe) { @@ -107,6 +123,8 @@ public class ConfigClientsHandler extends FormHandler { addFormError(_("Error deleting plugin {0}", app) + ": " + e); _log.error("Error deleting plugin " + app, e); } + } else { + addFormError("Plugins disabled"); } return; } @@ -125,8 +143,12 @@ public class ConfigClientsHandler extends FormHandler { List plugins = PluginStarter.getPlugins(); if (plugins.contains(app)) { try { - PluginStarter.stopPlugin(_context, app); - addFormNotice(_("Stopped plugin {0}", app)); + if (pluginsEnabled) { + PluginStarter.stopPlugin(_context, app); + addFormNotice(_("Stopped plugin {0}", app)); + } else { + addFormError("Plugins disabled"); + } } catch (Throwable e) { addFormError(_("Error stopping plugin {0}", app) + ": " + e); _log.error("Error stopping plugin " + app, e); @@ -141,15 +163,23 @@ public class ConfigClientsHandler extends FormHandler { // value if (_action.startsWith("Update ")) { - String app = _action.substring(7); - updatePlugin(app); + if (pluginsEnabled) { + String app = _action.substring(7); + updatePlugin(app); + } else { + addFormError("Plugins disabled"); + } return; } // value if (_action.startsWith("Check ")) { - String app = _action.substring(6); - checkPlugin(app); + if (pluginsEnabled) { + String app = _action.substring(6); + checkPlugin(app); + } else { + addFormError("Plugins disabled"); + } return; } @@ -167,10 +197,14 @@ public class ConfigClientsHandler extends FormHandler { startClient(appnum); } else { List plugins = PluginStarter.getPlugins(); - if (plugins.contains(app)) - startPlugin(app); - else + if (plugins.contains(app)) { + if (pluginsEnabled) + startPlugin(app); + else + addFormError("Plugins disabled"); + } else { startWebApp(app); + } } } else { //addFormError(_("Unsupported") + ' ' + _action + '.'); @@ -186,38 +220,45 @@ public class ConfigClientsHandler extends FormHandler { if (! (RouterConsoleRunner.class.getName().equals(ca.className))) ca.disabled = val == null; // edit of an existing entry - String desc = getJettyString("desc" + cur); - if (desc != null) { - int spc = desc.indexOf(" "); - String clss = desc; - String args = null; - if (spc >= 0) { - clss = desc.substring(0, spc); - args = desc.substring(spc + 1); + if (_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_CLIENT_CHANGE) || + isAdvanced()) { + String desc = getJettyString("desc" + cur); + if (desc != null) { + int spc = desc.indexOf(" "); + String clss = desc; + String args = null; + if (spc >= 0) { + clss = desc.substring(0, spc); + args = desc.substring(spc + 1); + } + ca.className = clss; + ca.args = args; + ca.clientName = getJettyString("name" + cur); } - ca.className = clss; - ca.args = args; - ca.clientName = getJettyString("name" + cur); } } - int newClient = clients.size(); - String newDesc = getJettyString("desc" + newClient); - if (newDesc != null && newDesc.trim().length() > 0) { - // new entry - int spc = newDesc.indexOf(" "); - String clss = newDesc; - String args = null; - if (spc >= 0) { - clss = newDesc.substring(0, spc); - args = newDesc.substring(spc + 1); + // new client + if (_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_CLIENT_CHANGE) || + isAdvanced()) { + int newClient = clients.size(); + String newDesc = getJettyString("desc" + newClient); + if (newDesc != null && newDesc.trim().length() > 0) { + // new entry + int spc = newDesc.indexOf(" "); + String clss = newDesc; + String args = null; + if (spc >= 0) { + clss = newDesc.substring(0, spc); + args = newDesc.substring(spc + 1); + } + String name = getJettyString("name" + newClient); + if (name == null || name.trim().length() <= 0) name = "new client"; + ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000, + _settings.get(newClient + ".enabled") != null); + clients.add(ca); + addFormNotice(_("New client added") + ": " + name + " (" + clss + ")."); } - String name = getJettyString("name" + newClient); - if (name == null || name.trim().length() <= 0) name = "new client"; - ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000, - _settings.get(newClient + ".enabled") != null); - clients.add(ca); - addFormNotice(_("New client added") + ": " + name + " (" + clss + ")."); } ClientAppConfig.writeClientAppConfig(_context, clients); @@ -323,7 +364,7 @@ public class ConfigClientsHandler extends FormHandler { File path = new File(_context.getBaseDir(), "webapps"); path = new File(path, app + ".war"); WebAppStarter.startWebApp(_context, s, app, path.getAbsolutePath()); - addFormNotice(_("WebApp") + " " + _(app) + " " + _("started") + '.'); + addFormNoticeNoEscape(_("WebApp") + " " + _(app) + " " + _("started") + '.'); } catch (Throwable e) { addFormError(_("Failed to start") + ' ' + _(app) + " " + e + '.'); _log.error("Failed to start webapp " + app, e); @@ -433,7 +474,7 @@ public class ConfigClientsHandler extends FormHandler { if (intfc != null) changes.put(ClientManagerFacadeImpl.PROP_CLIENT_HOST, intfc); String user = getJettyString("user"); - String pw = getJettyString("pw"); + String pw = getJettyString("nofilter_pw"); if (user != null && pw != null && user.length() > 0 && pw.length() > 0) { ConsolePasswordManager mgr = new ConsolePasswordManager(_context); mgr.saveHash(ConfigClientsHelper.PROP_AUTH, user, pw); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index c1463000bc..843fef7373 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -26,9 +26,22 @@ public class ConfigClientsHelper extends HelperBase { public static final String PROP_ENABLE_SSL = "i2cp.SSL"; /** from ClientMessageEventListener */ public static final String PROP_AUTH = "i2cp.auth"; + public static final String PROP_ENABLE_CLIENT_CHANGE = "routerconsole.enableClientChange"; + public static final String PROP_ENABLE_PLUGIN_INSTALL = "routerconsole.enablePluginInstall"; public ConfigClientsHelper() {} + /** @since 0.9.14.1 */ + public boolean isClientChangeEnabled() { + return _context.getBooleanProperty(PROP_ENABLE_CLIENT_CHANGE) || isAdvanced(); + } + + /** @since 0.9.14.1 */ + public boolean isPluginInstallEnabled() { + return PluginStarter.pluginsEnabled(_context) && + (_context.getBooleanProperty(PROP_ENABLE_PLUGIN_INSTALL) || isAdvanced()); + } + /** @since 0.8.3 */ public String getPort() { return _context.getProperty(ClientManagerFacadeImpl.PROP_CLIENT_PORT, @@ -96,6 +109,7 @@ public class ConfigClientsHelper extends HelperBase { .append(_("Control")).append("") .append(_("Class and arguments")).append("
\n"); return buf.toString(); @@ -291,7 +307,7 @@ public class ConfigClientsHelper extends HelperBase { if (showStopButton && (!edit)) buf.append(""); - if (showEditButton && (!edit) && !ro) + if (isClientChangeEnabled() && showEditButton && (!edit) && !ro) buf.append(""); if (showUpdateButton && (!edit) && !ro) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java index 67b409fb90..b38350fb74 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHelper.java @@ -26,7 +26,7 @@ public class ConfigReseedHelper extends HelperBase { } /** @since 0.8.9 */ - public String getPassword() { + public String getNofilter_password() { return _context.getProperty(Reseeder.PROP_PROXY_PASSWORD, ""); } @@ -46,7 +46,7 @@ public class ConfigReseedHelper extends HelperBase { } /** @since 0.8.9 */ - public String getSpassword() { + public String getNofilter_spassword() { return _context.getProperty(Reseeder.PROP_SPROXY_PASSWORD, ""); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java index 5dcff89de4..39dabd77ce 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java @@ -122,7 +122,7 @@ public class ConfigStatsHandler extends FormHandler { addFormNotice(_("Restart required to take effect")); } if (graphsChanged) - addFormNotice(_("Graph list updated, may take up to 60s to be reflected on the {0}Graphs Page{1}", "", "")); + addFormNoticeNoEscape(_("Graph list updated, may take up to 60s to be reflected on the {0}Graphs Page{1}", "", "")); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java index f20c21367a..e9de89c315 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java @@ -35,8 +35,12 @@ public class ConfigUIHandler extends FormHandler { /** note - lang change is handled in CSSHelper but we still need to save it here */ private void saveChanges() { - if (_config == null) + if (_config == null || _config.length() <= 0) return; + if (_config.replaceAll("[a-zA-Z0-9_-]", "").length() != 0) { + addFormError("Bad theme name"); + return; + } Map changes = new HashMap(); List removes = new ArrayList(); String oldTheme = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); @@ -76,7 +80,7 @@ public class ConfigUIHandler extends FormHandler { addFormError(_("No user name entered")); return; } - String pw = getJettyString("pw"); + String pw = getJettyString("nofilter_pw"); if (pw == null || pw.length() <= 0) { addFormError(_("No password entered")); return; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 770ffab2b9..e979587810 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -183,7 +183,7 @@ public class ConfigUIHelper extends HelperBase { "" + ""); buf.append(_("Password")).append(": " + - "" + + "" + "\n"); return buf.toString(); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index cc43d51bb9..b1fb3379c9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -173,10 +173,14 @@ public class ConfigUpdateHandler extends FormHandler { _newsThroughProxy = false; String oldURL = ConfigUpdateHelper.getNewsURL(_context); if ( (oldURL == null) || (!_newsURL.equals(oldURL)) ) { - changes.put(PROP_NEWS_URL, _newsURL); - // this invalidates the news - changes.put(NewsHelper.PROP_LAST_CHECKED, "0"); - addFormNotice(_("Updating news URL to {0}", _newsURL)); + if (isAdvanced()) { + changes.put(PROP_NEWS_URL, _newsURL); + // this invalidates the news + changes.put(NewsHelper.PROP_LAST_CHECKED, "0"); + addFormNotice(_("Updating news URL to {0}", _newsURL)); + } else { + addFormError("Changing news URL disabled"); + } } } @@ -198,7 +202,8 @@ public class ConfigUpdateHandler extends FormHandler { changes.put(PROP_SHOULD_PROXY, Boolean.toString(_updateThroughProxy)); changes.put(PROP_SHOULD_PROXY_NEWS, Boolean.toString(_newsThroughProxy)); - changes.put(PROP_UPDATE_UNSIGNED, Boolean.toString(_updateUnsigned)); + if (isAdvanced()) + changes.put(PROP_UPDATE_UNSIGNED, Boolean.toString(_updateUnsigned)); String oldFreqStr = _context.getProperty(PROP_REFRESH_FREQUENCY, DEFAULT_REFRESH_FREQUENCY); long oldFreq = DEFAULT_REFRESH_FREQ; @@ -232,16 +237,24 @@ public class ConfigUpdateHandler extends FormHandler { oldKeys = oldKeys.replace("\r\n", ","); if (!_trustedKeys.equals(oldKeys)) { // note that keys are not validated here and no console error message will be generated - changes.put(PROP_TRUSTED_KEYS, _trustedKeys); - addFormNotice(_("Updating trusted keys.")); + if (isAdvanced()) { + changes.put(PROP_TRUSTED_KEYS, _trustedKeys); + addFormNotice(_("Updating trusted keys.")); + } else { + addFormError("Changing trusted keys disabled"); + } } } if ( (_zipURL != null) && (_zipURL.length() > 0) ) { String oldURL = _context.router().getConfigSetting(PROP_ZIP_URL); if ( (oldURL == null) || (!_zipURL.equals(oldURL)) ) { - changes.put(PROP_ZIP_URL, _zipURL); - addFormNotice(_("Updating unsigned update URL to {0}", _zipURL)); + if (isAdvanced()) { + changes.put(PROP_ZIP_URL, _zipURL); + addFormNotice(_("Updating unsigned update URL to {0}", _zipURL)); + } else { + addFormError("Changing unsigned update URL disabled"); + } } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java index 1b9e86fa2a..d6882f0a6d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java @@ -160,6 +160,7 @@ public class EventLogHelper extends FormHandler { String xev = _xevents.get(_event); if (xev == null) xev = _event; + xev = DataHelper.escapeHTML(xev); if (events.isEmpty()) { if (isAll) { if (_age == 0) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index b4d147bcc2..5d66bd5a10 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.util.Log; @@ -50,8 +51,8 @@ public abstract class FormHandler { } } - public void setNonce(String val) { _nonce = val; } - public void setAction(String val) { _action = val; } + public void setNonce(String val) { _nonce = val == null ? null : DataHelper.stripHTML(val); } + public void setAction(String val) { _action = val == null ? null : DataHelper.stripHTML(val); } /** * For many forms, it's easiest just to put all the parameters here. @@ -60,6 +61,14 @@ public abstract class FormHandler { */ public void setSettings(Map settings) { _settings = new HashMap(settings); } + /** + * Same as HelperBase + * @since 0.9.14.1 + */ + public boolean isAdvanced() { + return _context.getBooleanProperty(HelperBase.PROP_ADVANCED); + } + /** * setSettings() must have been called previously * Curses Jetty for returning arrays. @@ -101,16 +110,31 @@ public abstract class FormHandler { /** * Add an error message to display + * Use if it does not include a link. + * Escapes '<' and '>' before queueing */ protected void addFormError(String errorMsg) { if (errorMsg == null) return; - _errors.add(errorMsg); + _errors.add(DataHelper.escapeHTML(errorMsg)); } /** * Add a non-error message to display + * Use if it does not include a link. + * Escapes '<' and '>' before queueing */ protected void addFormNotice(String msg) { + if (msg == null) return; + _notices.add(DataHelper.escapeHTML(msg)); + } + + /** + * Add a non-error message to display + * Use if it includes a link or other formatting. + * Does not escape '<' and '>' before queueing + * @since 0.9.14.1 + */ + protected void addFormNoticeNoEscape(String msg) { if (msg == null) return; _notices.add(msg); } @@ -179,7 +203,7 @@ public abstract class FormHandler { } // To prevent actions with GET, jsps must call storeMethod() if (_method != null && !"POST".equals(_method)) { - addFormError("Invalid form submission, requires POST not " + _method); + addFormError("Invalid form submission, requires POST"); _valid = false; return; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index baad6df997..5d385024f1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -671,9 +671,9 @@ public class PluginStarter implements Runnable { for(ClientAppConfig app : apps) { // If the client is a running ClientApp that we want to stop, // bypass all the logic below. - ClientApp ca = ctx.routerAppManager().getClientApp(app.className, LoadClientAppsJob.parseArgs(app.args)); - if (ca != null && ca.getState() == ClientAppState.RUNNING) { - if (action.equals("stop")) { + if (action.equals("stop")) { + ClientApp ca = ctx.routerAppManager().getClientApp(app.className, LoadClientAppsJob.parseArgs(app.args)); + if (ca != null && ca.getState() == ClientAppState.RUNNING) { try { ca.shutdown(LoadClientAppsJob.parseArgs(app.stopargs)); } catch (Throwable t) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 6d9a7769bc..e2f2ea0af1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -818,19 +818,19 @@ public class SummaryHelper extends HelperBase { /* below here is stuff we need to get from summarynoframe.jsp to SummaryBarRenderer */ private String _action; - public void setAction(String s) { _action = s; } + public void setAction(String s) { _action = s == null ? null : DataHelper.stripHTML(s); } public String getAction() { return _action; } private String _consoleNonce; - public void setConsoleNonce(String s) { _consoleNonce = s; } + public void setConsoleNonce(String s) { _consoleNonce = s == null ? null : DataHelper.stripHTML(s); } public String getConsoleNonce() { return _consoleNonce; } private String _updateNonce; - public void setUpdateNonce(String s) { _updateNonce = s; } + public void setUpdateNonce(String s) { _updateNonce = s == null ? null : DataHelper.stripHTML(s); } public String getUpdateNonce() { return _updateNonce; } private String _requestURI; - public void setRequestURI(String s) { _requestURI = s; } + public void setRequestURI(String s) { _requestURI = s == null ? null : DataHelper.stripHTML(s); } /** * @return non-null; "/home" if (strangely) not set by jsp diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 76a79c6928..c6f0e78fbb 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -24,13 +24,20 @@ <%@include file="formhandler.jsi" %>
+<% if (advancedhelper.isAdvanced()) { %>
+<% } // isAdvanced %>

<%=intl._("Advanced I2P Configuration")%>

-
+
+<% if (advancedhelper.isAdvanced()) { %>
" > " >
<%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%> -
+ +<% } else { %> +<%=intl._("To make changes, edit the file {0}.", "" + advancedhelper.getConfigFileName() + "")%> +<% } // isAdvanced %> + diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 2137e317c3..8bbfef188f 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -39,7 +39,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <%=intl._("All changes require restart to take effect.")%>

" /> -<% if (request.getParameter("edit") == null) { %> +<% if (clientshelper.isClientChangeEnabled() && request.getParameter("edit") == null) { %> " /> <% } %> " /> @@ -80,7 +80,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <%=intl._("Username")%>:
<%=intl._("Password")%>: -
+

<%=intl._("The default settings will work for most people.")%> <%=intl._("Any changes made here must also be configured in the external client.")%> <%=intl._("Many clients do not support SSL or authorization.")%> @@ -117,6 +117,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } " />

+<% if (clientshelper.isPluginInstallEnabled()) { %>

<%=intl._("Plugin Installation")%>

<%=intl._("Look for available plugins on {0}.", "plugins.i2p")%> <%=intl._("To install a plugin, enter the download URL:")%> @@ -132,5 +133,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }

" />
-<% } %> +<% + } // pluginInstallEnabled + } // showPlugins +%> diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index 3e306c7584..da667ace1d 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -52,7 +52,7 @@ <%=intl._("HTTP Proxy Username")%>: " > <%=intl._("HTTP Proxy Password")%>: -" > +" > diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index c29a9a95da..68d661e82a 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -41,7 +41,7 @@ <% } %>
<%=intl._("News URL")%>: - "> + readonly="readonly"<% } %> value=""> <%=intl._("Refresh frequency")%>: <% if (updatehelper.canInstall()) { %> @@ -64,11 +64,11 @@ <%=intl._("Trusted keys")%>: - <% } // if isAdvanced %> <%=intl._("Update with unsigned development builds?")%> <%=intl._("Unsigned Build URL")%>: "> + <% } // if isAdvanced %> <% } else { %> <%=intl._("Updates will be dispatched via your package manager.")%> <% } // if canInstall %> diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi index 64f2733a8b..50c70d875c 100644 --- a/apps/routerconsole/jsp/css.jsi +++ b/apps/routerconsole/jsp/css.jsi @@ -30,8 +30,11 @@ images/favicon.ico"> <% // clickjacking - if (intl.shouldSendXFrame()) + if (intl.shouldSendXFrame()) { response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); + } String conNonceParam = request.getParameter("consoleNonce"); if (intl.getNonce().equals(conNonceParam)) { diff --git a/apps/routerconsole/jsp/flags.jsp b/apps/routerconsole/jsp/flags.jsp index 92d180289c..b88b37b464 100644 --- a/apps/routerconsole/jsp/flags.jsp +++ b/apps/routerconsole/jsp/flags.jsp @@ -12,7 +12,9 @@ * with headers set so the browser caches. */ String c = request.getParameter("c"); -if (c != null && c.length() > 0) { +if (c != null && + (c.length() == 2 || c.length() == 7) && + c.replaceAll("[a-z_]", "").length() == 0) { java.io.OutputStream cout = response.getOutputStream(); String base = net.i2p.I2PAppContext.getGlobalContext().getBaseDir().getAbsolutePath(); String file = "docs" + java.io.File.separatorChar + "icons" + java.io.File.separatorChar + diff --git a/apps/routerconsole/jsp/summary.jsi b/apps/routerconsole/jsp/summary.jsi index d38637d836..d9f62f247d 100644 --- a/apps/routerconsole/jsp/summary.jsi +++ b/apps/routerconsole/jsp/summary.jsi @@ -17,9 +17,14 @@ if (d == null || "".equals(d)) d = intl.getRefresh(); else { - d = net.i2p.data.DataHelper.stripHTML(d); // XSS + long delay; + try { + delay = Long.parseLong(d); + } catch (NumberFormatException nfe) { + delay = 60; + } // pass the new delay parameter to the iframe - newDelay = "?refresh=" + d; + newDelay = "?refresh=" + delay; // update disable boolean intl.setDisableRefresh(d); } diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index 4af6be78f4..cb27feab22 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -22,12 +22,13 @@ "Shutdown immediately".equals(action) || "Restart immediately".equals(action); if (!shutdownSoon) { if (d == null || "".equals(d)) { - d = intl.getRefresh(); - } else { + // set below + } else if (intl.getNonce().equals(conNonceParam)) { d = net.i2p.data.DataHelper.stripHTML(d); // XSS intl.setRefresh(d); intl.setDisableRefresh(d); } + d = intl.getRefresh(); // we probably don't get here if d == "0" since caught in summary.jsi, but just // to be sure... if (!intl.getDisableRefresh()) { @@ -46,7 +47,7 @@ long delay = 60; try { delay = Long.parseLong(d); } catch (NumberFormatException nfe) {} if (delay*1000 < timeleft + 5000) - out.print("\n"); + out.print("\n"); else shutdownSoon = true; } diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp index ff621d92b6..c353bbaf60 100644 --- a/apps/routerconsole/jsp/viewprofile.jsp +++ b/apps/routerconsole/jsp/viewprofile.jsp @@ -14,10 +14,11 @@
<% String peerB64 = request.getParameter("peer"); - if (peerB64 == null || peerB64.length() <= 0) { + if (peerB64 == null || peerB64.length() <= 0 || + peerB64.replaceAll("[a-zA-Z0-9~=-]", "").length() != 0) { out.print("No peer specified"); } else { - peerB64 = net.i2p.data.DataHelper.stripHTML(peerB64); // XSS + %> " /> diff --git a/apps/routerconsole/jsp/viewstat.jsp b/apps/routerconsole/jsp/viewstat.jsp index bdc013ae59..6a7907ebcb 100644 --- a/apps/routerconsole/jsp/viewstat.jsp +++ b/apps/routerconsole/jsp/viewstat.jsp @@ -84,9 +84,11 @@ if ( !rendered && ((rs != null) || fakeBw) ) { * a huge load for a page full of graphs if there's a problem */ if (!rendered) { - if (stat != null) + if (stat != null) { + stat = net.i2p.data.DataHelper.stripHTML(stat); response.sendError(403, "The stat " + stat + " is not available, it must be enabled for graphing on the stats configuration page."); - else + } else { response.sendError(403, "No stat specified"); + } } %> \ No newline at end of file diff --git a/apps/routerconsole/jsp/web.xml b/apps/routerconsole/jsp/web.xml index f519312e4d..67f0b4ca6e 100644 --- a/apps/routerconsole/jsp/web.xml +++ b/apps/routerconsole/jsp/web.xml @@ -4,6 +4,15 @@ "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + diff --git a/apps/routerconsole/locale-countries/messages_nb.po b/apps/routerconsole/locale-countries/messages_nb.po index 63d8f8c424..2e5f3f377a 100644 --- a/apps/routerconsole/locale-countries/messages_nb.po +++ b/apps/routerconsole/locale-countries/messages_nb.po @@ -2,29 +2,29 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: -# Mikal , 2013. +# Allan Nordhøy , 2014 +# Mikal , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-01-29 18:50+0000\n" -"Last-Translator: mikalv \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/" -"language/nb/)\n" -"Language: nb\n" +"POT-Creation-Date: 2013-10-14 13:33+0000\n" +"PO-Revision-Date: 2014-06-24 22:44+0000\n" +"Last-Translator: Allan Nordhøy \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" -msgstr "" +msgstr "Anonym mellomtjener" msgid "Satellite Provider" -msgstr "" +msgstr "Satelitt-tilbyder" msgid "Andorra" msgstr "Andorra" @@ -72,7 +72,7 @@ msgid "Aruba" msgstr "Aruba" msgid "Åland Islands" -msgstr "" +msgstr "Åland" msgid "Azerbaijan" msgstr "Azerbaijan" @@ -138,7 +138,7 @@ msgid "Canada" msgstr "Canada" msgid "Cocos (Keeling) Islands" -msgstr "" +msgstr "Kokos (Keeling) -øyene" msgid "The Democratic Republic of the Congo" msgstr "Den demokratiske republikken Kongo" @@ -174,7 +174,7 @@ msgid "Costa Rica" msgstr "Costa Rica" msgid "Serbia and Montenegro" -msgstr "" +msgstr "Serbia og Montenegro" msgid "Cuba" msgstr "Cuba" @@ -183,10 +183,10 @@ msgid "Cape Verde" msgstr "Cape Verde" msgid "Curaçao" -msgstr "" +msgstr "Curaçao" msgid "Christmas Island" -msgstr "" +msgstr "Christmasøya" msgid "Cyprus" msgstr "Cyprus" @@ -222,7 +222,7 @@ msgid "Egypt" msgstr "Egypt" msgid "Western Sahara" -msgstr "" +msgstr "Vest-Sahara" msgid "Eritrea" msgstr "Eritrea" @@ -234,7 +234,7 @@ msgid "Ethiopia" msgstr "Ethiopia" msgid "European Union" -msgstr "" +msgstr "Den europeiske union" msgid "Finland" msgstr "Finland" @@ -270,7 +270,7 @@ msgid "French Guiana" msgstr "French Guiana" msgid "Guernsey" -msgstr "" +msgstr "Guernsey" msgid "Ghana" msgstr "Ghana" @@ -336,7 +336,7 @@ msgid "Israel" msgstr "Israel" msgid "Isle of Man" -msgstr "" +msgstr "Man" msgid "India" msgstr "India" @@ -357,7 +357,7 @@ msgid "Italy" msgstr "Italia" msgid "Jersey" -msgstr "" +msgstr "Jersey" msgid "Jamaica" msgstr "Jamaica" @@ -387,7 +387,7 @@ msgid "Saint Kitts and Nevis" msgstr "Saint Kitts og Nevis" msgid "The Democratic People's Republic of Korea" -msgstr "" +msgstr "Nord-Korea" msgid "Republic of Korea" msgstr "Korea" @@ -444,10 +444,10 @@ msgid "Republic of Moldova" msgstr "Republic of Moldova" msgid "Montenegro" -msgstr "" +msgstr "Montenegro" msgid "Saint Martin" -msgstr "" +msgstr "Saint Martin" msgid "Madagascar" msgstr "Madagascar" @@ -567,7 +567,7 @@ msgid "Saint Pierre and Miquelon" msgstr "Saint Pierre og Miquelon" msgid "Pitcairn Islands" -msgstr "" +msgstr "Pitcairnøyene" msgid "Puerto Rico" msgstr "Puerto Rico" @@ -588,7 +588,7 @@ msgid "Qatar" msgstr "Qatar" msgid "Réunion" -msgstr "" +msgstr "Réunion" msgid "Romania" msgstr "Romania" @@ -621,13 +621,13 @@ msgid "Singapore" msgstr "Singapore" msgid "Saint Helena" -msgstr "" +msgstr "St. Helena" msgid "Slovenia" msgstr "Slovenia" msgid "Svalbard and Jan Mayen" -msgstr "" +msgstr "Svalbard og Jan Mayen" msgid "Slovakia" msgstr "Slovakia" @@ -763,4 +763,3 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_nl.po b/apps/routerconsole/locale-countries/messages_nl.po index 63cbc62190..5a15f2b407 100644 --- a/apps/routerconsole/locale-countries/messages_nl.po +++ b/apps/routerconsole/locale-countries/messages_nl.po @@ -2,25 +2,27 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: -# ducki2p , 2011. -# foo , 2009. -# , 2012. -# , 2012. +# Aman Elarbi , 2014 +# ducki2p , 2011 +# foo , 2009 +# Jrnr601 , 2012 +# Desirius , 2014 +# attesor , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2012-08-25 19:21+0000\n" -"Last-Translator: attesor \n" +"POT-Creation-Date: 2013-10-14 13:33+0000\n" +"PO-Revision-Date: 2014-07-02 12:22+0000\n" +"Last-Translator: Desirius \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" msgstr "Anonieme Proxy" @@ -140,7 +142,7 @@ msgid "Canada" msgstr "Canada" msgid "Cocos (Keeling) Islands" -msgstr "" +msgstr "Cocoseilanden (Keelingeilanden)" msgid "The Democratic Republic of the Congo" msgstr "Congo, Democratische Republiek" @@ -176,7 +178,7 @@ msgid "Costa Rica" msgstr "Costa Rica" msgid "Serbia and Montenegro" -msgstr "" +msgstr "Servië en Montenegro" msgid "Cuba" msgstr "Cuba" @@ -185,10 +187,10 @@ msgid "Cape Verde" msgstr "Kaapverdië" msgid "Curaçao" -msgstr "" +msgstr "Curaçao" msgid "Christmas Island" -msgstr "" +msgstr "Christmas Eiland" msgid "Cyprus" msgstr "Cyprus" @@ -224,7 +226,7 @@ msgid "Egypt" msgstr "Egypte" msgid "Western Sahara" -msgstr "" +msgstr "West-Sahara" msgid "Eritrea" msgstr "Eritrea" @@ -272,7 +274,7 @@ msgid "French Guiana" msgstr "Frans-Guyana" msgid "Guernsey" -msgstr "" +msgstr "Guernsey" msgid "Ghana" msgstr "Ghana" @@ -389,7 +391,7 @@ msgid "Saint Kitts and Nevis" msgstr "Saint Kitts en Nevis" msgid "The Democratic People's Republic of Korea" -msgstr "" +msgstr "De Democratische Volksrepubliek Korea" msgid "Republic of Korea" msgstr "Republiek Korea" @@ -569,7 +571,7 @@ msgid "Saint Pierre and Miquelon" msgstr "Saint-Pierre en Miquelon" msgid "Pitcairn Islands" -msgstr "" +msgstr "Pitcairneilanden" msgid "Puerto Rico" msgstr "Puerto Rico" @@ -590,7 +592,7 @@ msgid "Qatar" msgstr "Qatar" msgid "Réunion" -msgstr "" +msgstr "Reunion" msgid "Romania" msgstr "Roemenië" @@ -623,13 +625,13 @@ msgid "Singapore" msgstr "Singapore" msgid "Saint Helena" -msgstr "" +msgstr "Sint-Helena" msgid "Slovenia" msgstr "Slovenië" msgid "Svalbard and Jan Mayen" -msgstr "" +msgstr "Spitsbergen en Jan Mayen" msgid "Slovakia" msgstr "Slowakije" @@ -731,7 +733,7 @@ msgid "Holy See (Vatican City State)" msgstr "Vaticaanstad" msgid "Saint Vincent and the Grenadines" -msgstr "Saint Vincent en de Grenadines" +msgstr "Sint Vincent en de Grenadines" msgid "Venezuela" msgstr "Venezuela" @@ -765,4 +767,3 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-news/messages_zh.po b/apps/routerconsole/locale-news/messages_zh.po index 94c7ddd293..a8006d1d1a 100644 --- a/apps/routerconsole/locale-news/messages_zh.po +++ b/apps/routerconsole/locale-news/messages_zh.po @@ -4,14 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# xkimo_daeee , 2014 # walking , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-13 21:46+0000\n" -"PO-Revision-Date: 2014-02-23 16:51+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2014-07-01 16:04+0000\n" +"Last-Translator: xkimo_daeee \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,4 +63,4 @@ msgstr "当页面左侧出现 \"共享客户端\" 目标后，请{0}看看{1}我 msgid "" "Point your IRC client to {0}localhost:6668{1} and say hi to us on " "{2}#i2p{3}." -msgstr "" +msgstr "指向你的IRC客户端到 {0}localhost:6668{1} 并在{2}#i2p{3}上和我们打招呼." diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 78cfd88fba..0162982f6e 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -11,7 +11,7 @@ # ducki2p , 2011 # Ettore Atalan , 2014 # foo , 2009 -# echeloni2p , 2014 +# Lars Schimmer , 2014 # Ashoka , 2013 # mixxy, 2011 # nextloop , 2013 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-04-15 18:21+0000\n" +"PO-Revision-Date: 2014-05-21 20:41+0000\n" "Last-Translator: blabla \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" @@ -79,14 +79,14 @@ msgstr[1] "{0} Stunden" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1498 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342 msgid "n/a" -msgstr "Nicht verfügbar" +msgstr "nicht verfügbar" #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1501 #, java-format msgid "1 day" msgid_plural "{0} days" -msgstr[0] "1 Tag" +msgstr[0] "einen Tag" msgstr[1] "{0} Tage" #: ../../../router/java/src/net/i2p/router/Blocklist.java:144 @@ -143,32 +143,32 @@ msgstr "Weise Tunnelanfragen ab: Initialisieren" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:159 msgid "Rejecting tunnels: High message delay" -msgstr "Weise Tunnelanfragen zurück: Hohe Nachrichtenlatenz" +msgstr "Weise Tunnelanfragen zurück: hohe Nachrichtenlatenz" #. hard to do {0} from here #. setTunnelStatus("Rejecting " + (100 - (int) probAccept*100) + "% of #. tunnels: High number of requests"); #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196 msgid "Rejecting most tunnels: High number of requests" -msgstr "Weise Tunnelanfragen zurück: Hohe Anzahl an Anfragen" +msgstr "Weise Tunnelanfragen zurück: hohe Anzahl an Anfragen" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:247 msgid "Rejecting tunnels: Limit reached" -msgstr "Weise Tunnelanfragen zurück: Limit erreicht" +msgstr "Weise Tunnelanfragen zurück: Begrenzung erreicht" #. .067KBps #. * also limited to 90% - see below #. always leave at least 4KBps free when allowing #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:310 msgid "Rejecting tunnels: Bandwidth limit" -msgstr "Weise Tunnelanfragen zurück: Bandbreitenlimit erreicht" +msgstr "Weise Tunnelanfragen zurück: Bandbreitenbeschränkung erreicht" #. hard to do {0} from here #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels: #. Bandwidth limit"); #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:380 msgid "Rejecting most tunnels: Bandwidth limit" -msgstr "Weise die meisten Tunnelanfragen zurück: Bandbreitenlimit erreicht" +msgstr "Weise die meisten Tunnelanfragen zurück: Bandbreitenbeschränkung erreicht" #. hard to do {0} from here #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of @@ -322,11 +322,11 @@ msgstr "Richtung" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589 msgid "Inbound connection" -msgstr "Eingehende Verbindungen" +msgstr "eingehende Verbindungen" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591 msgid "Outbound connection" -msgstr "Ausgehende Verbindungen" +msgstr "ausgehende Verbindungen" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593 msgid "They offered to introduce us (help other peers traverse our firewall)" @@ -339,20 +339,20 @@ msgstr "Wir bieten an, sie bekannt zu machen (anderen Teilnehmern helfen, ihre F #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596 msgid "How long since a packet has been received / sent" -msgstr "Vergangene Zeit seit ein Paket empfangen/gesendet wurde" +msgstr "vergangene Zeit seit ein Paket empfangen/gesendet wurde" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530 msgid "Idle" -msgstr "Untätig" +msgstr "untätig" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 msgid "In/Out" -msgstr "Ein-/Ausgehend" +msgstr "ein-/ausgehend" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)" @@ -360,14 +360,14 @@ msgstr "Die geglättete ein-/ausgehende Transferrate (KBytes pro Sekunde)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598 msgid "How long ago this connection was established" -msgstr "Wie lange die Verbindung schon besteht" +msgstr "wie lange die Verbindung schon besteht" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540 #: ../java/src/net/i2p/router/web/SummaryHelper.java:877 msgid "Up" -msgstr "Verbunden" +msgstr "verbunden" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127 @@ -377,7 +377,7 @@ msgstr "Differenz" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 msgid "The difference between the peer's clock and your own" -msgstr "Der Unterschied zwischen Ihrer und der Uhr des Teilnehmers" +msgstr "Unterschied zwischen Ihrer und der Uhr des Teilnehmers" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600 msgid "" @@ -387,42 +387,42 @@ msgstr "Der Pufferspeicher, der angibt, wieviele Bytes Sie ohne Bestätigung sen #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 msgid "The number of sent messages awaiting acknowledgement" -msgstr "Die Anzahl der gesendeten Nachrichten, die auf Bestätigung warten" +msgstr "Anzahl der gesendeten Nachrichten, die auf Bestätigung warten" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602 msgid "The maximum number of concurrent messages to send" -msgstr "Die maximale Anzahl von gleichzeitig sendbaren Nachrichten" +msgstr "maximale Anzahl von gleichzeitig sendbaren Nachrichten" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603 msgid "The number of pending sends which exceed congestion window" -msgstr "Die Anzahl der ausstehenden Sendeanforderungen, die den Pufferspeicher überschreiten." +msgstr "Anzahl der ausstehenden Sendeanforderungen, die den Pufferspeicher überschreiten." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604 msgid "The slow start threshold" -msgstr "Der Grenzwert zum verzögertem Starten" +msgstr "Grenzwert zum verzögertem Starten" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605 msgid "The round trip time in milliseconds" -msgstr "Die Rundenzeit zum Server und zurück in Millisekunden" +msgstr "Rundenzeit zum Server und zurück in Millisekunden" #. "").append(_("Dev")).append(": ").append(_("The #. standard deviation of the round trip time in #. milliseconds")).append("
\n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607 msgid "The retransmit timeout in milliseconds" -msgstr "Der Timeout beim erneuten Senden (in Millisekunden)" +msgstr "Timeout beim erneuten Senden (in Millisekunden)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608 msgid "" "Current maximum send packet size / estimated maximum receive packet size " "(bytes)" -msgstr "Derzeit maximale Größe der gesendeten Pakete / geschätzte maximale Größe der empfangenen Pakete (Bytes)" +msgstr "derzeit maximale Größe der gesendeten Pakete / geschätzte maximale Größe der empfangenen Pakete (Bytes)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559 msgid "TX" -msgstr "Gesendet" +msgstr "gesendet" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609 msgid "The total number of packets sent to the peer" @@ -432,7 +432,7 @@ msgstr "Gesamtanzahl der an den Teilnehmer gesendeten Pakete" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561 msgid "RX" -msgstr "Empfangen" +msgstr "empfangen" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 msgid "The total number of packets received from the peer" @@ -441,7 +441,7 @@ msgstr "Gesamtanzahl der vom Teilnehmer empfangenen Pakete" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564 msgid "Dup TX" -msgstr "Mehrfach gesendet" +msgstr "mehrfach gesendet" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 msgid "The total number of packets retransmitted to the peer" @@ -450,7 +450,7 @@ msgstr "Gesamtanzahl der an den Teilnehmer erneut gesendeten Pakete" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566 msgid "Dup RX" -msgstr "Mehrfach empfangen" +msgstr "mehrfach empfangen" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 msgid "The total number of duplicate packets received from the peer" @@ -581,7 +581,7 @@ msgstr "UPnP ist nicht aktiviert." #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632 #, java-format msgid "Excessive clock skew: {0}" -msgstr "Zu hohe Abweichung der Uhrzeit: {0}" +msgstr "zu hohe Abweichung der Uhrzeit: {0}" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116 msgid "NTCP connections" @@ -590,7 +590,7 @@ msgstr "NTCP-Verbindungen" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520 msgid "Limit" -msgstr "Obere Grenze" +msgstr "obere Grenze" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 @@ -636,7 +636,7 @@ msgstr "UDP-Verbindungen" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526 msgid "Sort by peer hash" -msgstr "Nach Router Prüfsumme sortieren" +msgstr "Nach Router-Prüfsumme sortieren" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528 msgid "Direction/Introduction" diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po index 52037c2148..a479235d7f 100644 --- a/apps/routerconsole/locale/messages_en.po +++ b/apps/routerconsole/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -26,7 +26,7 @@ msgstr "" #. {0,number,####} prevents 1234 from being output as 1,234 in the English locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1484 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1518 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -35,7 +35,7 @@ msgstr[1] "" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1488 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1522 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -44,7 +44,7 @@ msgstr[1] "" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1492 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1526 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -53,20 +53,20 @@ msgstr[1] "" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1496 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1530 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1498 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:342 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1532 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 msgid "n/a" msgstr "" #. days -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1501 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -98,19 +98,19 @@ msgid "IPs Permanently Banned" msgstr "" #: ../../../router/java/src/net/i2p/router/Blocklist.java:863 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "From" msgstr "" #: ../../../router/java/src/net/i2p/router/Blocklist.java:865 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "To" msgstr "" #: ../../../router/java/src/net/i2p/router/Blocklist.java:901 -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:47 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:655 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:453 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:458 msgid "none" msgstr "" @@ -170,36 +170,38 @@ msgstr "" msgid "Rejecting tunnels" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:162 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:176 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:22 msgid "Reseeding" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:174 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:188 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:181 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:195 msgid "Reseed failed." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:182 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:196 #, java-format msgid "See {0} for help." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:183 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:197 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:329 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:361 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:466 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:387 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:418 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:550 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -232,7 +234,7 @@ msgstr "" msgid "Known fast peers" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:362 +#: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:373 msgid "NetDb entry" msgstr "" @@ -241,193 +243,193 @@ msgstr "" msgid "No transports (hidden or starting up?)" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:502 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:505 msgid "Unreachable on any transport" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:557 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:560 msgid "Router Transport Addresses" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:565 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:568 #, java-format msgid "{0} is used for outbound connections only" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:581 -#: ../java/src/net/i2p/router/web/HomeHelper.java:32 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584 +#: ../java/src/net/i2p/router/web/HomeHelper.java:33 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:164 msgid "Help" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:582 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:585 msgid "" "Your transport connection limits are automatically set based on your " "configured bandwidth." msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:584 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587 msgid "" "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and " "i2np.udp.maxConnections=nnn on the advanced configuration page." msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:586 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 msgid "Definitions" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1121 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2524 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1169 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2537 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:86 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:199 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 msgid "Peer" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:587 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:590 msgid "The remote peer, identified by router hash" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:588 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1122 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1170 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 msgid "Dir" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:589 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:592 msgid "Inbound connection" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:591 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:594 msgid "Outbound connection" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:593 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596 msgid "They offered to introduce us (help other peers traverse our firewall)" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:595 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598 msgid "We offered to introduce them (help other peers traverse their firewall)" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 msgid "How long since a packet has been received / sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:596 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1124 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2530 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1172 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543 msgid "Idle" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1125 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1173 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:597 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 msgid "How long ago this connection was established" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:598 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1126 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2540 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:877 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1174 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2553 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:885 msgid "Up" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1127 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1175 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555 msgid "Skew" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:599 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602 msgid "The difference between the peer's clock and your own" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:600 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603 msgid "" "The congestion window, which is how many bytes can be sent without an " "acknowledgement" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604 msgid "The number of sent messages awaiting acknowledgement" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:602 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605 msgid "The maximum number of concurrent messages to send" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:603 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:606 msgid "The number of pending sends which exceed congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607 msgid "The slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608 msgid "The round trip time in milliseconds" msgstr "" #. "").append(_("Dev")).append(": ").append(_("The standard deviation of the round trip time in milliseconds")).append("
\n" + -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:607 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 msgid "The retransmit timeout in milliseconds" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:608 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 msgid "" "Current maximum send packet size / estimated maximum receive packet size " "(bytes)" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1176 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2572 msgid "TX" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 msgid "The total number of packets sent to the peer" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1177 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2574 msgid "RX" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:613 msgid "The total number of packets received from the peer" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577 msgid "Dup TX" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:614 msgid "The total number of packets retransmitted to the peer" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579 msgid "Dup RX" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 +#: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:615 msgid "The total number of duplicate packets received from the peer" msgstr "" @@ -444,7 +446,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:539 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:557 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "" @@ -551,160 +553,160 @@ msgstr "" msgid "UPnP is not enabled" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:415 -#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:632 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:432 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:649 #, java-format msgid "Excessive clock skew: {0}" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1116 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1164 msgid "NTCP connections" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1117 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2520 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1165 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 msgid "Limit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1118 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1166 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 msgid "Timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1171 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "IPv6" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1178 msgid "Out Queue" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1131 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1179 msgid "Backlogged?" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1144 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1192 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2596 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1146 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1194 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2598 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1201 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2750 +#: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1249 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2763 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 msgid "UDP connections" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2526 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2539 msgid "Sort by peer hash" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2528 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 msgid "Direction/Introduction" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2531 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2544 msgid "Sort by idle inbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546 msgid "Sort by idle outbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2549 msgid "Sort by inbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551 msgid "Sort by outbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2554 msgid "Sort by connection uptime" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2543 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2556 msgid "Sort by clock skew" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2546 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2548 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2551 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2555 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2568 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2571 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2560 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2573 msgid "Sort by packets sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2562 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575 msgid "Sort by packets received" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2565 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2578 msgid "Sort by packets retransmitted" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2567 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2580 msgid "Sort by packets received more than once" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 msgid "We offered to introduce them" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602 msgid "They offered to introduce us" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2593 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2606 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614 msgid "1 fail" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2603 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2616 #, java-format msgid "{0} fails" msgstr "" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2609 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:165 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2622 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681 msgid "backlogged" msgstr "" @@ -717,95 +719,99 @@ msgstr "" msgid "Dropping tunnel requests: Overloaded" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:619 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:598 +msgid "Rejecting tunnels: Hidden mode" +msgstr "" + +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:626 msgid "Rejecting tunnels: Request overload" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:650 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:657 msgid "Rejecting tunnels: Connection limit" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:861 -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:894 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:868 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:901 msgid "Dropping tunnel requests: High load" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:973 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:980 msgid "Dropping tunnel requests: Queue time" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:762 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:833 #, java-format msgid "New plugin version {0} is available" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:840 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:911 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:842 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:913 #, java-format msgid "No new version is available for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:936 #, java-format msgid "{0}B transferred" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:989 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288 #, java-format msgid "Transfer failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1155 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1219 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:671 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1226 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1290 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1314 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:679 msgid "Update downloaded" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1270 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1314 msgid "Restarting" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1270 msgid "Update verified" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1208 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1279 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136 #, java-format msgid "from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1294 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1252 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1323 #, java-format msgid "Failed copy to {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:140 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:143 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:146 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:149 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:154 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:157 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:164 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:167 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -990,22 +996,22 @@ msgstr "" msgid "No new version found at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:64 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 #, java-format msgid "Temporary ban expiring in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:66 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:78 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 msgid "unban now" msgstr "" -#: ../java/src/net/i2p/router/web/CSSHelper.java:146 -#: ../java/src/net/i2p/router/web/HomeHelper.java:33 +#: ../java/src/net/i2p/router/web/CSSHelper.java:147 +#: ../java/src/net/i2p/router/web/HomeHelper.java:34 #: ../java/strings/Strings.java:29 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:211 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:213 @@ -1044,9 +1050,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:227 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:229 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:157 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:160 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:226 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:227 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:239 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:241 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:230 @@ -1104,13 +1112,13 @@ msgid "Error updating the configuration - please see the error logs" msgstr "" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374 msgid "Configuration saved successfully" msgstr "" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:63 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:458 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:376 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:85 msgid "" "Error saving the configuration (applied but not saved) - please see the " @@ -1177,7 +1185,7 @@ msgstr "" #. label (IE) #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:276 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289 msgid "Start" msgstr "" @@ -1219,7 +1227,7 @@ msgid "Plugin configuration saved." msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:326 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:141 msgid "WebApp" msgstr "" @@ -1284,7 +1292,7 @@ msgid "Interface configuration saved" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:456 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:335 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:337 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114 @@ -1292,7 +1300,7 @@ msgid "Restart required to take effect" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:296 msgid "Edit" msgstr "" @@ -1301,99 +1309,99 @@ msgstr "" msgid "Add Client" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94 -msgid "Class and arguments" -msgstr "" - #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:510 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:427 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:432 msgid "Client" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163 -msgid "Control" -msgstr "" - -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:94 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:95 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:142 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:171 msgid "Run at Startup?" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:138 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163 -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:211 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:96 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:143 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:172 +msgid "Control" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:97 +msgid "Class and arguments" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:144 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:173 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:223 msgid "Description" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:163 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:170 msgid "Plugin" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:187 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:295 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 msgid "Version" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:177 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:189 msgid "Signed by" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:194 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:206 msgid "Date" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:200 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:212 msgid "Author" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:216 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:228 msgid "License" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:221 -#: ../java/src/net/i2p/router/web/HomeHelper.java:35 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:233 +#: ../java/src/net/i2p/router/web/HomeHelper.java:36 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 msgid "Website" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:226 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:238 msgid "Update link" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:279 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:293 msgid "Stop" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:283 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:299 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:141 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:436 msgid "Check for updates" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:301 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 msgid "Update" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:306 #, java-format msgid "Are you sure you want to delete {0}?" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:291 +#: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:308 msgid "Delete" msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:897 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:905 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:468 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:488 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:504 @@ -1403,7 +1411,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:916 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:924 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:466 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:474 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:486 @@ -1549,9 +1557,9 @@ msgid "WARN" msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:88 -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:145 -#: ../java/src/net/i2p/router/web/HomeHelper.java:195 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:851 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:169 +#: ../java/src/net/i2p/router/web/HomeHelper.java:198 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:859 msgid "Remove" msgstr "" @@ -1593,7 +1601,8 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:287 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:289 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:302 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:296 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:299 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:300 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:333 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:305 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:289 @@ -1652,7 +1661,7 @@ msgid "Peers" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:21 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:240 msgid "Stats" msgstr "" @@ -1674,109 +1683,105 @@ msgstr "" msgid "Save changes" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:142 -msgid "Rechecking router reachability..." -msgstr "" - -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:205 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:207 msgid "Updating IP address" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:229 msgid "Updating IPv6 setting" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:246 msgid "Disabling TCP completely" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 #, java-format msgid "Updating TCP address to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258 msgid "Disabling inbound TCP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:258 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:260 msgid "Updating inbound TCP address to auto" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:271 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273 #, java-format msgid "Updating TCP port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:275 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:300 msgid "Warning - ports less than 1024 are not recommended" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:279 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306 msgid "Invalid port" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284 msgid "Updating inbound TCP port to auto" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298 #, java-format msgid "Updating UDP port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323 msgid "Gracefully restarting into Hidden Router Mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:323 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:325 msgid "Gracefully restarting to exit Hidden Router Mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334 msgid "Enabling UPnP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:336 msgid "Disabling UPnP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345 msgid "Enabling laptop mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:347 msgid "Disabling laptop mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354 msgid "Disabling UDP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:354 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:356 msgid "Enabling UDP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:363 msgid "Requiring SSU introducers" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:421 msgid "Invalid address" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:427 #, java-format msgid "The hostname or IP {0} is not publicly routable" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:450 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:452 msgid "Updating bandwidth share percentage" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:480 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:482 msgid "Updated bandwidth limits" msgstr "" @@ -1864,8 +1869,8 @@ msgstr "" #. Normal browsers send value, IE sends button label #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:34 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:176 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:180 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:445 msgid "Shutdown immediately" msgstr "" @@ -1921,118 +1926,118 @@ msgstr[1] "" msgid "Restart in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:171 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:443 msgid "Shutdown gracefully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:194 msgid "Graceful shutdown initiated" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:181 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:447 msgid "Cancel graceful shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:183 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202 msgid "Graceful shutdown cancelled" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:184 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:459 msgid "Graceful restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:189 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208 msgid "Graceful restart requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:461 msgid "Hard restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:195 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:214 msgid "Hard restart requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215 msgid "Rekey and Restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:197 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216 msgid "Rekeying after graceful restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219 msgid "Rekey and Shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:201 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:220 msgid "Rekeying after graceful shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:204 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487 msgid "Run I2P on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:225 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489 msgid "Don't run I2P on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513 msgid "Dump threads" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234 #, java-format msgid "Threads dumped to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521 msgid "View console on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237 msgid "Console is to be shown on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:238 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523 msgid "Do not view console on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:240 msgid "Console is not to be shown on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:241 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509 msgid "Force GC" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243 msgid "Full garbage collection requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:252 msgid "Service installed" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254 msgid "Warning: unable to install the service" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261 msgid "Service removed" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263 msgid "Warning: unable to remove the service" msgstr "" @@ -2153,7 +2158,7 @@ msgstr[0] "" msgstr[1] "" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:33 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36 msgid "Exploratory tunnels" msgstr "" @@ -2243,48 +2248,44 @@ msgstr "" msgid "Force the mobile console to be used" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:75 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76 msgid "Arabic" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77 msgid "Czech" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78 msgid "Danish" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79 msgid "German" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80 msgid "Estonian" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "Greek" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 msgid "English" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83 msgid "Spanish" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84 msgid "Finnish" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84 -msgid "French" -msgstr "" - #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85 -msgid "Hebrew" +msgid "French" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86 @@ -2325,40 +2326,44 @@ msgid "Russian" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96 -msgid "Swedish" +msgid "Slovak" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 -msgid "Turkish" +msgid "Swedish" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 -msgid "Ukrainian" +msgid "Turkish" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99 -msgid "Vietnamese" +msgid "Ukrainian" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100 +msgid "Vietnamese" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101 msgid "Chinese" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:165 msgid "Add a user and password to enable." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171 msgid "User Name" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158 -#: ../java/src/net/i2p/router/web/HomeHelper.java:217 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:899 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:182 +#: ../java/src/net/i2p/router/web/HomeHelper.java:220 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:907 msgid "Add" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:185 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534 msgid "Password" msgstr "" @@ -2408,7 +2413,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118 -#: ../java/src/net/i2p/router/web/GraphHelper.java:373 +#: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "" @@ -2446,6 +2451,128 @@ msgstr "" msgid "Download, verify, and restart" msgstr "" +#: ../java/src/net/i2p/router/web/EventLogHelper.java:34 +msgid "Aborted startup" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:35 +msgid "Changed IP" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:36 +msgid "Changed port" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:37 +msgid "Clock shifted" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:38 +msgid "Crashed" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:39 +msgid "Critical error" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:40 +msgid "Installed new version" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:41 +msgid "Install failed" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:42 +msgid "Network error" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:43 +#: ../java/src/net/i2p/router/web/EventLogHelper.java:45 +msgid "New router identity" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:44 +msgid "Out of memory error" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:46 +msgid "Reseeded router" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:47 +msgid "Soft restart" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:48 +msgid "Started router" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:49 +msgid "Stopped router" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:50 +msgid "Updated router" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:51 +msgid "Watchdog warning" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:99 +msgid "Display Events" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:103 +msgid "Events since" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:108 +msgid "Event type" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:114 +#: ../java/src/net/i2p/router/web/EventLogHelper.java:145 +msgid "All events" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:119 +msgid "Filter events" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:166 +msgid "No events found" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:167 +#, java-format +msgid "No events found in previous {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:170 +#, java-format +msgid "No \"{0}\" events found" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:171 +#, java-format +msgid "No \"{0}\" events found in previous {1}" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:175 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +msgid "Time" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:178 +msgid "Event" +msgstr "" + +#: ../java/src/net/i2p/router/web/EventLogHelper.java:180 +msgid "Details" +msgstr "" + #: ../java/src/net/i2p/router/web/FormHandler.java:203 msgid "" "Invalid form submission, probably because you used the 'back' or 'reload' " @@ -2458,447 +2585,452 @@ msgid "" "browser." msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:158 +#: ../java/src/net/i2p/router/web/GraphHelper.java:162 msgid "Combined bandwidth graph" msgstr "" #. e.g. "statname for 60m" -#: ../java/src/net/i2p/router/web/GraphHelper.java:170 -#: ../java/src/net/i2p/router/web/GraphHelper.java:232 +#: ../java/src/net/i2p/router/web/GraphHelper.java:174 +#: ../java/src/net/i2p/router/web/GraphHelper.java:236 #, java-format msgid "{0} for {1}" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:219 +#: ../java/src/net/i2p/router/web/GraphHelper.java:223 #: ../java/src/net/i2p/router/web/StatSummarizer.java:304 msgid "Bandwidth usage" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:234 +#: ../java/src/net/i2p/router/web/GraphHelper.java:238 #, java-format msgid "ending {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:249 +#: ../java/src/net/i2p/router/web/GraphHelper.java:253 msgid "Larger" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:255 +#: ../java/src/net/i2p/router/web/GraphHelper.java:259 msgid "Smaller" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:261 +#: ../java/src/net/i2p/router/web/GraphHelper.java:265 msgid "Taller" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:267 +#: ../java/src/net/i2p/router/web/GraphHelper.java:271 msgid "Shorter" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:273 +#: ../java/src/net/i2p/router/web/GraphHelper.java:277 msgid "Wider" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:279 +#: ../java/src/net/i2p/router/web/GraphHelper.java:283 msgid "Narrower" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:286 +#: ../java/src/net/i2p/router/web/GraphHelper.java:290 msgid "Larger interval" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:292 +#: ../java/src/net/i2p/router/web/GraphHelper.java:296 msgid "Smaller interval" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:299 +#: ../java/src/net/i2p/router/web/GraphHelper.java:303 msgid "Previous interval" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:310 +#: ../java/src/net/i2p/router/web/GraphHelper.java:314 msgid "Next interval" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:317 -#: ../java/src/net/i2p/router/web/GraphHelper.java:357 +#: ../java/src/net/i2p/router/web/GraphHelper.java:321 +#: ../java/src/net/i2p/router/web/GraphHelper.java:361 msgid "Plot averages" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:317 -#: ../java/src/net/i2p/router/web/GraphHelper.java:358 +#: ../java/src/net/i2p/router/web/GraphHelper.java:321 +#: ../java/src/net/i2p/router/web/GraphHelper.java:362 msgid "plot events" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:320 +#: ../java/src/net/i2p/router/web/GraphHelper.java:324 msgid "All times are UTC." msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:352 +#: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Configure Graph Display" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:352 +#: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Select Stats" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:356 +#: ../java/src/net/i2p/router/web/GraphHelper.java:360 msgid "Periods" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:358 +#: ../java/src/net/i2p/router/web/GraphHelper.java:362 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485 msgid "or" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:359 +#: ../java/src/net/i2p/router/web/GraphHelper.java:363 msgid "Image sizes" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:359 +#: ../java/src/net/i2p/router/web/GraphHelper.java:363 msgid "width" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:360 +#: ../java/src/net/i2p/router/web/GraphHelper.java:364 msgid "height" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:360 -#: ../java/src/net/i2p/router/web/GraphHelper.java:361 +#: ../java/src/net/i2p/router/web/GraphHelper.java:364 +#: ../java/src/net/i2p/router/web/GraphHelper.java:365 msgid "pixels" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:362 +#: ../java/src/net/i2p/router/web/GraphHelper.java:366 msgid "Refresh delay" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:377 +#: ../java/src/net/i2p/router/web/GraphHelper.java:381 msgid "Store graph data on disk?" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:383 +#: ../java/src/net/i2p/router/web/GraphHelper.java:387 msgid "Save settings and redraw graphs" msgstr "" -#: ../java/src/net/i2p/router/web/GraphHelper.java:438 +#: ../java/src/net/i2p/router/web/GraphHelper.java:443 msgid "Graph settings saved" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:27 +#: ../java/src/net/i2p/router/web/HomeHelper.java:28 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:252 msgid "Addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:27 +#: ../java/src/net/i2p/router/web/HomeHelper.java:28 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:250 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:28 +#: ../java/src/net/i2p/router/web/HomeHelper.java:29 msgid "Configure Bandwidth" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:28 +#: ../java/src/net/i2p/router/web/HomeHelper.java:29 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:322 msgid "I2P Bandwidth Configuration" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:29 +#: ../java/src/net/i2p/router/web/HomeHelper.java:30 msgid "Configure Language" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:29 +#: ../java/src/net/i2p/router/web/HomeHelper.java:30 msgid "Console Language Selection" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:30 +#: ../java/src/net/i2p/router/web/HomeHelper.java:31 msgid "Customize Home Page" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:30 +#: ../java/src/net/i2p/router/web/HomeHelper.java:31 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338 msgid "I2P Home Page Configuration" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:31 +#: ../java/src/net/i2p/router/web/HomeHelper.java:32 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:160 msgid "Anonymous webmail client" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:31 +#: ../java/src/net/i2p/router/web/HomeHelper.java:32 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162 msgid "Email" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:32 +#: ../java/src/net/i2p/router/web/HomeHelper.java:33 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268 msgid "I2P Router Help" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:155 +#: ../java/src/net/i2p/router/web/HomeHelper.java:34 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:158 msgid "Router Console" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:34 +#: ../java/src/net/i2p/router/web/HomeHelper.java:35 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 msgid "Built-in anonymous BitTorrent Client" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:34 +#: ../java/src/net/i2p/router/web/HomeHelper.java:35 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:168 msgid "Torrents" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:35 +#: ../java/src/net/i2p/router/web/HomeHelper.java:36 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 msgid "Local web server" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:39 +#: ../java/src/net/i2p/router/web/HomeHelper.java:40 +msgid "The Anoncoin project" +msgstr "" + +#: ../java/src/net/i2p/router/web/HomeHelper.java:41 msgid "Bug Reports" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:39 +#: ../java/src/net/i2p/router/web/HomeHelper.java:41 msgid "Bug tracker" msgstr "" #. "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http://colombo-bt.i2p/" + S + I + "colomboicon.png" + S + -#: ../java/src/net/i2p/router/web/HomeHelper.java:41 +#: ../java/src/net/i2p/router/web/HomeHelper.java:43 msgid "Dev Forum" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:41 +#: ../java/src/net/i2p/router/web/HomeHelper.java:43 msgid "Development forum" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:42 -#: ../java/src/net/i2p/router/web/HomeHelper.java:56 +#: ../java/src/net/i2p/router/web/HomeHelper.java:44 +#: ../java/src/net/i2p/router/web/HomeHelper.java:59 msgid "Bittorrent tracker" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:42 +#: ../java/src/net/i2p/router/web/HomeHelper.java:44 msgid "diftracker" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:43 +#: ../java/src/net/i2p/router/web/HomeHelper.java:45 msgid "I2P Applications" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:44 +#: ../java/src/net/i2p/router/web/HomeHelper.java:46 msgid "FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:44 +#: ../java/src/net/i2p/router/web/HomeHelper.java:46 msgid "Frequently Asked Questions" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:45 +#: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Community forum" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:45 +#: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Forum" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:46 +#: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "" "A public anonymous Git hosting site - supports pulling via Git and HTTP and " "pushing via SSH" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:46 +#: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "Anonymous Git Hosting" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:47 +#: ../java/src/net/i2p/router/web/HomeHelper.java:49 +msgid "HiddenGate" +msgstr "" + +#: ../java/src/net/i2p/router/web/HomeHelper.java:50 msgid "Microblog" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:47 +#: ../java/src/net/i2p/router/web/HomeHelper.java:50 msgid "Your premier microblogging service on I2P" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:48 +#: ../java/src/net/i2p/router/web/HomeHelper.java:51 msgid "Javadocs" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:48 -#: ../java/src/net/i2p/router/web/HomeHelper.java:60 +#: ../java/src/net/i2p/router/web/HomeHelper.java:51 +#: ../java/src/net/i2p/router/web/HomeHelper.java:63 msgid "Technical documentation" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:49 +#: ../java/src/net/i2p/router/web/HomeHelper.java:52 msgid "Simple and fast microblogging website" msgstr "" #. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S + -#: ../java/src/net/i2p/router/web/HomeHelper.java:51 +#: ../java/src/net/i2p/router/web/HomeHelper.java:54 msgid "Debian and Tahoe-LAFS repositories" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:52 +#: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Free Web Hosting" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:52 +#: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Free eepsite hosting with PHP and MySQL" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:53 +#: ../java/src/net/i2p/router/web/HomeHelper.java:56 msgid "I2P Pastebin" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:53 +#: ../java/src/net/i2p/router/web/HomeHelper.java:56 msgid "Pastebin" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:54 +#: ../java/src/net/i2p/router/web/HomeHelper.java:57 msgid "I2P News" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:55 +#: ../java/src/net/i2p/router/web/HomeHelper.java:58 msgid "Add-on directory" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:55 +#: ../java/src/net/i2p/router/web/HomeHelper.java:58 msgid "Plugins" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:56 +#: ../java/src/net/i2p/router/web/HomeHelper.java:59 msgid "Postman's Tracker" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:57 +#: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "I2P home page" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:57 +#: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "Project Website" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:59 +#. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S + +#: ../java/src/net/i2p/router/web/HomeHelper.java:62 msgid "I2P Network Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:60 +#: ../java/src/net/i2p/router/web/HomeHelper.java:63 msgid "Technical Docs" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:61 +#: ../java/src/net/i2p/router/web/HomeHelper.java:64 msgid "Trac Wiki" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:62 +#: ../java/src/net/i2p/router/web/HomeHelper.java:65 msgid "Ugha's Wiki" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:63 +#: ../java/src/net/i2p/router/web/HomeHelper.java:66 msgid "Seedless and the Robert BitTorrent applications" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:63 +#: ../java/src/net/i2p/router/web/HomeHelper.java:66 msgid "Sponge's main site" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:104 +#: ../java/src/net/i2p/router/web/HomeHelper.java:107 msgid "The HTTP proxy is not up" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:106 +#: ../java/src/net/i2p/router/web/HomeHelper.java:109 #, java-format msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:197 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:853 +#: ../java/src/net/i2p/router/web/HomeHelper.java:200 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:861 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 +#: ../java/src/net/i2p/router/web/HomeHelper.java:202 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 -msgid "Time" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:193 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:194 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14 msgid "Summary" msgstr "" @@ -2942,170 +3074,170 @@ msgstr "" msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 #: ../java/strings/Strings.java:68 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:92 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:135 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:137 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 msgid "Local" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 msgid "Unpublished" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:140 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:151 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:157 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:188 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:163 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:182 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:178 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 msgid "Tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:244 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:250 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:294 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:300 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:301 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:307 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:315 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:321 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:333 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:339 msgid "Country" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:388 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:398 msgid "Our info" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:390 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:392 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:399 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:409 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:400 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:403 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:410 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 #, java-format msgid "{0} ago" msgstr "" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:402 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:406 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:412 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:416 msgid "Published" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:408 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:418 msgid "Address(es)" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:420 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:430 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:446 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:456 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:457 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:448 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:458 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:459 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" @@ -3128,225 +3260,225 @@ msgstr "" msgid "Show news" msgstr "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:133 +#: ../java/src/net/i2p/router/web/PluginStarter.java:139 msgid "Checking for plugin updates" msgstr "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:175 +#: ../java/src/net/i2p/router/web/PluginStarter.java:181 #, java-format msgid "1 plugin updated" msgid_plural "{0} plugins updated" msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:177 +#: ../java/src/net/i2p/router/web/PluginStarter.java:183 msgid "Plugin update check complete" msgstr "" #. buf.append("

").append(_("Peer Profiles")).append("

\n

"); -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:78 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." msgid_plural "Showing {0} recent profiles." msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:80 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 #, java-format msgid "Hiding 1 older profile." msgid_plural "Hiding {0} older profiles." msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:82 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 #, java-format msgid "Hiding 1 standard profile." msgid_plural "Hiding {0} standard profiles." msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:87 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88 msgid "Groups (Caps)" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488 msgid "Speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492 msgid "Capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 msgid "Integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130 msgid "Fast, High Capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11 msgid "High Capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132 msgid "Standard" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:133 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167 msgid "Failing" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418 msgid "Integrated" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168 msgid "Unreachable" msgstr "" #. hide if < 10% -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:175 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176 msgid "Test Fails" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:182 msgid "profile" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 msgid "Caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:201 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 msgid "Integ. Value" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:202 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203 msgid "Last Heard About" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204 msgid "Last Heard From" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205 msgid "Last Good Send" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:205 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206 msgid "Last Bad Send" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207 msgid "10m Resp. Time" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208 msgid "1h Resp. Time" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209 msgid "1d Resp. Time" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210 msgid "Last Good Lookup" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:210 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211 msgid "Last Bad Lookup" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:211 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212 msgid "Last Good Store" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:212 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213 msgid "Last Bad Store" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:213 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214 msgid "1h Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:214 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:215 msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 #: ../java/strings/Strings.java:81 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 msgid "status" msgstr "" @@ -3549,7 +3681,7 @@ msgid "Textual router performance statistics" msgstr "" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:244 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:414 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:419 msgid "Local Destinations" msgstr "" @@ -3755,98 +3887,103 @@ msgid "ERR-Clock Skew of {0}" msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:191 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:196 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688 msgid "Testing" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:163 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:162 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:168 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668 msgid "OK" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:164 -msgid "ERR-Private TCP Address" -msgstr "" - -#: ../java/src/net/i2p/router/web/SummaryHelper.java:166 -msgid "ERR-SymmetricNAT" +#: ../java/src/net/i2p/router/web/SummaryHelper.java:165 +msgid "ERR-Unresolved TCP Address" msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:169 -msgid "WARN-Firewalled with Inbound TCP Enabled" +msgid "ERR-Private TCP Address" msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:171 +msgid "ERR-SymmetricNAT" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:174 +msgid "WARN-Firewalled with Inbound TCP Enabled" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:176 msgid "WARN-Firewalled and Floodfill" msgstr "" #. if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0) #. return _("WARN-Firewalled and Fast"); -#: ../java/src/net/i2p/router/web/SummaryHelper.java:174 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:179 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672 msgid "Firewalled" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:176 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:181 msgid "Disconnected - check network cable" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:178 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:183 msgid "" "ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and " "restart" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:184 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:189 msgid "ERR-No Active Peers, Check Network Connection and Firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:187 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:192 msgid "ERR-UDP Disabled and Inbound TCP host/port not set" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:189 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:194 msgid "WARN-Firewalled with UDP Disabled" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:414 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:419 msgid "Add/remove/edit & control your client and server tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:425 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:430 msgid "Server" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:429 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:434 msgid "Show tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:440 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:445 msgid "Leases expired" msgstr "" #. red or yellow light -#: ../java/src/net/i2p/router/web/SummaryHelper.java:440 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:441 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:445 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:446 msgid "Rebuilding" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:441 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:446 msgid "ago" msgstr "" #. green light -#: ../java/src/net/i2p/router/web/SummaryHelper.java:444 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:449 msgid "Ready" msgstr "" #. yellow light -#: ../java/src/net/i2p/router/web/SummaryHelper.java:448 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:453 msgid "Building" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:448 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:453 msgid "Building tunnels" msgstr "" @@ -3854,31 +3991,31 @@ msgstr "" #. nicely under 'local destinations' in the summary bar #. note that if the wording changes in i2ptunnel.config, we have to #. keep the old string here as well for existing installs -#: ../java/src/net/i2p/router/web/SummaryHelper.java:461 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:469 #: ../java/strings/Strings.java:36 msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:673 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:681 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:675 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:683 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:676 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:690 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:684 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:698 #, java-format msgid "Version {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:689 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:697 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:721 #, java-format msgid "Download {0} Update" msgstr "" @@ -3886,40 +4023,40 @@ msgstr "" #. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:721 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:729 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:745 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:753 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:747 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:755 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:855 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:863 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:872 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:880 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:885 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:893 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:890 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:898 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:910 msgid "Select a section to add" msgstr "" @@ -3952,114 +4089,114 @@ msgstr "" msgid "now" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:35 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:61 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:36 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:405 msgid "configure" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:59 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 msgid "Client tunnels for" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:63 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:64 msgid "dead" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:69 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 msgid "Participating tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:70 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "Receive on" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Expiration" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Send on" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Rate" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Role" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Usage" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:110 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:111 msgid "grace period" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:120 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 msgid "Outbound Endpoint" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:122 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:123 msgid "Inbound Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:124 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:167 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:125 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:168 msgid "Participant" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:129 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130 #, java-format msgid "Limited display to the {0} tunnels with the highest usage" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:130 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131 msgid "Inactive participating tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:131 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:132 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224 msgid "Lifetime bandwidth usage" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Expiry" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:164 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:165 msgid "Participants" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:170 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:171 msgid "Endpoint" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210 -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218 msgid "Build in progress" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:210 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "inbound" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:217 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:218 msgid "outbound" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:222 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:223 msgid "No tunnels; waiting for the grace period to end." msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:224 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225 msgid "in" msgstr "" -#: ../java/src/net/i2p/router/web/TunnelRenderer.java:225 +#: ../java/src/net/i2p/router/web/TunnelRenderer.java:226 msgid "out" msgstr "" @@ -4312,7 +4449,8 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:151 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:162 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:171 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:167 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:151 @@ -4358,7 +4496,8 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:300 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:302 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:315 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:313 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:346 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:318 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:302 @@ -4404,7 +4543,8 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:304 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:306 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:319 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:313 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:316 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:317 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:350 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:322 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:306 @@ -5870,76 +6010,84 @@ msgstr "" msgid "Click here to continue." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:156 msgid "Internal Error" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:162 msgid "Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:170 msgid "Sorry! There has been an internal error." msgstr "" #. note to translators - both parameters are URLs -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:174 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342 #, java-format msgid "Please report bugs on {0} or {1}." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:178 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346 msgid "" "You may use the username \"guest\" and password \"guest\" if you do not wish " "to register." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:180 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348 msgid "Please include this information in bug reports" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:182 msgid "Error Details" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:184 #, java-format msgid "Error {0}" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:204 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338 msgid "I2P Version and Running Environment" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:253 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:397 msgid "" "Note that system information, log timestamps, and log messages may provide " "clues to your location; please review everything you include in a bug report." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:158 msgid "Page Not Found" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:329 msgid "" "Sorry! You appear to be requesting a non-existent Router Console page or " "resource." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:328 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:331 msgid "Error 404" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:336 msgid "not found" msgstr "" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:143 +msgid "events" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:326 +msgid "I2P Event Log" +msgstr "" + #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:145 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:143 msgid "graphs" @@ -6001,6 +6149,14 @@ msgid "Router Logs" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409 +msgid "Event Logs" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:411 +msgid "View event logs" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413 msgid "Service (Wrapper) Logs" msgstr "" diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index eb7575e2e7..393af1b7a8 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -16,14 +16,14 @@ # Boxoa590, 2013 # Boxoa590, 2012 # jackjack , 2011 -# Towatowa441, 2013-2014 +# Towinet, 2013-2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-04-30 21:10+0000\n" -"Last-Translator: Towatowa441\n" +"PO-Revision-Date: 2014-05-31 18:55+0000\n" +"Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1940,7 +1940,7 @@ msgstr "Arrêt dans {0}" #, java-format msgid "Please wait for routing commitment to expire for {0} tunnel" msgid_plural "Please wait for routing commitments to expire for {0} tunnels" -msgstr[0] "Veuillez attendre qu'expire l'engagement d'acheminement pour {0} tunnel" +msgstr[0] "Veuillez attendre qu''expire l''engagement d''acheminement de {0} tunnel" msgstr[1] "Veuillez attendre qu''expirent les engagements d''acheminement de {0} tunnels" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82 @@ -4747,7 +4747,7 @@ msgstr "Ajout manuel de clés" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:462 msgid "Enter keys for encrypted remote destinations here." -msgstr "Entrez les clés pour les destinations chiffrées distantes ici." +msgstr "Saisissez ici les clés pour les destinations distantes chiffrées." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:465 msgid "Keys for local destinations must be entered on the" diff --git a/apps/routerconsole/locale/messages_nb.po b/apps/routerconsole/locale/messages_nb.po index 9e047f5277..c719dfc557 100644 --- a/apps/routerconsole/locale/messages_nb.po +++ b/apps/routerconsole/locale/messages_nb.po @@ -4,15 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# kingu , 2014 -# mikalv , 2013 +# Allan Nordhøy , 2014 +# Mikal , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-04-02 02:04+0000\n" -"Last-Translator: kingu \n" +"PO-Revision-Date: 2014-07-12 19:20+0000\n" +"Last-Translator: Allan Nordhøy \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -460,13 +460,13 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 msgid "Status" -msgstr "" +msgstr "Status" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:530 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:541 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:558 msgid "Type" -msgstr "" +msgstr "Type" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:532 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:543 @@ -517,7 +517,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 msgid "Disabled UPnP Devices" -msgstr "" +msgstr "Deaktiverte UPnP-enheter" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624 msgid "" @@ -589,7 +589,7 @@ msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529 msgid "IPv6" -msgstr "" +msgstr "IPv6" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130 msgid "Out Queue" @@ -767,7 +767,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:865 #, java-format msgid "{0}B transferred" -msgstr "" +msgstr "{0}B overført" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:918 #: ../java/src/net/i2p/router/update/UpdateRunner.java:288 @@ -795,7 +795,7 @@ msgstr "Oppdatering kontrollert" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:136 #, java-format msgid "from {0}" -msgstr "" +msgstr "fra {0}" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1223 #, java-format @@ -823,7 +823,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/NewsFetcher.java:164 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" -msgstr "" +msgstr "Krever Java-versjon {0}, installert versjon av java er {1}" #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:55 #, java-format @@ -861,30 +861,30 @@ msgstr "Laster ned plugin fra {0}" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:122 msgid "Plugin downloaded" -msgstr "" +msgstr "Programtillegg lastet ned" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:127 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:363 #, java-format msgid "Cannot create plugin directory {0}" -msgstr "" +msgstr "Kan ikke opprette programtillegg-mappe {0}" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:146 #, java-format msgid "Plugin from {0} is corrupt" -msgstr "" +msgstr "Programtillegg fra {0} er korrupt" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:157 #, java-format msgid "Plugin from {0} does not contain the required configuration file" -msgstr "" +msgstr "Programtillegg fra {0} inneholder ikke den påkrevde konfigurasjonsfilen" #. updateStatus("" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' #. + signer + ""); #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:170 #, java-format msgid "Plugin from {0} contains an invalid key" -msgstr "" +msgstr "Programtillegg fra {0} inneholder en ugyldig nøkkel" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:194 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:204 @@ -906,31 +906,31 @@ msgstr "" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:249 #, java-format msgid "This plugin requires I2P version {0} or higher" -msgstr "" +msgstr "Dette programtillegget krever at I2P er versjon {0} eller høyere" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257 #, java-format msgid "This plugin requires Java version {0} or higher" -msgstr "" +msgstr "Dette programtillegget krever at Java er versjon {0} eller høyere" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:266 msgid "" "Downloaded plugin is for new installs only, but the plugin is already " "installed" -msgstr "" +msgstr "Nedlastet programtillegg er bare for nye installasjoner, men programtillegget er allerede installert" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:277 msgid "Installed plugin does not contain the required configuration file" -msgstr "" +msgstr "Installert programtillegg mangler den påkrevde konfigurasjonsfilen" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:285 msgid "Signature of downloaded plugin does not match installed plugin" -msgstr "" +msgstr "Signaturen til nedlastet programtillegg samsvarer ikke med installert versjon" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:292 #, java-format msgid "Downloaded plugin version {0} is not newer than installed plugin" -msgstr "" +msgstr "Nedlastet programtillegg versjon {0} er ikke nyere enn installert versjon" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:299 #, java-format @@ -974,27 +974,27 @@ msgstr "" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:406 #, java-format msgid "Plugin {0} installed" -msgstr "" +msgstr "Programtillegg {0} installert" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:397 #, java-format msgid "Plugin {0} installed and started" -msgstr "" +msgstr "Programtillegg {0} installert og startet opp" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:400 #, java-format msgid "Plugin {0} installed but failed to start, check logs" -msgstr "" +msgstr "Programtillegg {0} ble installert, men klarte ikke å starte opp, sjekk logg" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402 #, java-format msgid "Plugin {0} installed but failed to start" -msgstr "" +msgstr "Programtillegg {0} installert men klarte ikke å starte opp" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:414 #, java-format msgid "Failed to download plugin from {0}" -msgstr "" +msgstr "Klarte ikke å laste ned programtillegg fra {0}" #: ../java/src/net/i2p/router/update/UpdateRunner.java:192 #, java-format @@ -1442,7 +1442,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:458 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:504 msgid "Save" -msgstr "" +msgstr "Lagre" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:29 msgid "Home page changed" @@ -1468,7 +1468,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:107 msgid "Removed" -msgstr "" +msgstr "Fjernet" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477 @@ -1583,7 +1583,7 @@ msgstr "Båndbredde" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 msgid "Home Page" -msgstr "" +msgstr "Startside" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:19 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:345 @@ -1753,11 +1753,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332 msgid "Enabling UPnP" -msgstr "" +msgstr "Aktiverer UPnP" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334 msgid "Disabling UPnP" -msgstr "" +msgstr "Skrur av UPnP" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343 msgid "Enabling laptop mode" @@ -1997,7 +1997,7 @@ msgstr "Start I2P ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:206 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489 msgid "Don't run I2P on startup" -msgstr "" +msgstr "Ikke kjøre I2P ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513 @@ -2012,20 +2012,20 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521 msgid "View console on startup" -msgstr "" +msgstr "Vis konsoll ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218 msgid "Console is to be shown on startup" -msgstr "" +msgstr "Konsoll skal vises ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:219 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523 msgid "Do not view console on startup" -msgstr "" +msgstr "Vis ikke konsoll ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:221 msgid "Console is not to be shown on startup" -msgstr "" +msgstr "Konsoll skal ikke vises ved oppstart" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509 @@ -2038,19 +2038,19 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233 msgid "Service installed" -msgstr "" +msgstr "Tjeneste installert" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235 msgid "Warning: unable to install the service" -msgstr "" +msgstr "Advarsel: kunne ikke installere tjeneste" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242 msgid "Service removed" -msgstr "" +msgstr "Tjeneste fjernet" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244 msgid "Warning: unable to remove the service" -msgstr "" +msgstr "Advarsel: kunne ikke fjerne tjenesten" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116 msgid "Stat filter and location updated successfully to" @@ -2128,7 +2128,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129 msgid "Moved" -msgstr "" +msgstr "Flyttet" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136 msgid "Saved order of sections." @@ -2177,7 +2177,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:49 #, java-format msgid "Client tunnels for {0}" -msgstr "" +msgstr "Klient-tunneler for {0}" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:78 msgid "ANONYMITY WARNING - Settings include 0-hop tunnels." @@ -2197,7 +2197,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97 msgid "Length" -msgstr "" +msgstr "Lengde" #. tunnel depth variance #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114 @@ -2206,11 +2206,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139 msgid "Quantity" -msgstr "" +msgstr "Mengde" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157 msgid "Backup quantity" -msgstr "" +msgstr "Sikkerhetskopi-mengde" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179 msgid "Inbound options" @@ -2224,7 +2224,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450 msgid "Add user" -msgstr "" +msgstr "Legg til bruker" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59 msgid "Theme change saved." @@ -2241,16 +2241,16 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76 msgid "No user name entered" -msgstr "" +msgstr "Inget brukernavn angitt" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81 msgid "No password entered" -msgstr "" +msgstr "Inget passord innskrevet" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107 #, java-format msgid "Removed user {0}" -msgstr "" +msgstr "Fjernet bruker {0}" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25 msgid "Set theme universally across all apps" @@ -2270,11 +2270,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77 msgid "Danish" -msgstr "" +msgstr "Dansk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78 msgid "German" -msgstr "" +msgstr "Tysk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79 msgid "Estonian" @@ -2282,23 +2282,23 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80 msgid "Greek" -msgstr "" +msgstr "Gresk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "English" -msgstr "" +msgstr "Engelsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 msgid "Spanish" -msgstr "" +msgstr "Spansk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:83 msgid "Finnish" -msgstr "" +msgstr "Finsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84 msgid "French" -msgstr "" +msgstr "Fransk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85 msgid "Hebrew" @@ -2306,11 +2306,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86 msgid "Hungarian" -msgstr "" +msgstr "Ungarsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:87 msgid "Italian" -msgstr "" +msgstr "Italiensk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:88 msgid "Japanese" @@ -2318,7 +2318,7 @@ msgstr "Japansk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Dutch" -msgstr "" +msgstr "Hollandsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:90 msgid "Norwegian Bokmaal" @@ -2326,12 +2326,12 @@ msgstr "Norsk Bokmål" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:91 msgid "Polish" -msgstr "" +msgstr "Polsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:92 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:93 msgid "Portuguese" -msgstr "" +msgstr "Portugisisk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:94 msgid "Romanian" @@ -2339,46 +2339,46 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:95 msgid "Russian" -msgstr "" +msgstr "Russisk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96 msgid "Swedish" -msgstr "" +msgstr "Svensk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Turkish" -msgstr "" +msgstr "Tyrkisk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Ukrainian" -msgstr "" +msgstr "Ukrainsk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamesisk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100 msgid "Chinese" -msgstr "" +msgstr "Kinesisk" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141 msgid "Add a user and password to enable." -msgstr "" +msgstr "Legg til et brukernavn og passord for å aktivere." #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147 msgid "User Name" -msgstr "" +msgstr "Brukernavn" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158 #: ../java/src/net/i2p/router/web/HomeHelper.java:217 #: ../java/src/net/i2p/router/web/SummaryHelper.java:899 msgid "Add" -msgstr "" +msgstr "Legg til" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:161 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:534 msgid "Password" -msgstr "" +msgstr "Passord" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:148 msgid "Update or check already in progress" @@ -2386,15 +2386,15 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:157 msgid "Update available, attempting to download now" -msgstr "" +msgstr "Oppdatering tilgjengelig, prøver å laste ned nå" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:159 msgid "Update available, click button on left to download" -msgstr "" +msgstr "Oppdatering tilgjengelig, klikk knappen til venstre for å laste ned" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 msgid "No update available" -msgstr "" +msgstr "Ingen oppdatering tilgjengelig" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179 #, java-format @@ -2427,7 +2427,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118 #: ../java/src/net/i2p/router/web/GraphHelper.java:373 msgid "Never" -msgstr "" +msgstr "Aldri" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format @@ -2449,19 +2449,19 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120 msgid "Every" -msgstr "" +msgstr "Hver" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:138 msgid "Notify only" -msgstr "" +msgstr "Bare meld fra" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:145 msgid "Download and verify only" -msgstr "" +msgstr "Bare last ned og verifiser" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:153 msgid "Download, verify, and restart" -msgstr "" +msgstr "Last ned, kontrollere og ta omstart" #: ../java/src/net/i2p/router/web/FormHandler.java:203 msgid "" @@ -2498,27 +2498,27 @@ msgstr "" #: ../java/src/net/i2p/router/web/GraphHelper.java:249 msgid "Larger" -msgstr "" +msgstr "Større" #: ../java/src/net/i2p/router/web/GraphHelper.java:255 msgid "Smaller" -msgstr "" +msgstr "Mindre" #: ../java/src/net/i2p/router/web/GraphHelper.java:261 msgid "Taller" -msgstr "" +msgstr "Høyere" #: ../java/src/net/i2p/router/web/GraphHelper.java:267 msgid "Shorter" -msgstr "" +msgstr "Kortere" #: ../java/src/net/i2p/router/web/GraphHelper.java:273 msgid "Wider" -msgstr "" +msgstr "Bredere" #: ../java/src/net/i2p/router/web/GraphHelper.java:279 msgid "Narrower" -msgstr "" +msgstr "Smalere" #: ../java/src/net/i2p/router/web/GraphHelper.java:286 msgid "Larger interval" @@ -2556,37 +2556,37 @@ msgstr "" #: ../java/src/net/i2p/router/web/GraphHelper.java:352 msgid "Select Stats" -msgstr "" +msgstr "Velg statistikk" #: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Periods" -msgstr "" +msgstr "Perioder" #: ../java/src/net/i2p/router/web/GraphHelper.java:358 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485 msgid "or" -msgstr "" +msgstr "eller" #: ../java/src/net/i2p/router/web/GraphHelper.java:359 msgid "Image sizes" -msgstr "" +msgstr "Billedstørrelser" #: ../java/src/net/i2p/router/web/GraphHelper.java:359 msgid "width" -msgstr "" +msgstr "bredde" #: ../java/src/net/i2p/router/web/GraphHelper.java:360 msgid "height" -msgstr "" +msgstr "høyde" #: ../java/src/net/i2p/router/web/GraphHelper.java:360 #: ../java/src/net/i2p/router/web/GraphHelper.java:361 msgid "pixels" -msgstr "" +msgstr "billedpunkter" #: ../java/src/net/i2p/router/web/GraphHelper.java:362 msgid "Refresh delay" -msgstr "" +msgstr "Oppfriskningsforsinkelse" #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Store graph data on disk?" @@ -2621,11 +2621,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 msgid "Configure Language" -msgstr "" +msgstr "Språkvalg" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 msgid "Console Language Selection" -msgstr "" +msgstr "Valg av språk for konsoll" #: ../java/src/net/i2p/router/web/HomeHelper.java:30 msgid "Customize Home Page" @@ -2644,7 +2644,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:31 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:162 msgid "Email" -msgstr "" +msgstr "E-post" #: ../java/src/net/i2p/router/web/HomeHelper.java:32 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:268 @@ -2669,7 +2669,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:35 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 msgid "Local web server" -msgstr "" +msgstr "Lokal vev-tjener" #: ../java/src/net/i2p/router/web/HomeHelper.java:39 msgid "Bug Reports" @@ -2704,11 +2704,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:44 msgid "FAQ" -msgstr "" +msgstr "OSS" #: ../java/src/net/i2p/router/web/HomeHelper.java:44 msgid "Frequently Asked Questions" -msgstr "" +msgstr "Ofte-Stilte-Spørsmål" #: ../java/src/net/i2p/router/web/HomeHelper.java:45 msgid "Community forum" @@ -2716,7 +2716,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:45 msgid "Forum" -msgstr "" +msgstr "Forum" #: ../java/src/net/i2p/router/web/HomeHelper.java:46 msgid "" @@ -2730,7 +2730,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Microblog" -msgstr "" +msgstr "Mikroblogg" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Your premier microblogging service on I2P" @@ -2743,11 +2743,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:48 #: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "Technical documentation" -msgstr "" +msgstr "Teknisk dokumentasjon" #: ../java/src/net/i2p/router/web/HomeHelper.java:49 msgid "Simple and fast microblogging website" -msgstr "" +msgstr "Enkel og rask mikrobloggingsnettside" #. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S #. + I + "education.png" + S + @@ -2781,7 +2781,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Plugins" -msgstr "" +msgstr "Programtillegg" #: ../java/src/net/i2p/router/web/HomeHelper.java:56 msgid "Postman's Tracker" @@ -2831,7 +2831,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:197 #: ../java/src/net/i2p/router/web/SummaryHelper.java:853 msgid "Name" -msgstr "" +msgstr "Navn" #: ../java/src/net/i2p/router/web/HomeHelper.java:199 msgid "URL" @@ -2897,25 +2897,25 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 msgid "Avg" -msgstr "" +msgstr "Snitt" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Time" -msgstr "" +msgstr "Tid" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Max" -msgstr "" +msgstr "Maks" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Min" -msgstr "" +msgstr "Min" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 msgid "Pending" -msgstr "" +msgstr "Utestående" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:193 #: ../java/src/net/i2p/router/web/NetDbHelper.java:14 @@ -2976,28 +2976,28 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:137 msgid "Local" -msgstr "" +msgstr "Lokal" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 msgid "Unpublished" -msgstr "" +msgstr "Upublisert" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:140 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:147 msgid "Destination" -msgstr "" +msgstr "Destinasjon" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:157 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:182 #, java-format msgid "Expires in {0}" -msgstr "" +msgstr "Utløper om {0}" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:184 #, java-format msgid "Expired {0} ago" -msgstr "" +msgstr "Utløp for {0} siden" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:161 @@ -3010,7 +3010,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:178 msgid "Tunnel" -msgstr "" +msgstr "Tunnel" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:244 msgid "Not initialized" @@ -3024,7 +3024,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:315 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333 msgid "Count" -msgstr "" +msgstr "Antall" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:315 msgid "Transports" @@ -3032,11 +3032,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:333 msgid "Country" -msgstr "" +msgstr "Land" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:388 msgid "Our info" -msgstr "" +msgstr "Vår informasjon" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:390 msgid "Peer info for" @@ -3050,35 +3050,35 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692 msgid "Hidden" -msgstr "" +msgstr "Skjult" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:399 msgid "Updated" -msgstr "" +msgstr "Oppdatert" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:400 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:403 #, java-format msgid "{0} ago" -msgstr "" +msgstr "{0} siden" #. shouldnt happen #: ../java/src/net/i2p/router/web/NetDbRenderer.java:402 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:406 msgid "Published" -msgstr "" +msgstr "Publisert" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:408 msgid "Address(es)" -msgstr "" +msgstr "Adresse(r)" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:420 msgid "cost" -msgstr "" +msgstr "kostnad" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:446 msgid "Hidden or starting up" -msgstr "" +msgstr "Skjult eller starter opp" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:446 msgid "SSU" @@ -3140,12 +3140,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/NewsHelper.java:267 msgid "Hide news" -msgstr "" +msgstr "Gjem nyheter" #: ../java/src/net/i2p/router/web/NewsHelper.java:270 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:650 msgid "Show news" -msgstr "" +msgstr "Vis nyheter" #: ../java/src/net/i2p/router/web/PluginStarter.java:133 msgid "Checking for plugin updates" @@ -3192,41 +3192,41 @@ msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488 msgid "Speed" -msgstr "" +msgstr "Hastighet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492 msgid "Capacity" -msgstr "" +msgstr "Kapasitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "Integration" -msgstr "" +msgstr "Integrasjon" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:129 msgid "Fast, High Capacity" -msgstr "" +msgstr "Rask, høy kapasitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:130 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:11 msgid "High Capacity" -msgstr "" +msgstr "Høy kapasitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:131 msgid "Standard" -msgstr "" +msgstr "Standard" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:132 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 msgid "Failing" -msgstr "" +msgstr "Mislyktes" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:134 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:418 msgid "Integrated" -msgstr "" +msgstr "Integrert" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:167 msgid "Unreachable" @@ -3239,7 +3239,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:181 msgid "profile" -msgstr "" +msgstr "profil" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:200 msgid "Caps" @@ -3267,15 +3267,15 @@ msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:206 msgid "10m Resp. Time" -msgstr "" +msgstr "10m svartid" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:207 msgid "1h Resp. Time" -msgstr "" +msgstr "1t svartid" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:208 msgid "1d Resp. Time" -msgstr "" +msgstr "1d svartid" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:209 msgid "Last Good Lookup" @@ -3367,7 +3367,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 msgid "status" -msgstr "" +msgstr "status" #. 0 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:12 @@ -3381,7 +3381,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SearchHelper.java:74 msgid "Select search engine" -msgstr "" +msgstr "Velg søkemotor" #: ../java/src/net/i2p/router/web/StatsGenerator.java:57 msgid "GO" @@ -3408,7 +3408,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/StatsGenerator.java:116 msgid "frequency" -msgstr "" +msgstr "frekvens" #: ../java/src/net/i2p/router/web/StatsGenerator.java:120 msgid "Rolling average events per period" @@ -3450,11 +3450,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/StatsGenerator.java:170 msgid "Average" -msgstr "" +msgstr "Gjennomsnitt" #: ../java/src/net/i2p/router/web/StatsGenerator.java:173 msgid "Highest average" -msgstr "" +msgstr "Høyeste gjennomsnitt" #: ../java/src/net/i2p/router/web/StatsGenerator.java:200 #, java-format @@ -3470,15 +3470,15 @@ msgstr "" #: ../java/src/net/i2p/router/web/StatsGenerator.java:204 msgid "No events" -msgstr "" +msgstr "Ingen hendelser" #: ../java/src/net/i2p/router/web/StatsGenerator.java:209 msgid "Average event count" -msgstr "" +msgstr "Snitt for antall hendelser" #: ../java/src/net/i2p/router/web/StatsGenerator.java:211 msgid "Events in peak period" -msgstr "" +msgstr "Hendelser i høytrafikksperiode" #: ../java/src/net/i2p/router/web/StatsGenerator.java:219 msgid "Graph Data" @@ -3490,7 +3490,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/StatsGenerator.java:225 msgid "Export Data as XML" -msgstr "" +msgstr "Eksporter data som XML" #. Display the strict average #: ../java/src/net/i2p/router/web/StatsGenerator.java:230 @@ -3635,7 +3635,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:360 msgid "I2P Update" -msgstr "" +msgstr "I2P-oppdatering" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 msgid "Peers we've been talking to in the last few minutes/last hour" @@ -3897,7 +3897,7 @@ msgstr "Versjon {0}" #: ../java/src/net/i2p/router/web/SummaryHelper.java:689 msgid "Update available" -msgstr "" +msgstr "Oppdateringer tilgjengelig" #. Note to translators: parameter is a version, e.g. "0.8.4" #: ../java/src/net/i2p/router/web/SummaryHelper.java:713 @@ -3968,7 +3968,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "max" -msgstr "" +msgstr "maks" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 @@ -3983,7 +3983,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:59 msgid "Client tunnels for" -msgstr "" +msgstr "Klient-tunneler for" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:63 msgid "dead" @@ -4601,11 +4601,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490 msgid "Enabled without SSL" -msgstr "" +msgstr "Aktivert uten SSL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496 msgid "Enabled with SSL required" -msgstr "" +msgstr "Aktivert med SSL påkrevd" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502 msgid "Disabled - Clients outside this Java process may not connect" @@ -4629,7 +4629,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532 msgid "Username" -msgstr "" +msgstr "Brukernavn" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:536 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:452 @@ -4639,11 +4639,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:538 msgid "Any changes made here must also be configured in the external client." -msgstr "" +msgstr "Alle endringer som gjøres her må også settes opp i den eksterne klienten." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:540 msgid "Many clients do not support SSL or authorization." -msgstr "" +msgstr "Mange klienter støtter ikke SSL eller identitetsbekreftelse." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:550 msgid "WebApp Configuration" @@ -4702,7 +4702,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:460 msgid "Search Engines" -msgstr "" +msgstr "Søkemotorer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480 msgid "Recommended Eepsites" @@ -4902,19 +4902,19 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508 msgid "Disable IPv6" -msgstr "" +msgstr "Skru av IPv6" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512 msgid "Enable IPv6" -msgstr "" +msgstr "Slå på IPv6" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516 msgid "Prefer IPv4 over IPv6" -msgstr "" +msgstr "Foretrekk IPv4 over IPv6" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520 msgid "Prefer IPv6 over IPv4" -msgstr "" +msgstr "Foretrekk IPv6 over IPv4" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524 msgid "Use IPv6 only (disable IPv4)" @@ -5428,7 +5428,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:459 msgid "the FAQ" -msgstr "" +msgstr "Ofte-Stilte-Spørsmål" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:461 msgid "Reseed URL Selection" @@ -5578,7 +5578,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:479 msgid "Run on startup" -msgstr "" +msgstr "Kjør ved oppstart" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:481 msgid "" @@ -5609,11 +5609,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499 msgid "Debugging" -msgstr "" +msgstr "Feilrettingsinformasjon" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501 msgid "View the job queue" -msgstr "" +msgstr "Vis jobb-kø" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505 msgid "" @@ -5805,11 +5805,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:422 msgid "Check for news updates" -msgstr "" +msgstr "Se etter nyhetsoppdateringer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:424 msgid "News Updates" -msgstr "" +msgstr "Nyhetsoppdateringer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:432 msgid "Update In Progress" @@ -5871,7 +5871,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:398 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:379 msgid "Welcome to I2P" -msgstr "" +msgstr "Velkommen til I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328 msgid "I2P Addressbook" @@ -5900,43 +5900,43 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153 msgid "Internal Error" -msgstr "" +msgstr "Intern feil" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159 msgid "Configuration" -msgstr "" +msgstr "Oppsett" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:167 msgid "Sorry! There has been an internal error." -msgstr "" +msgstr "Beklager! Det har skjedd en intern feil." #. note to translators - both parameters are URLs #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:171 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:342 #, java-format msgid "Please report bugs on {0} or {1}." -msgstr "" +msgstr "Rapporter feil til {0} eller {1}." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:175 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346 msgid "" "You may use the username \"guest\" and password \"guest\" if you do not wish" " to register." -msgstr "" +msgstr "Du kan skrive inn brukernavn \"guest\" og passord \"gust\" hvis du ikke vil registrere deg." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:177 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:348 msgid "Please include this information in bug reports" -msgstr "" +msgstr "Inkluder denne informasjonen i feilrapporter" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:179 msgid "Error Details" -msgstr "" +msgstr "Feildetaljer" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181 #, java-format msgid "Error {0}" -msgstr "" +msgstr "Feil {0}" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:201 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:338 @@ -5953,7 +5953,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:155 msgid "Page Not Found" -msgstr "" +msgstr "Finner ikke siden" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:326 msgid "" @@ -6077,7 +6077,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145 msgid "Proof" -msgstr "" +msgstr "Bevis" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143 msgid "statistics" diff --git a/apps/routerconsole/locale/messages_nl.po b/apps/routerconsole/locale/messages_nl.po index dcb31e81cd..866ae8634f 100644 --- a/apps/routerconsole/locale/messages_nl.po +++ b/apps/routerconsole/locale/messages_nl.po @@ -4,18 +4,19 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Aman_Elarbi , 2014 +# Aman Elarbi , 2014 # ducki2p , 2011 # foo , 2009 # Jrnr601 , 2012 +# Desirius , 2014 # attesor , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-05-15 11:02+0000\n" -"Last-Translator: Aman_Elarbi \n" +"PO-Revision-Date: 2014-07-01 09:40+0000\n" +"Last-Translator: Desirius \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -223,11 +224,11 @@ msgstr "Reseeden: opvragen router info van seed URL ({0} succesvol, {1} fouten). #. Please keep relatively short so it will fit on the graphs. #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:33 msgid "Message receive rate (bytes/sec)" -msgstr "" +msgstr "Bericht ontvangst snelheid (bytes/sec)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:34 msgid "Message send rate (bytes/sec)" -msgstr "" +msgstr "Bericht verstuur snelheid (bytes/sec)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:35 msgid "Low-level send rate (bytes/sec)" @@ -520,7 +521,7 @@ msgstr "UPnP Status" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 msgid "Disabled UPnP Devices" -msgstr "" +msgstr "UPnP apparaten uitgeschakeld" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624 msgid "" @@ -592,7 +593,7 @@ msgstr "Time-out" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1123 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2529 msgid "IPv6" -msgstr "" +msgstr "IPv6" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1130 msgid "Out Queue" @@ -812,21 +813,21 @@ msgstr "Kopie naar {0} gefaald" #: ../java/src/net/i2p/router/update/NewsFetcher.java:140 msgid "In-network updates disabled. Check package manager." -msgstr "" +msgstr "In-netwerk updates uitgeschakeld. Controleer de pakket manager." #: ../java/src/net/i2p/router/update/NewsFetcher.java:146 msgid "No write permission for I2P install directory." -msgstr "" +msgstr "Geen schrijf toestemming voor de I2P installatie map." #: ../java/src/net/i2p/router/update/NewsFetcher.java:154 #, java-format msgid "You must first update to version {0}" -msgstr "" +msgstr "Je moet eerst updaten naar versie {0}" #: ../java/src/net/i2p/router/update/NewsFetcher.java:164 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" -msgstr "" +msgstr "Je hebt Java versie {0} nodig, maar hebt Java versie {1} geïnstalleerd" #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:55 #, java-format @@ -844,7 +845,7 @@ msgstr "Aan het updaten" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:81 #, java-format msgid "Attempting to install from file {0}" -msgstr "" +msgstr "Poging tot installeren vanuit bestand {0}" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:85 #, java-format @@ -854,7 +855,7 @@ msgstr "Geen bestand gespecifieerd {0}" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:92 #, java-format msgid "Failed to install from file {0}, copy failed." -msgstr "" +msgstr "Niet gelukt om te installeren vanuit bestand {0}, kopiëren is mislukt." #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:96 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:390 @@ -948,12 +949,12 @@ msgstr "Plugin update vereist de installatie van plugin versie {0} of lager" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:314 #, java-format msgid "Plugin requires Jetty version {0} or higher" -msgstr "" +msgstr "Plugin heeft Jetty versie {0} of hoger nodig" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:321 #, java-format msgid "Plugin requires Jetty version {0} or lower" -msgstr "" +msgstr "Plugin heeft Jetty versie {0} of lager nodig" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330 #, java-format @@ -1192,7 +1193,7 @@ msgstr "Plugin {0} gestopt" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:136 #, java-format msgid "Stopped webapp {0}" -msgstr "" +msgstr "Webapp {0} gestopt" #. label (IE) #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:157 @@ -1206,7 +1207,7 @@ msgstr "Nieuwe client toegevoegd" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:224 msgid "Client configuration saved successfully" -msgstr "" +msgstr "Cliënt configuratie succesvol opgeslagen" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:234 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:260 @@ -1217,17 +1218,17 @@ msgstr "Foute client index." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:243 #, java-format msgid "Client {0} stopped" -msgstr "" +msgstr "Cliënt {0} gestopt" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:265 #, java-format msgid "Client {0} started" -msgstr "" +msgstr "Cliënt {0} gestart" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:280 #, java-format msgid "Client {0} deleted" -msgstr "" +msgstr "Cliënt {0} verwijderd" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:296 msgid "WebApp configuration saved." @@ -1275,7 +1276,7 @@ msgstr "Alle plugins worden geupdate" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:386 #, java-format msgid "Bad URL {0}" -msgstr "" +msgstr "Foute URL {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:406 #, java-format @@ -1296,7 +1297,7 @@ msgstr "Fout bij starten plugin {0}" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:89 #, java-format msgid "Added user {0}" -msgstr "" +msgstr "Gebruiker {0} toegevoegd" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:455 msgid "Interface configuration saved" @@ -1308,7 +1309,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:90 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114 msgid "Restart required to take effect" -msgstr "" +msgstr "Herstart nodig om wijzigingen door te voeren" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:76 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:281 @@ -1703,7 +1704,7 @@ msgstr "Updaten van IP adres" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:227 msgid "Updating IPv6 setting" -msgstr "" +msgstr "IPv6 instelling vernieuwen" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:244 msgid "Disabling TCP completely" @@ -1730,12 +1731,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:273 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:298 msgid "Warning - ports less than 1024 are not recommended" -msgstr "" +msgstr "Waarschuwing - poorten onder de 1024 zijn niet aanbevolen" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:277 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:304 msgid "Invalid port" -msgstr "" +msgstr "Ongeldige poort" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:282 msgid "Updating inbound TCP port to auto" @@ -1744,7 +1745,7 @@ msgstr "Updaten inkomend TCP poort naar automatisch" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:296 #, java-format msgid "Updating UDP port to {0}" -msgstr "" +msgstr "UDP poort vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:321 msgid "Gracefully restarting into Hidden Router Mode" @@ -1756,11 +1757,11 @@ msgstr "Gecontrolleerd herstarten om Verborgen Router Modus te verlaten" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:332 msgid "Enabling UPnP" -msgstr "" +msgstr "UPnP ingeschakeld" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:334 msgid "Disabling UPnP" -msgstr "" +msgstr "UPnP uitgeschakeld" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:343 msgid "Enabling laptop mode" @@ -1784,7 +1785,7 @@ msgstr "SSU introducers nodig" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:419 msgid "Invalid address" -msgstr "" +msgstr "Ongeldig adres" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:425 #, java-format @@ -2010,7 +2011,7 @@ msgstr "Dump threads" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:215 #, java-format msgid "Threads dumped to {0}" -msgstr "" +msgstr "Threads dumped naar {0}" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521 @@ -2061,11 +2062,11 @@ msgstr "Statistiek filter en lokatie gesuccesvol geupdate in" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:119 msgid "Full statistics enabled" -msgstr "" +msgstr "Volledige statistieken ingeschakeld" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 msgid "Full statistics disabled" -msgstr "" +msgstr "Volledige statistieken uitgeschakeld" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:125 #, java-format @@ -2094,26 +2095,26 @@ msgstr "Verversingsinterval moet een nummer zijn" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:466 msgid "Restore full default" -msgstr "" +msgstr "Volledige standaard herstellen" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:40 msgid "Full summary bar default restored." -msgstr "" +msgstr "Volledige opsomming balk hersteld naar standaard." #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:41 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:45 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:137 msgid "Summary bar will refresh shortly." -msgstr "" +msgstr "Opsomming balk zal zo vernieuwen" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:468 msgid "Restore minimal default" -msgstr "" +msgstr "Herstel minimale standaard" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:44 msgid "Minimal summary bar default restored." -msgstr "" +msgstr "Minimale opsomming balk vernieuwd." #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:61 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:83 @@ -2123,7 +2124,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:68 msgid "No section selected" -msgstr "" +msgstr "Geen selectie geselecteerd" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:73 msgid "No order entered" @@ -2131,7 +2132,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129 msgid "Moved" -msgstr "" +msgstr "Verplaatst" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136 msgid "Saved order of sections." @@ -2227,7 +2228,7 @@ msgstr "Uitgaande opties" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:444 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450 msgid "Add user" -msgstr "" +msgstr "Gebruiker toevoegen" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:59 msgid "Theme change saved." @@ -2244,16 +2245,16 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:76 msgid "No user name entered" -msgstr "" +msgstr "Geen gebruikersnaam ingevoerd" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:81 msgid "No password entered" -msgstr "" +msgstr "Geen wachtwoord ingevoerd" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:107 #, java-format msgid "Removed user {0}" -msgstr "" +msgstr "Gebruiker {0} verwijderd" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25 msgid "Set theme universally across all apps" @@ -2285,7 +2286,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80 msgid "Greek" -msgstr "" +msgstr "Grieks" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "English" @@ -2317,7 +2318,7 @@ msgstr "Italiaans" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:88 msgid "Japanese" -msgstr "" +msgstr "Japans" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Dutch" @@ -2350,7 +2351,7 @@ msgstr "Zweeds" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Turkish" -msgstr "" +msgstr "Turks" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Ukrainian" @@ -2366,11 +2367,11 @@ msgstr "Chinees" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:141 msgid "Add a user and password to enable." -msgstr "" +msgstr "Voeg een gebruiker en wachtwoord toe om in te schakelen." #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:147 msgid "User Name" -msgstr "" +msgstr "Gebruikersnaam" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:158 #: ../java/src/net/i2p/router/web/HomeHelper.java:217 @@ -2402,7 +2403,7 @@ msgstr "Geen update beschikbaar" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:179 #, java-format msgid "Updating news URL to {0}" -msgstr "" +msgstr "Nieuws URL vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:183 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:191 @@ -2414,17 +2415,17 @@ msgstr "intern" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:187 #, java-format msgid "Updating proxy host to {0}" -msgstr "" +msgstr "Proxy host vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:195 #, java-format msgid "Updating proxy port to {0}" -msgstr "" +msgstr "Proxy poort vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:208 #, java-format msgid "Updating refresh frequency to {0}" -msgstr "" +msgstr "Ververs snelheid vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:209 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:118 @@ -2435,7 +2436,7 @@ msgstr "Nooit" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating update policy to {0}" -msgstr "" +msgstr "Update beleid vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 msgid "Updating update URLs." @@ -2448,7 +2449,7 @@ msgstr "Updaten vertrouwde sleutels." #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:244 #, java-format msgid "Updating unsigned update URL to {0}" -msgstr "" +msgstr "Niet-ondertekende update URL vernieuwen naar {0}" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:120 msgid "Every" @@ -2476,7 +2477,7 @@ msgstr "Ongeldig formulier verzonden, mogelijk omdat je de 'terug' of 'vernieuw' msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." -msgstr "" +msgstr "Als het probleem zich blijft voordoen, zorg dat je cookies aan hebt staan in je browser." #: ../java/src/net/i2p/router/web/GraphHelper.java:158 msgid "Combined bandwidth graph" @@ -2497,7 +2498,7 @@ msgstr "Bandbreedte gebruik" #: ../java/src/net/i2p/router/web/GraphHelper.java:234 #, java-format msgid "ending {0} ago" -msgstr "" +msgstr "{0} geleden geeindigd" #: ../java/src/net/i2p/router/web/GraphHelper.java:249 msgid "Larger" @@ -2725,7 +2726,7 @@ msgstr "Forum" msgid "" "A public anonymous Git hosting site - supports pulling via Git and HTTP and " "pushing via SSH" -msgstr "" +msgstr "Een publieke, anonieme Git hosting website - ondersteund downloaden via Git en HTTP en uploaden via SSH" #: ../java/src/net/i2p/router/web/HomeHelper.java:46 msgid "Anonymous Git Hosting" @@ -2750,7 +2751,7 @@ msgstr "Technische documentatie" #: ../java/src/net/i2p/router/web/HomeHelper.java:49 msgid "Simple and fast microblogging website" -msgstr "" +msgstr "Simpele en snelle microblogging website" #. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S #. + I + "education.png" + S + @@ -2760,11 +2761,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:52 msgid "Free Web Hosting" -msgstr "" +msgstr "Gratis Web Hosting" #: ../java/src/net/i2p/router/web/HomeHelper.java:52 msgid "Free eepsite hosting with PHP and MySQL" -msgstr "" +msgstr "Gratis eepsite hosting met PHP en MySQL" #: ../java/src/net/i2p/router/web/HomeHelper.java:53 msgid "I2P Pastebin" @@ -2780,7 +2781,7 @@ msgstr "I2P Nieuws" #: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Add-on directory" -msgstr "" +msgstr "Add-on map" #: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Plugins" @@ -2800,7 +2801,7 @@ msgstr "Project Website" #: ../java/src/net/i2p/router/web/HomeHelper.java:59 msgid "I2P Network Statistics" -msgstr "" +msgstr "I2P Netwerkstatistieken" #: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "Technical Docs" @@ -2855,7 +2856,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" -msgstr "" +msgstr "{0} geleden gestart" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" @@ -2864,7 +2865,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" -msgstr "" +msgstr "{0} geleden voltooid" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" @@ -2878,7 +2879,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" -msgstr "" +msgstr "{0} start in {1}" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" @@ -2904,17 +2905,17 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Time" -msgstr "" +msgstr "Tijd" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Max" -msgstr "" +msgstr "Max" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Min" -msgstr "" +msgstr "Min" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 msgid "Pending" @@ -3720,7 +3721,7 @@ msgstr "Deelnemend" msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" -msgstr "" +msgstr "De verhouding van tunnel hops die we leveren en tunnel hops die we gebruiken - een waarde groter dan 1.00 geeft aan dat je positief bijdraagt aan het netwerk" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:528 msgid "Share ratio" @@ -3736,7 +3737,7 @@ msgstr "Verstopping" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 msgid "Indicates router performance" -msgstr "" +msgstr "Geeft aan hoe de router presteert" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:551 msgid "Job lag" @@ -3744,7 +3745,7 @@ msgstr "Taak vertraging" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:557 msgid "Indicates how quickly outbound messages to other I2P routers are sent" -msgstr "" +msgstr "Geeft aan hoe snel uitgaande berichten naar andere I2P routers verstuurd worden" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Message delay" @@ -3752,7 +3753,7 @@ msgstr "Bericht vertraging" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:567 msgid "Round trip time for a tunnel test" -msgstr "" +msgstr "Heen en weer tijd voor een tunnel test" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Tunnel lag" @@ -3768,7 +3769,7 @@ msgstr "Achterstand" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:615 msgid "News & Updates" -msgstr "" +msgstr "Nieuws & Updates" #: ../java/src/net/i2p/router/web/SummaryHelper.java:143 msgid "ERR-Client Manager I2CP Error - check logs" @@ -3815,7 +3816,7 @@ msgstr "Firewall" #: ../java/src/net/i2p/router/web/SummaryHelper.java:176 msgid "Disconnected - check network cable" -msgstr "" +msgstr "Verbinding verbroken - controleer de netwerk kabel" #: ../java/src/net/i2p/router/web/SummaryHelper.java:178 msgid "" @@ -3900,7 +3901,7 @@ msgstr "Versie {0}" #: ../java/src/net/i2p/router/web/SummaryHelper.java:689 msgid "Update available" -msgstr "" +msgstr "Update beschikbaar" #. Note to translators: parameter is a version, e.g. "0.8.4" #: ../java/src/net/i2p/router/web/SummaryHelper.java:713 @@ -3923,7 +3924,7 @@ msgstr "Hulp met firewall configuratie" #: ../java/src/net/i2p/router/web/SummaryHelper.java:747 msgid "Check network connection and NAT/firewall" -msgstr "" +msgstr "Controleer netwerk connectie en NAT/firewall" #: ../java/src/net/i2p/router/web/SummaryHelper.java:766 msgid "Reseed" @@ -4363,7 +4364,7 @@ msgstr "stel bandbreedte in" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164 msgid "Router is down" -msgstr "" +msgstr "Router staat uit" #. We have intl defined when this is included, but not when compiled #. standalone. @@ -4582,7 +4583,7 @@ msgid "" "Be careful changing any settings here. The 'router console' and 'application" " tunnels' are required for most uses of I2P. Only advanced users should " "change these." -msgstr "" +msgstr "Wees voorzichtig met het aanpassen van instellingen hier. De 'router console' en 'applicatie tunnels' zijn nodig voor de meeste toepassingen van I2P. Alleen gevorderde gebruikers zouden deze moeten aanpassen." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:461 msgid "To change other client options, edit the file" @@ -4685,7 +4686,7 @@ msgstr "Plugin Installatie" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582 #, java-format msgid "Look for available plugins on {0}." -msgstr "" +msgstr "Kijk voor beschikbare plugins op {0}." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:585 msgid "To install a plugin, enter the download URL:" @@ -4714,7 +4715,7 @@ msgstr "Aanbevolen Eepsites" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:411 msgid "Local Services" -msgstr "" +msgstr "Lokale Diensten" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:147 msgid "config keyring" @@ -4901,27 +4902,27 @@ msgstr "Experimenteel" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:504 msgid "IPv6 Configuration" -msgstr "" +msgstr "IPv6 Configuratie" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:508 msgid "Disable IPv6" -msgstr "" +msgstr "IPv6 uitschakelen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:512 msgid "Enable IPv6" -msgstr "" +msgstr "IPv6 inschakelen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516 msgid "Prefer IPv4 over IPv6" -msgstr "" +msgstr "Liever IPv4 dan IPv6" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520 msgid "Prefer IPv6 over IPv4" -msgstr "" +msgstr "Verkies IPv6 over IPv4" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524 msgid "Use IPv6 only (disable IPv4)" -msgstr "" +msgstr "Gebruik alleen IPv6 (schakel IPv4 uit)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528 msgid "UDP Configuration:" @@ -4938,7 +4939,7 @@ msgstr "Schakel volledig uit" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538 msgid "(select only if behind a firewall that blocks outbound UDP)" -msgstr "" +msgstr "(alleen selecteren als je achter een firewall zit die uitgaande UDP verbindingen blokkeert)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550 msgid "TCP Configuration" @@ -5173,7 +5174,7 @@ msgstr "De router is niet geconfigureerd om zijn adres te publiceren, daarom ver msgid "" "Hidden mode is automatically enabled for added protection in certain " "countries." -msgstr "" +msgstr "Verborgen modus is automatisch ingeschakeld voor meer beveiliging in bepaalde landen." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698 msgid "WARN - Firewalled and Fast" @@ -5649,11 +5650,11 @@ msgstr "Hernieuw interval" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:456 msgid "seconds" -msgstr "" +msgstr "seconden" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:460 msgid "Customize Summary Bar" -msgstr "" +msgstr "Pas de opsomming balk aan" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:145 msgid "config stats" @@ -5878,28 +5879,28 @@ msgstr "Welkom bij I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328 msgid "I2P Addressbook" -msgstr "" +msgstr "I2P Adresboek" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:330 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:331 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:330 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:330 msgid "Open in new tab" -msgstr "" +msgstr "Openen in een nieuwe tab" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:334 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:335 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:334 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:334 msgid "Your browser does not support iFrames." -msgstr "" +msgstr "Je browser ondersteund iFrames niet." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336 msgid "Click here to continue." -msgstr "" +msgstr "Klik hier om door te gaan." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:153 msgid "Internal Error" @@ -5998,15 +5999,15 @@ msgstr "Interessante Eepsites" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:161 msgid "i2p tunnel manager" -msgstr "" +msgstr "i2p tunnel manager" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329 msgid "I2P Tunnel Manager" -msgstr "" +msgstr "I2P Tunnel Manager" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:145 msgid "Jar File Dump" -msgstr "" +msgstr "Jar Bestand Dump" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:143 msgid "job queue" @@ -6038,11 +6039,11 @@ msgstr "Service (Wrapper) Logs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:143 msgid "network database" -msgstr "" +msgstr "netwerk database" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310 msgid "I2P Network Database" -msgstr "" +msgstr "I2P Netwerk Database" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:149 msgid "WebApp Not Found" @@ -6080,7 +6081,7 @@ msgstr "I2P Netwerk Peer Profielen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:145 msgid "Proof" -msgstr "" +msgstr "Bewijs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:143 msgid "statistics" @@ -6097,11 +6098,11 @@ msgstr "{0} Verversing Uitschakelen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:161 msgid "torrents" -msgstr "" +msgstr "torrents" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328 msgid "I2P Torrent Downloader" -msgstr "" +msgstr "I2P Torrent Downloader" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:143 msgid "tunnel summary" @@ -6123,8 +6124,8 @@ msgstr "Profiel voor peer {0}" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:161 msgid "webmail" -msgstr "" +msgstr "webmail" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328 msgid "I2P Webmail" -msgstr "" +msgstr "I2P Webmail" diff --git a/apps/routerconsole/locale/messages_uk.po b/apps/routerconsole/locale/messages_uk.po index 9a9b99ae50..bc735580ef 100644 --- a/apps/routerconsole/locale/messages_uk.po +++ b/apps/routerconsole/locale/messages_uk.po @@ -5,17 +5,18 @@ # # Translators: # naeto , 2012 -# azb , 2014 -# Денис Лысенко , 2011 -# Денис Лысенко , 2011 +# Anton Zub , 2014 +# Denis Blank , 2011 +# Denis Blank , 2011 # jonny_nut, 2014 +# LinuxChata, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-04-19 19:00+0000\n" -"Last-Translator: azb \n" +"PO-Revision-Date: 2014-07-20 08:53+0000\n" +"Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -397,11 +398,11 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:604 msgid "The slow start threshold" -msgstr "" +msgstr "Поріг повільного старту" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:605 msgid "The round trip time in milliseconds" -msgstr "" +msgstr "Час між відправленням запиту й одержанням відповіді у мілісекундах" #. "").append(_("Dev")).append(": ").append(_("The #. standard deviation of the round trip time in @@ -420,39 +421,39 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1128 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2559 msgid "TX" -msgstr "" +msgstr "Передано" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:609 msgid "The total number of packets sent to the peer" -msgstr "" +msgstr "Загальна кількість пакетів, відправлених до вузла" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1129 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2561 msgid "RX" -msgstr "" +msgstr "Прийнято" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:610 msgid "The total number of packets received from the peer" -msgstr "" +msgstr "Загальна кількість пакетів, отриманих від вузла" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2564 msgid "Dup TX" -msgstr "" +msgstr "Повт. передано" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:611 msgid "The total number of packets retransmitted to the peer" -msgstr "" +msgstr "Загальна кількість пакетів, повторно відправлених до вузла" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2566 msgid "Dup RX" -msgstr "" +msgstr "Повт. прийнято" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:612 msgid "The total number of duplicate packets received from the peer" -msgstr "" +msgstr "Загальна кількість пакетів, повторно отриманих від вузла" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:525 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:20 diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index a235c37b6e..d9c7213b3f 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -5,7 +5,7 @@ # # Translators: # ducki2p , 2011 -# nametooshort , 2013-2014 +# linloveliang , 2013-2014 # xtoaster , 2012 # walking , 2011 # walking , 2011 @@ -13,7 +13,7 @@ # walking , 2011 # wwj402 , 2013 # xtoaster , 2012 -# Y.F Yang , 2014 +# YF , 2014 # xtoaster , 2012 # xtoaster , 2012 msgid "" @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-06 18:27+0000\n" -"PO-Revision-Date: 2014-03-01 14:52+0000\n" -"Last-Translator: Y.F Yang \n" +"PO-Revision-Date: 2014-05-18 21:16+0000\n" +"Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -783,7 +783,7 @@ msgstr "传输 {0} 的数据失败" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243 #: ../java/src/net/i2p/router/web/SummaryHelper.java:671 msgid "Update downloaded" -msgstr "升更新已下载" +msgstr "更新已下载" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1199 #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1243 diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java index 6a5bf7fa30..043baba68d 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java @@ -391,7 +391,11 @@ class SAMv3Handler extends SAMv1Handler } else if (domain.equals("NAMING")) { canContinue = execNamingMessage(opcode, props); } else if (domain.equals("DATAGRAM")) { + // TODO not yet overridden, ID is ignored, most recent DATAGRAM session is used canContinue = execDatagramMessage(opcode, props); + } else if (domain.equals("RAW")) { + // TODO not yet overridden, ID is ignored, most recent RAW session is used + canContinue = execRawMessage(opcode, props); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Unrecognized message domain: \"" @@ -694,10 +698,10 @@ class SAMv3Handler extends SAMv1Handler else { if (_log.shouldLog(Log.DEBUG)) - _log.debug ( "Unrecognized RAW message opcode: \"" + _log.debug ( "Unrecognized STREAM message opcode: \"" + opcode + "\"" ); try { - notifyStreamResult(true, "I2P_ERROR", "Unrecognized RAW message opcode: "+opcode ); + notifyStreamResult(true, "I2P_ERROR", "Unrecognized STREAM message opcode: "+opcode ); } catch (IOException e) {} return false; } @@ -716,9 +720,9 @@ class SAMv3Handler extends SAMv1Handler String dest = props.getProperty("DESTINATION"); if (dest == null) { - notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in RAW SEND message"); + notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in STREAM CONNECT message"); if (_log.shouldLog(Log.DEBUG)) - _log.debug("Destination not specified in RAW SEND message"); + _log.debug("Destination not specified in STREAM CONNECT message"); return false; } props.remove("DESTINATION"); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 1fdbb943f9..102bfa6cc1 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -44,6 +44,7 @@ class PacketQueue implements SendMessageStatusListener { private static final int FINAL_TAGS_TO_SEND = 4; private static final int FINAL_TAG_THRESHOLD = 2; private static final long REMOVE_EXPIRED_TIME = 67*1000; + private static final boolean ENABLE_STATUS_LISTEN = false; public PacketQueue(I2PAppContext context, I2PSession session, ConnectionManager mgr) { _context = context; @@ -134,7 +135,7 @@ class PacketQueue implements SendMessageStatusListener { if (con != null) { if (con.isInbound()) options.setSendLeaseSet(false); - else + else if (ENABLE_STATUS_LISTEN) listenForStatus = true; } options.setTagsToSend(INITIAL_TAGS_TO_SEND); diff --git a/apps/susidns/locale/messages_en.po b/apps/susidns/locale/messages_en.po index a1d1d3b595..d038cbefea 100644 --- a/apps/susidns/locale/messages_en.po +++ b/apps/susidns/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P susidns\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,111 +18,122 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:130 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:131 #, java-format msgid "Host name \"{0}\" contains illegal character {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:143 -#: ../src/java/src/i2p/susi/dns/AddressBean.java:145 -#: ../src/java/src/i2p/susi/dns/AddressBean.java:152 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:144 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:146 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:153 #, java-format msgid "Host name cannot start with \"{0}\"" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:147 -#: ../src/java/src/i2p/susi/dns/AddressBean.java:149 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:148 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:150 #, java-format msgid "Host name cannot end with \"{0}\"" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:154 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:155 #, java-format msgid "Host name cannot contain \"{0}\"" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:157 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:158 #, java-format msgid "" "Host name \"{0}\" requires conversion to ASCII but the conversion library is " "unavailable in this JVM" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:218 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:219 msgid "None" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:226 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:227 msgid "Hashcash" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:228 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:229 msgid "Hidden" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:230 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:231 msgid "Signed" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:232 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:233 +msgid "Key" +msgstr "" + +#: ../src/java/src/i2p/susi/dns/AddressBean.java:235 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:260 #, java-format msgid "Type {0}" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:201 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:247 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:254 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:257 +msgid "DSA 1024 bit" +msgstr "" + +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:188 #, java-format msgid "One result for search within filtered list." msgid_plural "{0} results for search within filtered list." msgstr[0] "" msgstr[1] "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:205 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:192 #, java-format msgid "Filtered list contains 1 entry." msgid_plural "Filtered list contains {0} entries." msgstr[0] "" msgstr[1] "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:210 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:197 #, java-format msgid "One result for search." msgid_plural "{0} results for search." msgstr[0] "" msgstr[1] "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:219 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206 #, java-format msgid "Address book contains 1 entry." msgid_plural "Address book contains {0} entries." msgstr[0] "" msgstr[1] "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:235 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222 #, java-format msgid "Showing {0} of {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410 msgid "Add" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:268 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:255 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408 msgid "Replace" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:267 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:254 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:238 #, java-format msgid "Host name {0} is already in address book, unchanged." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:240 #, java-format msgid "" @@ -130,63 +141,63 @@ msgid "" "\"Replace\" to overwrite." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:282 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:253 #, java-format msgid "Destination added for {0}." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:271 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:255 #, java-format msgid "Destination changed for {0}." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:286 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:257 msgid "Warning - host name does not end with \".i2p\"" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:265 msgid "Invalid Base 64 destination." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:297 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:271 #, java-format msgid "Invalid host name \"{0}\"." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:300 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:274 msgid "Please enter a host name and destination" msgstr "" #. clear search when deleting -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:325 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:312 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:267 msgid "Delete Entry" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349 msgid "Delete Selected" msgstr "" #. parameter is a host name -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:295 #, java-format msgid "Destination {0} deleted." msgstr "" #. parameter will always be >= 2 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:308 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:298 #, java-format msgid "1 destination deleted." @@ -194,57 +205,57 @@ msgid_plural "{0} destinations deleted." msgstr[0] "" msgstr[1] "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:323 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:300 msgid "No entries selected to delete." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:331 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307 msgid "Address book saved." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:334 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321 msgid "ERROR: Could not write addressbook file." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:339 -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:139 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:141 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 msgid "" "Invalid form submission, probably because you used the \"back\" or \"reload" "\" button on your browser. Please resubmit." msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:341 -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:141 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "" -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:130 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:116 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:153 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:145 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:126 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Save" msgstr "" -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:132 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:101 msgid "Configuration saved." msgstr "" -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:133 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:135 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:151 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:143 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:156 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:147 msgid "Reload" msgstr "" -#: ../src/java/src/i2p/susi/dns/ConfigBean.java:135 +#: ../src/java/src/i2p/susi/dns/ConfigBean.java:104 msgid "Configuration reloaded." msgstr "" @@ -267,16 +278,16 @@ msgstr "" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:138 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:133 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143 msgid "Subscriptions saved." msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:137 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 msgid "Subscriptions reloaded." msgstr "" @@ -286,69 +297,69 @@ msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:131 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:125 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:130 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:116 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:132 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:130 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:117 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:121 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:137 msgid "Overview" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:133 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:132 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:118 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:116 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:119 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:119 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123 msgid "Address books" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:129 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:134 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:120 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:118 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:121 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:121 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125 msgid "private" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:137 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:131 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:136 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:122 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:120 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:123 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:127 msgid "master" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:139 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:138 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:124 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:122 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:125 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:129 msgid "router" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:135 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:140 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:126 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:124 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:131 msgid "published" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:142 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:128 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:126 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:129 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:129 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:133 msgid "Subscriptions" msgstr "" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:139 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:144 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:130 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:128 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:131 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:131 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:135 msgid "Configuration" msgstr "" @@ -435,104 +446,104 @@ msgstr "" msgid "Host Name" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:119 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:124 msgid "configuration" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:155 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 msgid "Hints" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:157 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162 msgid "" "File and directory paths here are relative to the addressbook's working " "directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P" "\\addressbook\\ (Windows)." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:159 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164 msgid "" "If you want to manually add lines to an addressbook, add them to the private " "or master addressbooks." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:166 msgid "" "The router addressbook and the published addressbook are updated by the " "addressbook application." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:168 msgid "" "When you publish your addressbook, ALL destinations from the master and " "router addressbooks appear there." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:163 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:170 msgid "" "Use the private addressbook for private destinations, these are not " "published." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:165 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:172 msgid "Options" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:167 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:174 msgid "File containing the list of subscriptions URLs (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:169 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:176 msgid "Update interval in hours" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:171 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:178 msgid "" "Your public hosts.txt file (choose a path within your webserver document " "root)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:173 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:180 msgid "Your hosts.txt (don't change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:175 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:182 msgid "Your personal addressbook, these hosts will be published" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:177 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:184 msgid "Your private addressbook, it is never published" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:179 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:186 msgid "Port for your eepProxy (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:181 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:188 msgid "Hostname for your eepProxy (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:183 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190 msgid "Whether to update the published addressbook" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:185 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:192 msgid "" "File containing the etags header from the fetched subscription URLs (no need " "to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:187 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:194 msgid "" "File containing the modification timestamp for each fetched subscription URL " "(no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:189 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:196 msgid "File to log activity to (change to /dev/null if you like)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:198 msgid "Name of the theme to use (defaults to 'light')" msgstr "" @@ -572,10 +583,6 @@ msgstr "" msgid "Signing Key" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:225 -msgid "DSA 1024 bit" -msgstr "" - #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229 msgid "Certificate" msgstr "" @@ -596,111 +603,112 @@ msgstr "" msgid "Notes" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:110 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:113 msgid "Introduction" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:132 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:135 msgid "What is the addressbook?" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:134 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137 msgid "The addressbook application is part of your I2P installation." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:135 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:139 msgid "" "It regularly updates your hosts.txt file from distributed sources or " "\"subscriptions\"." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:141 +#, java-format msgid "" -"In the default configuration, the address book is only subscribed to www." -"i2p2.i2p." +"In the default configuration, the address book is only subscribed to {0}." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:143 msgid "" "Subscribing to additional sites is easy, just add them to your subscriptions file." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 msgid "" "For more information on naming in I2P, see the overview." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:147 msgid "How does the addressbook application work?" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:144 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 msgid "" "The addressbook application regularly polls your subscriptions and merges " "their content into your \"router\" address book." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:151 msgid "" "Then it merges your \"master\" address book into the router address book as " "well." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:146 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:153 msgid "" "If configured, the router address book is now written to the \"published\" " "address book, which will be publicly available if you are running an eepsite." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:148 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:155 msgid "" "The router also uses a private address book (not shown in the picture), " "which is not merged or published." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:157 msgid "" "Hosts in the private address book can be accessed by you but their addresses " "are never distributed to others." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:150 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:159 msgid "" "The private address book can also be used for aliases of hosts in your other " "address books." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:111 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:115 msgid "subscriptions" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:147 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "The subscription file contains a list of i2p URLs." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:148 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153 msgid "" "The addressbook application regularly checks this list for new eepsites." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:155 msgid "Those URLs refer to published hosts.txt files." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:150 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:157 +#, java-format msgid "" -"The default subscription is the hosts.txt from www.i2p2.i2p, which is " -"updated infrequently." +"The default subscription is the hosts.txt from {0}, which is updated " +"infrequently." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:159 msgid "" "So it is a good idea to add additional subscriptions to sites that have the " "latest addresses." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 msgid "See the FAQ for a list of subscription URLs." msgstr "" diff --git a/apps/susidns/locale/messages_zh.po b/apps/susidns/locale/messages_zh.po index 63c05a58b1..ad5210b587 100644 --- a/apps/susidns/locale/messages_zh.po +++ b/apps/susidns/locale/messages_zh.po @@ -2,9 +2,10 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the susidns package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # ducki2p , 2011 +# xkimo_daeee , 2014 # walking , 2011 # walking , 2013 # walking , 2011 @@ -12,15 +13,14 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 19:56+0000\n" -"PO-Revision-Date: 2013-07-11 06:19+0000\n" -"Last-Translator: xtoaster \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/" -"language/zh_CN/)\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2014-02-06 18:27+0000\n" +"PO-Revision-Date: 2014-06-30 11:38+0000\n" +"Last-Translator: xkimo_daeee \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../src/java/src/i2p/susi/dns/AddressBean.java:130 @@ -49,8 +49,8 @@ msgstr "主机名称不能包含“{0}”" #: ../src/java/src/i2p/susi/dns/AddressBean.java:157 #, java-format msgid "" -"Host name \"{0}\" requires conversion to ASCII but the conversion library is " -"unavailable in this JVM" +"Host name \"{0}\" requires conversion to ASCII but the conversion library is" +" unavailable in this JVM" msgstr "主机名称“{0}”需要转化为ASCIIb编码，但您的JavaJVM缺少转换需要的库。" #: ../src/java/src/i2p/susi/dns/AddressBean.java:218 @@ -74,153 +74,150 @@ msgstr "已数字签名" msgid "Type {0}" msgstr "类型{0}" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:202 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:201 #, java-format msgid "One result for search within filtered list." msgid_plural "{0} results for search within filtered list." msgstr[0] "列表中有{0}个与筛选条件匹配的结果。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:205 #, java-format msgid "Filtered list contains 1 entry." msgid_plural "Filtered list contains {0} entries." msgstr[0] "筛选列表中包含{0}条记录。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:211 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:210 #, java-format msgid "One result for search." msgid_plural "{0} results for search." msgstr[0] "{0}个搜索结果。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:220 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:219 #, java-format msgid "Address book contains 1 entry." msgid_plural "Address book contains {0} entries." msgstr[0] "地址簿中有{0}条记录。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:236 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:235 #, java-format msgid "Showing {0} of {1}" msgstr "显示 {0} 个项目共 {1}" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:258 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:410 msgid "Add" msgstr "添加" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:258 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:257 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:268 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:227 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:239 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:408 msgid "Replace" msgstr "替换" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:268 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:267 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:238 #, java-format msgid "Host name {0} is already in address book, unchanged." msgstr "主机名{0}已存在于地址簿中，操作取消。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:270 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:240 #, java-format msgid "" -"Host name {0} is already in address book with a different destination. Click " -"\"Replace\" to overwrite." -msgstr "" -"主机名{0}已存在于地址簿中，但对应不同的目标密钥，点击“替换”覆盖此记录。" +"Host name {0} is already in address book with a different destination. Click" +" \"Replace\" to overwrite." +msgstr "主机名{0}已存在于地址簿中，但对应不同的目标密钥，点击“替换”覆盖此记录。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:283 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:282 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:253 #, java-format msgid "Destination added for {0}." msgstr "目标密钥已添加为{0}。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:285 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:255 #, java-format msgid "Destination changed for {0}." msgstr "目标已更新为{0}。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:286 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:257 msgid "Warning - host name does not end with \".i2p\"" msgstr "警告 - 主机名未以\".i2p\"结尾。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:292 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:265 msgid "Invalid Base 64 destination." msgstr "无效的Base64目标密钥" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:298 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:297 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:271 #, java-format msgid "Invalid host name \"{0}\"." msgstr "无效的主机名“{0}”。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:301 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:300 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:274 msgid "Please enter a host name and destination" msgstr "请输入主机名称与目标" #. clear search when deleting -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:325 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:267 msgid "Delete Entry" msgstr "删除记录" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:304 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:349 msgid "Delete Selected" msgstr "删除选中项" #. parameter is a host name -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:319 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:295 #, java-format msgid "Destination {0} deleted." msgstr "目标 {0} 已删除" #. parameter will always be >= 2 -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:322 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:298 #, java-format msgid "1 destination deleted." msgid_plural "{0} destinations deleted." msgstr[0] "{0} 个目标已删除。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:324 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:323 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:300 msgid "No entries selected to delete." msgstr "未选择要删除的记录。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:332 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:331 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307 msgid "Address book saved." msgstr "地址簿已保存。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:335 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:334 msgid "ERROR: Could not write addressbook file." msgstr "错误:无法写入地址簿文件" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:340 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:339 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:139 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:311 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:141 msgid "" -"Invalid form submission, probably because you used the \"back\" or \"reload" -"\" button on your browser. Please resubmit." -msgstr "" -"提交数据无效，可能的原因是您使用了浏览器中的“前进”或“后退”按钮造成会话过期，" -"请重新提交。" +"Invalid form submission, probably because you used the \"back\" or " +"\"reload\" button on your browser. Please resubmit." +msgstr "提交数据无效，可能的原因是您使用了浏览器中的“前进”或“后退”按钮造成会话过期，请重新提交。" -#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:342 +#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:341 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:141 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:313 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:143 @@ -449,16 +446,14 @@ msgstr "提示" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:157 msgid "" "File and directory paths here are relative to the addressbook's working " -"directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P" -"\\addressbook\\ (Windows)." -msgstr "" -"此处使用的路径是以地址簿工作目录为参照的相对路径，通常为 ~/.i2p/addressbook/ " -"(Linux) 或 %APPDATA%\\I2P\\addressbook\\ (Windows)." +"directory, which is normally ~/.i2p/addressbook/ (Linux) or " +"%APPDATA%\\I2P\\addressbook\\ (Windows)." +msgstr "此处使用的路径是以地址簿工作目录为参照的相对路径，通常为 ~/.i2p/addressbook/ (Linux) 或 %APPDATA%\\I2P\\addressbook\\ (Windows)." #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:159 msgid "" -"If you want to manually add lines to an addressbook, add them to the private " -"or master addressbooks." +"If you want to manually add lines to an addressbook, add them to the private" +" or master addressbooks." msgstr "如果您希望想地址簿手动添加地址条目，请将其加入私有地址簿或主地址簿。" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 @@ -471,9 +466,7 @@ msgstr "路由地址簿与已发布地址簿会由地址簿程序负责更新。 msgid "" "When you publish your addressbook, ALL destinations from the master and " "router addressbooks appear there." -msgstr "" -"当您发布地址簿时，主地址簿与路由地址簿中的所有地址条目都会显示于已发布地址簿" -"中。" +msgstr "当您发布地址簿时，主地址簿与路由地址簿中的所有地址条目都会显示于已发布地址簿中。" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:163 msgid "" @@ -497,8 +490,7 @@ msgstr "更新周期(小时)" msgid "" "Your public hosts.txt file (choose a path within your webserver document " "root)" -msgstr "" -"您发布的公开地址簿 hosts.txt (请指定为您Web服务器目录中的某个路径以便发布。)" +msgstr "您发布的公开地址簿 hosts.txt (请指定为您Web服务器目录中的某个路径以便发布。)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:173 msgid "Your hosts.txt (don't change)" @@ -526,14 +518,14 @@ msgstr "是否更新发布地址簿" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:185 msgid "" -"File containing the etags header from the fetched subscription URLs (no need " -"to change)" +"File containing the etags header from the fetched subscription URLs (no need" +" to change)" msgstr "此文件含有订阅URL返回的etag头(无需修改)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:187 msgid "" -"File containing the modification timestamp for each fetched subscription URL " -"(no need to change)" +"File containing the modification timestamp for each fetched subscription URL" +" (no need to change)" msgstr "此文件含有每个地址簿订阅URL上次获取时的修改时间(无需修改)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:189 @@ -620,30 +612,25 @@ msgstr "地址簿程序是I2P软件的一部分。" msgid "" "It regularly updates your hosts.txt file from distributed sources or " "\"subscriptions\"." -msgstr "" -"他通过分散的来源或称地址簿“订阅”(概念类似RSS)更新您的地址簿文件 host.txt。" +msgstr "他通过分散的来源或称地址簿“订阅”(概念类似RSS)更新您的地址簿文件 host.txt。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137 msgid "" -"In the default configuration, the address book is only subscribed to www." -"i2p2.i2p." +"In the default configuration, the address book is only subscribed to " +"www.i2p2.i2p." msgstr "默认安装中，地址簿程序只订阅了 www.i2p2.i2p 的地址簿。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138 msgid "" -"Subscribing to additional sites is easy, just add them to your subscriptions file." -msgstr "" -"要订阅其他站点很容易，只需将他们加入您的订阅 文" -"件。" +"Subscribing to additional sites is easy, just add them to your subscriptions file." +msgstr "要订阅其他站点很容易，只需将他们加入您的订阅 文件。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140 msgid "" -"For more information on naming in I2P, see the overview on www.i2p2.i2p." -msgstr "" -"I2P 中域名转换的更多信息，参见 www.i2p2.i2p 上的概述部分。" +"For more information on naming in I2P, see the overview." +msgstr "更多关于在I2P中命名的信息, 参见概述." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142 msgid "How does the addressbook application work?" @@ -664,10 +651,9 @@ msgstr "然后您的“主地址簿\"中的内容也会并入\"路由器地址 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:146 msgid "" "If configured, the router address book is now written to the \"published\" " -"address book, which will be publicly available if you are running an eepsite." -msgstr "" -"如果配置中指定，“路由器地址簿”还会被写入“已发布地址簿”中，如果您运行有" -"eepsite，此地址簿可以被公开订阅。" +"address book, which will be publicly available if you are running an " +"eepsite." +msgstr "如果配置中指定，“路由器地址簿”还会被写入“已发布地址簿”中，如果您运行有eepsite，此地址簿可以被公开订阅。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:148 msgid "" @@ -677,14 +663,14 @@ msgstr "路由器同时还使用“私人地址簿”(图中未显示)，该地 #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 msgid "" -"Hosts in the private address book can be accessed by you but their addresses " -"are never distributed to others." +"Hosts in the private address book can be accessed by you but their addresses" +" are never distributed to others." msgstr "您可以访问“私有地址簿”中的主机名，但他们的实际地址不会发布给其他人。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:150 msgid "" -"The private address book can also be used for aliases of hosts in your other " -"address books." +"The private address book can also be used for aliases of hosts in your other" +" address books." msgstr "“私有地址簿”也可以用于为其他地址簿中的主机名添加别名。" #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:111 @@ -718,6 +704,4 @@ msgstr "所以订阅一些网站的最新地址簿是个不错的主意。" #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153 msgid "See the FAQ for a list of subscription URLs." -msgstr "" -"其他来源的订阅链接参见I2P站点的 FAQ" +msgstr "其他来源的订阅链接参见I2P站点的 FAQ" diff --git a/apps/susidns/src/WEB-INF/web-template.xml b/apps/susidns/src/WEB-INF/web-template.xml index 912be2f4cc..599826246b 100644 --- a/apps/susidns/src/WEB-INF/web-template.xml +++ b/apps/susidns/src/WEB-INF/web-template.xml @@ -3,6 +3,15 @@ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + susidns diff --git a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java index ec022b70c2..08ca6dd313 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java @@ -142,7 +142,7 @@ public class BaseBean * @since 0.9.13 moved from subclasses */ public void setAction(String action) { - this.action = action; + this.action = DataHelper.stripHTML(action); } /** @@ -158,7 +158,7 @@ public class BaseBean * @since 0.9.13 moved from subclasses */ public void setSerial(String serial) { - this.serial = serial; + this.serial = DataHelper.stripHTML(serial); } /** diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java index 71a35133bf..5a147a66a3 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -30,6 +30,7 @@ import java.util.Properties; import net.i2p.client.naming.NamingService; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; /** @@ -322,7 +323,7 @@ public class NamingServiceBean extends AddressbookBean } public void setH(String h) { - this.detail = h; + this.detail = DataHelper.stripHTML(h); } public AddressBean getLookup() { diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index ca6e9c44ca..15d394336e 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -160,7 +160,7 @@ public class SubscriptionsBean extends BaseBean public void setContent(String content) { // will come from form with \r\n line endings - this.content = content; + this.content = DataHelper.stripHTML(content); } public String getContent() diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 374caeb716..6b7801dd03 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -28,6 +28,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %> <%@page pageEncoding="UTF-8"%> diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 8afd6a86de..6a650d3f5d 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -28,6 +28,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %> <%@page pageEncoding="UTF-8"%> diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index d5d6256414..9334e43ca7 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -25,6 +25,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %> <%@page pageEncoding="UTF-8"%> @@ -73,6 +75,7 @@ if (detail == null) { %>

No host specified

<% } else { + detail = net.i2p.data.DataHelper.stripHTML(detail); i2p.susi.dns.AddressBean addr = book.getLookup(); if (addr == null) { %>

Not found: <%=detail%>

<% diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 7023d080f3..505beeec7f 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -28,6 +28,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %> <%@page pageEncoding="UTF-8"%> diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index afc572f428..db588c6a8d 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -28,6 +28,8 @@ request.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); %> <%@page pageEncoding="UTF-8"%> diff --git a/apps/susimail/locale/messages_de.po b/apps/susimail/locale/messages_de.po index 0e3f0babb1..9393742747 100644 --- a/apps/susimail/locale/messages_de.po +++ b/apps/susimail/locale/messages_de.po @@ -5,19 +5,20 @@ # # Translators: # blabla, 2011 +# blabla , 2014 # blabla , 2011, 2012 # D.A. Loader, 2012 # ducki2p , 2011 # foo , 2009 -# echeloni2p , 2014 +# Lars Schimmer , 2014 # mixxy, 2011 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-01 11:45+0000\n" -"PO-Revision-Date: 2014-05-08 11:27+0000\n" -"Last-Translator: echeloni2p \n" +"PO-Revision-Date: 2014-05-21 18:05+0000\n" +"Last-Translator: blabla \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "kein Kodierer für Kodierung \\''{0}\\'' gefunden" #: src/src/i2p/susi/webmail/WebMail.java:318 #: src/src/i2p/susi/webmail/WebMail.java:1005 msgid "Re:" -msgstr "Re:" +msgstr "Aw:" #: src/src/i2p/susi/webmail/WebMail.java:308 #: src/src/i2p/susi/webmail/WebMail.java:322 @@ -64,7 +65,7 @@ msgstr "Teil ({0}) aufgrund von {1} nicht angezeigt" #: src/src/i2p/susi/webmail/WebMail.java:672 #, java-format msgid "Download attachment {0}" -msgstr "Anhang runterladen {0}" +msgstr "Anhang herunterladen {0}" #: src/src/i2p/susi/webmail/WebMail.java:673 msgid "File is packed into a zipfile for security reasons." @@ -101,7 +102,7 @@ msgstr "ungültiger POP3-Port" #: src/src/i2p/susi/webmail/WebMail.java:761 msgid "Need port number for smtp connect." -msgstr "SMTP-Port für die SMTP-Verbindung benötigt" +msgstr "Port für die SMTP-Verbindung benötigt" #: src/src/i2p/susi/webmail/WebMail.java:768 msgid "SMTP port number is not in range 0..65535." @@ -267,15 +268,15 @@ msgstr "Absender" #: src/src/i2p/susi/webmail/WebMail.java:2030 msgid "To" -msgstr "An" +msgstr "Empfänger" #: src/src/i2p/susi/webmail/WebMail.java:2031 msgid "Cc" -msgstr "Cc" +msgstr "Kopie" #: src/src/i2p/susi/webmail/WebMail.java:2032 msgid "Bcc" -msgstr "Bcc" +msgstr "Blindkopie" #: src/src/i2p/susi/webmail/WebMail.java:2033 msgid "Bcc to self" @@ -289,7 +290,7 @@ msgstr "Betreff" #: src/src/i2p/susi/webmail/WebMail.java:2037 msgid "Add Attachment" -msgstr "Anhang anfügen" +msgstr "Anhang hinzufügen" #. TODO disable/hide in JS if no file selected #: src/src/i2p/susi/webmail/WebMail.java:2039 @@ -319,11 +320,11 @@ msgstr "Host" #: src/src/i2p/susi/webmail/WebMail.java:2080 msgid "POP3 Port" -msgstr "POP3 Port" +msgstr "POP3-Port" #: src/src/i2p/susi/webmail/WebMail.java:2081 msgid "SMTP Port" -msgstr "SMTP Port" +msgstr "SMTP-Port" #: src/src/i2p/susi/webmail/WebMail.java:2086 msgid "Read Mail Offline" @@ -336,7 +337,7 @@ msgstr "Einstellungen" #: src/src/i2p/susi/webmail/WebMail.java:2093 msgid "Learn about I2P mail" -msgstr "Erfahre etwas über I2P-Mail" +msgstr "Mehr über I2P-Mail" #: src/src/i2p/susi/webmail/WebMail.java:2094 msgid "Create Account" @@ -395,12 +396,12 @@ msgstr "Sollen die markierten Nachrichten wirklich gelöscht werden?" #: src/src/i2p/susi/webmail/WebMail.java:2198 msgid "Yes, really delete them!" -msgstr "Ja, löschen" +msgstr "Ja, löschen!" #. TODO js #: src/src/i2p/susi/webmail/WebMail.java:2202 msgid "Delete Selected" -msgstr "Selektierte löschen" +msgstr "Ausgewählte Emails löschen" #: src/src/i2p/susi/webmail/WebMail.java:2204 msgid "Mark All" @@ -408,7 +409,7 @@ msgstr "Alles markieren" #: src/src/i2p/susi/webmail/WebMail.java:2206 msgid "Clear All" -msgstr "Alles entfernen" +msgstr "Alle Markierungen aufheben" #: src/src/i2p/susi/webmail/WebMail.java:2231 #: src/src/i2p/susi/webmail/WebMail.java:2232 @@ -504,7 +505,7 @@ msgstr "Fehler beim Öffnen der Mailbox" #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249 msgid "Login failed" -msgstr "Login gescheitert" +msgstr "Anmeldung fehlgeschlagen" #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214 msgid "Cannot connect" @@ -513,7 +514,7 @@ msgstr "Verbindung nicht möglich" #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237 msgid "Server refused connection" -msgstr "Server hat Verbindung abgelehnt" +msgstr "Der Server hat Verbindung abgelehnt." #. TODO which recipient? #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262 diff --git a/apps/susimail/locale/messages_en.po b/apps/susimail/locale/messages_en.po index 6cd54eeedc..7d20551a51 100644 --- a/apps/susimail/locale/messages_en.po +++ b/apps/susimail/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P susimail\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-01 11:45+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -23,318 +23,318 @@ msgstr "" msgid "No encoder found for encoding \\''{0}\\''." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:304 -#: src/src/i2p/susi/webmail/WebMail.java:318 -#: src/src/i2p/susi/webmail/WebMail.java:1005 +#: src/src/i2p/susi/webmail/WebMail.java:323 +#: src/src/i2p/susi/webmail/WebMail.java:337 +#: src/src/i2p/susi/webmail/WebMail.java:989 msgid "Re:" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:308 -#: src/src/i2p/susi/webmail/WebMail.java:322 -#: src/src/i2p/susi/webmail/WebMail.java:1043 +#: src/src/i2p/susi/webmail/WebMail.java:327 +#: src/src/i2p/susi/webmail/WebMail.java:341 +#: src/src/i2p/susi/webmail/WebMail.java:1027 msgid "Fwd:" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:594 +#: src/src/i2p/susi/webmail/WebMail.java:578 msgid "unknown" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:615 +#: src/src/i2p/susi/webmail/WebMail.java:599 msgid "Warning: no charset found, fallback to US-ASCII." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:629 +#: src/src/i2p/susi/webmail/WebMail.java:613 #, java-format msgid "Charset \\''{0}\\'' not supported." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:633 +#: src/src/i2p/susi/webmail/WebMail.java:617 #, java-format msgid "Part ({0}) not shown, because of {1}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:669 -#: src/src/i2p/susi/webmail/WebMail.java:672 +#: src/src/i2p/susi/webmail/WebMail.java:653 +#: src/src/i2p/susi/webmail/WebMail.java:656 #, java-format msgid "Download attachment {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:673 +#: src/src/i2p/susi/webmail/WebMail.java:657 msgid "File is packed into a zipfile for security reasons." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:678 +#: src/src/i2p/susi/webmail/WebMail.java:662 #, java-format msgid "Attachment ({0})." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:729 +#: src/src/i2p/susi/webmail/WebMail.java:713 msgid "Need username for authentication." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:733 +#: src/src/i2p/susi/webmail/WebMail.java:717 msgid "Need password for authentication." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:737 +#: src/src/i2p/susi/webmail/WebMail.java:721 msgid "Need hostname for connect." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:742 +#: src/src/i2p/susi/webmail/WebMail.java:726 msgid "Need port number for pop3 connect." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:749 +#: src/src/i2p/susi/webmail/WebMail.java:733 msgid "POP3 port number is not in range 0..65535." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:755 +#: src/src/i2p/susi/webmail/WebMail.java:739 msgid "POP3 port number is invalid." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:761 +#: src/src/i2p/susi/webmail/WebMail.java:745 msgid "Need port number for smtp connect." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:768 +#: src/src/i2p/susi/webmail/WebMail.java:752 msgid "SMTP port number is not in range 0..65535." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:774 +#: src/src/i2p/susi/webmail/WebMail.java:758 msgid "SMTP port number is invalid." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:848 +#: src/src/i2p/susi/webmail/WebMail.java:832 msgid "User logged out." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:851 +#: src/src/i2p/susi/webmail/WebMail.java:835 msgid "Internal error, lost connection." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1008 +#: src/src/i2p/susi/webmail/WebMail.java:992 #, java-format msgid "On {0} {1} wrote:" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1055 +#: src/src/i2p/susi/webmail/WebMail.java:1039 msgid "begin forwarded mail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1077 +#: src/src/i2p/susi/webmail/WebMail.java:1061 msgid "end forwarded mail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1084 -#: src/src/i2p/susi/webmail/WebMail.java:2290 +#: src/src/i2p/susi/webmail/WebMail.java:1068 +#: src/src/i2p/susi/webmail/WebMail.java:2283 msgid "Could not fetch mail body." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1114 +#: src/src/i2p/susi/webmail/WebMail.java:1098 msgid "Message id not valid." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1152 +#: src/src/i2p/susi/webmail/WebMail.java:1136 msgid "Configuration reloaded" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1213 +#: src/src/i2p/susi/webmail/WebMail.java:1197 #, java-format msgid "No Encoding found for {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1217 +#: src/src/i2p/susi/webmail/WebMail.java:1201 #, java-format msgid "Could not encode data: {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1222 +#: src/src/i2p/susi/webmail/WebMail.java:1206 #, java-format msgid "Error reading uploaded file: {0}" msgstr "" #. error if we get here -#: src/src/i2p/susi/webmail/WebMail.java:1307 -#: src/src/i2p/susi/webmail/WebMail.java:1310 +#: src/src/i2p/susi/webmail/WebMail.java:1291 +#: src/src/i2p/susi/webmail/WebMail.java:1294 msgid "Attachment not found." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1357 -#: src/src/i2p/susi/webmail/WebMail.java:1483 +#: src/src/i2p/susi/webmail/WebMail.java:1341 +#: src/src/i2p/susi/webmail/WebMail.java:1469 msgid "Invalid pagesize number, resetting to default value." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1381 +#: src/src/i2p/susi/webmail/WebMail.java:1365 msgid "No messages marked for deletion." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1397 +#: src/src/i2p/susi/webmail/WebMail.java:1381 #, java-format msgid "1 message deleted." msgid_plural "{0} messages deleted." msgstr[0] "" msgstr[1] "" -#: src/src/i2p/susi/webmail/WebMail.java:1462 +#: src/src/i2p/susi/webmail/WebMail.java:1448 msgid "Configuration saved" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1673 -#: src/src/i2p/susi/webmail/WebMail.java:2085 +#: src/src/i2p/susi/webmail/WebMail.java:1662 +#: src/src/i2p/susi/webmail/WebMail.java:2075 msgid "Login" msgstr "" #. mailbox.getNumMails() forces a connection, don't use it #. Not only does it slow things down, but a failure causes all our messages to "vanish" #. subtitle = ngettext("1 Message", "{0} Messages", sessionObject.mailbox.getNumMails()); -#: src/src/i2p/susi/webmail/WebMail.java:1678 +#: src/src/i2p/susi/webmail/WebMail.java:1667 #, java-format msgid "1 Message" msgid_plural "{0} Messages" msgstr[0] "" msgstr[1] "" -#: src/src/i2p/susi/webmail/WebMail.java:1684 +#: src/src/i2p/susi/webmail/WebMail.java:1673 msgid "Show Message" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1686 +#: src/src/i2p/susi/webmail/WebMail.java:1675 msgid "New Message" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1688 +#: src/src/i2p/susi/webmail/WebMail.java:1677 msgid "Configuration" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1699 +#: src/src/i2p/susi/webmail/WebMail.java:1688 msgid "SusiMail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1712 +#: src/src/i2p/susi/webmail/WebMail.java:1701 msgid "Message has not been sent. Do you want to discard it?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1773 +#: src/src/i2p/susi/webmail/WebMail.java:1763 #, java-format msgid "Error decoding content: {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1833 +#: src/src/i2p/susi/webmail/WebMail.java:1823 msgid "no subject" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1850 +#: src/src/i2p/susi/webmail/WebMail.java:1840 msgid "Found no valid sender address." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1856 +#: src/src/i2p/susi/webmail/WebMail.java:1846 #, java-format msgid "Found no valid address in \\''{0}\\''." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1877 +#: src/src/i2p/susi/webmail/WebMail.java:1867 msgid "No recipients found." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1941 +#: src/src/i2p/susi/webmail/WebMail.java:1931 msgid "Mail sent." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1985 +#: src/src/i2p/susi/webmail/WebMail.java:1975 msgid "Send" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1986 -#: src/src/i2p/susi/webmail/WebMail.java:2199 -#: src/src/i2p/susi/webmail/WebMail.java:2330 +#: src/src/i2p/susi/webmail/WebMail.java:1976 +#: src/src/i2p/susi/webmail/WebMail.java:2190 +#: src/src/i2p/susi/webmail/WebMail.java:2323 msgid "Cancel" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2029 -#: src/src/i2p/susi/webmail/WebMail.java:2128 -#: src/src/i2p/susi/webmail/WebMail.java:2278 +#: src/src/i2p/susi/webmail/WebMail.java:2019 +#: src/src/i2p/susi/webmail/WebMail.java:2118 +#: src/src/i2p/susi/webmail/WebMail.java:2271 msgid "From" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2030 +#: src/src/i2p/susi/webmail/WebMail.java:2020 msgid "To" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2031 +#: src/src/i2p/susi/webmail/WebMail.java:2021 msgid "Cc" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2032 +#: src/src/i2p/susi/webmail/WebMail.java:2022 msgid "Bcc" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2033 +#: src/src/i2p/susi/webmail/WebMail.java:2023 msgid "Bcc to self" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2034 -#: src/src/i2p/susi/webmail/WebMail.java:2129 -#: src/src/i2p/susi/webmail/WebMail.java:2280 +#: src/src/i2p/susi/webmail/WebMail.java:2024 +#: src/src/i2p/susi/webmail/WebMail.java:2119 +#: src/src/i2p/susi/webmail/WebMail.java:2273 msgid "Subject" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2037 +#: src/src/i2p/susi/webmail/WebMail.java:2027 msgid "Add Attachment" msgstr "" #. TODO disable/hide in JS if no file selected -#: src/src/i2p/susi/webmail/WebMail.java:2039 +#: src/src/i2p/susi/webmail/WebMail.java:2029 msgid "Add another attachment" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2045 +#: src/src/i2p/susi/webmail/WebMail.java:2035 msgid "Attachments" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2054 +#: src/src/i2p/susi/webmail/WebMail.java:2044 msgid "Delete selected attachments" msgstr "" #. current postman hq length limits 16/12, new postman version 32/32 -#: src/src/i2p/susi/webmail/WebMail.java:2073 +#: src/src/i2p/susi/webmail/WebMail.java:2063 msgid "User" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2074 +#: src/src/i2p/susi/webmail/WebMail.java:2064 msgid "Password" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2079 +#: src/src/i2p/susi/webmail/WebMail.java:2069 msgid "Host" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2080 +#: src/src/i2p/susi/webmail/WebMail.java:2070 msgid "POP3 Port" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2081 +#: src/src/i2p/susi/webmail/WebMail.java:2071 msgid "SMTP Port" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2086 +#: src/src/i2p/susi/webmail/WebMail.java:2076 msgid "Read Mail Offline" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2090 -#: src/src/i2p/susi/webmail/WebMail.java:2218 +#: src/src/i2p/susi/webmail/WebMail.java:2080 +#: src/src/i2p/susi/webmail/WebMail.java:2208 msgid "Settings" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2093 +#: src/src/i2p/susi/webmail/WebMail.java:2083 msgid "Learn about I2P mail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2094 +#: src/src/i2p/susi/webmail/WebMail.java:2084 msgid "Create Account" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2107 -#: src/src/i2p/susi/webmail/WebMail.java:2262 +#: src/src/i2p/susi/webmail/WebMail.java:2097 +#: src/src/i2p/susi/webmail/WebMail.java:2252 msgid "New" msgstr "" @@ -344,155 +344,155 @@ msgstr "" #. button( REPLYALL, _("Reply All") ) + #. button( FORWARD, _("Forward") ) + spacer + #. button( DELETE, _("Delete") ) + spacer + -#: src/src/i2p/susi/webmail/WebMail.java:2114 +#: src/src/i2p/susi/webmail/WebMail.java:2104 msgid "Check Mail" msgstr "" #. if (Config.hasConfigFile()) #. out.println(button( RELOAD, _("Reload Config") ) + spacer); -#: src/src/i2p/susi/webmail/WebMail.java:2117 +#: src/src/i2p/susi/webmail/WebMail.java:2107 msgid "Logout" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2130 -#: src/src/i2p/susi/webmail/WebMail.java:2282 +#: src/src/i2p/susi/webmail/WebMail.java:2120 +#: src/src/i2p/susi/webmail/WebMail.java:2275 msgid "Date" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2133 +#: src/src/i2p/susi/webmail/WebMail.java:2123 msgid "Size" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2173 +#: src/src/i2p/susi/webmail/WebMail.java:2164 msgid "Message is new" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2175 +#: src/src/i2p/susi/webmail/WebMail.java:2166 msgid "Message has an attachment" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2177 +#: src/src/i2p/susi/webmail/WebMail.java:2168 msgid "Message is spam" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2185 +#: src/src/i2p/susi/webmail/WebMail.java:2176 msgid "No messages" msgstr "" #. TODO ngettext -#: src/src/i2p/susi/webmail/WebMail.java:2197 +#: src/src/i2p/susi/webmail/WebMail.java:2188 msgid "Really delete the marked messages?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2198 +#: src/src/i2p/susi/webmail/WebMail.java:2189 msgid "Yes, really delete them!" msgstr "" -#. TODO js -#: src/src/i2p/susi/webmail/WebMail.java:2202 +#: src/src/i2p/susi/webmail/WebMail.java:2192 msgid "Delete Selected" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2204 +#: src/src/i2p/susi/webmail/WebMail.java:2194 msgid "Mark All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2206 +#: src/src/i2p/susi/webmail/WebMail.java:2196 msgid "Clear All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2231 -#: src/src/i2p/susi/webmail/WebMail.java:2232 +#: src/src/i2p/susi/webmail/WebMail.java:2221 +#: src/src/i2p/susi/webmail/WebMail.java:2222 msgid "First" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2231 -#: src/src/i2p/susi/webmail/WebMail.java:2232 -#: src/src/i2p/susi/webmail/WebMail.java:2268 +#: src/src/i2p/susi/webmail/WebMail.java:2221 +#: src/src/i2p/susi/webmail/WebMail.java:2222 +#: src/src/i2p/susi/webmail/WebMail.java:2261 msgid "Previous" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2234 +#: src/src/i2p/susi/webmail/WebMail.java:2224 #, java-format msgid "Page {0} of {1}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2237 -#: src/src/i2p/susi/webmail/WebMail.java:2238 +#: src/src/i2p/susi/webmail/WebMail.java:2227 +#: src/src/i2p/susi/webmail/WebMail.java:2228 msgid "Last" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2237 -#: src/src/i2p/susi/webmail/WebMail.java:2238 -#: src/src/i2p/susi/webmail/WebMail.java:2270 +#: src/src/i2p/susi/webmail/WebMail.java:2227 +#: src/src/i2p/susi/webmail/WebMail.java:2228 +#: src/src/i2p/susi/webmail/WebMail.java:2263 msgid "Next" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2250 +#: src/src/i2p/susi/webmail/WebMail.java:2240 msgid "Really delete this message?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2250 +#: src/src/i2p/susi/webmail/WebMail.java:2240 msgid "Yes, really delete it!" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2263 +#: src/src/i2p/susi/webmail/WebMail.java:2253 msgid "Reply" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2264 +#: src/src/i2p/susi/webmail/WebMail.java:2254 msgid "Reply All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2265 +#: src/src/i2p/susi/webmail/WebMail.java:2255 msgid "Forward" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2266 +#: src/src/i2p/susi/webmail/WebMail.java:2257 +#: src/src/i2p/susi/webmail/WebMail.java:2259 msgid "Delete" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2269 +#: src/src/i2p/susi/webmail/WebMail.java:2262 msgid "Back to Folder" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2294 +#: src/src/i2p/susi/webmail/WebMail.java:2287 msgid "Could not fetch mail." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2312 +#: src/src/i2p/susi/webmail/WebMail.java:2305 msgid "Folder Page Size" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2315 +#: src/src/i2p/susi/webmail/WebMail.java:2308 msgid "Set" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2318 +#: src/src/i2p/susi/webmail/WebMail.java:2311 msgid "Advanced Configuration" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2329 +#: src/src/i2p/susi/webmail/WebMail.java:2322 msgid "Save Configuration" msgstr "" #. this appears in the UI so translate #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102 -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747 -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793 msgid "No response from server" msgstr "" -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668 msgid "Error connecting to server" msgstr "" -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669 -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676 msgid "Error opening mailbox" msgstr "" -#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025 #: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249 msgid "Login failed" msgstr "" diff --git a/apps/susimail/locale/messages_es.po b/apps/susimail/locale/messages_es.po index 2da53932fc..22a3625951 100644 --- a/apps/susimail/locale/messages_es.po +++ b/apps/susimail/locale/messages_es.po @@ -5,6 +5,7 @@ # # Translators: # "blabla", 2011 +# blabla , 2014 # ducki2p , 2011 # foo , 2009 # mixy, 2011 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-01 11:45+0000\n" -"PO-Revision-Date: 2014-05-07 12:51+0000\n" -"Last-Translator: strel\n" +"PO-Revision-Date: 2014-05-21 20:20+0000\n" +"Last-Translator: blabla \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +78,7 @@ msgstr "Adjunto ({0})." #: src/src/i2p/susi/webmail/WebMail.java:729 msgid "Need username for authentication." -msgstr "Es necesario un nombre de usuario para la autenticación." +msgstr "Es necesario un nombre de usuario para la autentificación." #: src/src/i2p/susi/webmail/WebMail.java:733 msgid "Need password for authentication." @@ -122,7 +123,7 @@ msgstr "Error interno, pérdida de conexión." #: src/src/i2p/susi/webmail/WebMail.java:1008 #, java-format msgid "On {0} {1} wrote:" -msgstr "En {0} {1} escribió:" +msgstr "El {0} {1} escribió:" #: src/src/i2p/susi/webmail/WebMail.java:1055 msgid "begin forwarded mail" @@ -263,11 +264,11 @@ msgstr "Cancelar" #: src/src/i2p/susi/webmail/WebMail.java:2128 #: src/src/i2p/susi/webmail/WebMail.java:2278 msgid "From" -msgstr "Desde" +msgstr "De" #: src/src/i2p/susi/webmail/WebMail.java:2030 msgid "To" -msgstr "Hacia" +msgstr "A" #: src/src/i2p/susi/webmail/WebMail.java:2031 msgid "Cc" @@ -463,7 +464,7 @@ msgstr "Eliminar" #: src/src/i2p/susi/webmail/WebMail.java:2269 msgid "Back to Folder" -msgstr "Volver a carpeta" +msgstr "Volver a la carpeta" #: src/src/i2p/susi/webmail/WebMail.java:2294 msgid "Could not fetch mail." @@ -490,7 +491,7 @@ msgstr "Guardar configuración" #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747 #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789 msgid "No response from server" -msgstr "No hay respuesta desde el servidor" +msgstr "No hay respuesta del servidor" #: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664 msgid "Error connecting to server" diff --git a/apps/susimail/locale/messages_ru.po b/apps/susimail/locale/messages_ru.po index f0671c3087..28a715bea7 100644 --- a/apps/susimail/locale/messages_ru.po +++ b/apps/susimail/locale/messages_ru.po @@ -2,172 +2,176 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the susimail package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: -# foo , 2009. -# Андрей Лукьяненко , 2012. +# foo , 2009 +# gmind, 2012 +# yume, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-09 19:11+0000\n" -"PO-Revision-Date: 2012-12-24 18:32+0000\n" -"Last-Translator: Андрей Лукьяненко \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/I2P/language/" -"ru/)\n" -"Language: ru\n" +"POT-Creation-Date: 2014-05-01 11:45+0000\n" +"PO-Revision-Date: 2014-05-30 17:16+0000\n" +"Last-Translator: yume\n" +"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru_RU\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/src/i2p/susi/webmail/WebMail.java:443 -msgid "unknown" -msgstr "неизвестно" - -#: src/src/i2p/susi/webmail/WebMail.java:462 -msgid "Warning: no transfer encoding found, fallback to 7bit." -msgstr "" -"Предупреждение: кодировка передачи не найдена, откатывамся на использование " -"7bit." - -#: src/src/i2p/susi/webmail/WebMail.java:467 +#: src/src/i2p/susi/webmail/MailPart.java:207 #, java-format msgid "No encoder found for encoding \\''{0}\\''." msgstr "Для кодировки \\''{0}\\'' не найден кодек." -#: src/src/i2p/susi/webmail/WebMail.java:473 +#: src/src/i2p/susi/webmail/WebMail.java:304 +#: src/src/i2p/susi/webmail/WebMail.java:318 +#: src/src/i2p/susi/webmail/WebMail.java:1005 +msgid "Re:" +msgstr "" + +#: src/src/i2p/susi/webmail/WebMail.java:308 +#: src/src/i2p/susi/webmail/WebMail.java:322 +#: src/src/i2p/susi/webmail/WebMail.java:1043 +msgid "Fwd:" +msgstr "" + +#: src/src/i2p/susi/webmail/WebMail.java:594 +msgid "unknown" +msgstr "неизвестно" + +#: src/src/i2p/susi/webmail/WebMail.java:615 msgid "Warning: no charset found, fallback to US-ASCII." msgstr "Предупреждение: кодировка непонятна, переключаемся в US-ASCII." -#: src/src/i2p/susi/webmail/WebMail.java:487 +#: src/src/i2p/susi/webmail/WebMail.java:629 #, java-format msgid "Charset \\''{0}\\'' not supported." msgstr "Кодировка \\''{0}\\'' не поддерживается." -#: src/src/i2p/susi/webmail/WebMail.java:491 +#: src/src/i2p/susi/webmail/WebMail.java:633 #, java-format msgid "Part ({0}) not shown, because of {1}" msgstr "Часть ({0}) не отображена из-за {1}" -#: src/src/i2p/susi/webmail/WebMail.java:514 -msgid "Download" -msgstr "Скачать" +#: src/src/i2p/susi/webmail/WebMail.java:669 +#: src/src/i2p/susi/webmail/WebMail.java:672 +#, java-format +msgid "Download attachment {0}" +msgstr "Скачать вложение {0}" -#: src/src/i2p/susi/webmail/WebMail.java:514 +#: src/src/i2p/susi/webmail/WebMail.java:673 msgid "File is packed into a zipfile for security reasons." msgstr "Файл запакован в zip-архив из соображений безопасности." -#: src/src/i2p/susi/webmail/WebMail.java:514 -#, java-format -msgid "attachment ({0})." -msgstr "вложение ({0})." - -#: src/src/i2p/susi/webmail/WebMail.java:518 +#: src/src/i2p/susi/webmail/WebMail.java:678 #, java-format msgid "Attachment ({0})." msgstr "Вложение ({0})." -#: src/src/i2p/susi/webmail/WebMail.java:568 +#: src/src/i2p/susi/webmail/WebMail.java:729 msgid "Need username for authentication." msgstr "Требуется имя пользователя для аутентификации." -#: src/src/i2p/susi/webmail/WebMail.java:572 +#: src/src/i2p/susi/webmail/WebMail.java:733 msgid "Need password for authentication." msgstr "Требуется пароль для аутентификации." -#: src/src/i2p/susi/webmail/WebMail.java:576 +#: src/src/i2p/susi/webmail/WebMail.java:737 msgid "Need hostname for connect." msgstr "Требуется имя хоста для соединений." -#: src/src/i2p/susi/webmail/WebMail.java:581 +#: src/src/i2p/susi/webmail/WebMail.java:742 msgid "Need port number for pop3 connect." msgstr "Требуется номер порта для pop3 соединений." -#: src/src/i2p/susi/webmail/WebMail.java:588 +#: src/src/i2p/susi/webmail/WebMail.java:749 msgid "POP3 port number is not in range 0..65535." msgstr "Номер POP3-порта не в диапазоне 0..65535." -#: src/src/i2p/susi/webmail/WebMail.java:594 +#: src/src/i2p/susi/webmail/WebMail.java:755 msgid "POP3 port number is invalid." msgstr "Номер POP3-порта некорректный." -#: src/src/i2p/susi/webmail/WebMail.java:600 +#: src/src/i2p/susi/webmail/WebMail.java:761 msgid "Need port number for smtp connect." msgstr "Требуется номер порта для smtp соединений." -#: src/src/i2p/susi/webmail/WebMail.java:607 +#: src/src/i2p/susi/webmail/WebMail.java:768 msgid "SMTP port number is not in range 0..65535." msgstr "Номер SMTP-порта не в диапазоне 0..65535." -#: src/src/i2p/susi/webmail/WebMail.java:613 +#: src/src/i2p/susi/webmail/WebMail.java:774 msgid "SMTP port number is invalid." msgstr "Номер SMTP-порта некорректный." -#: src/src/i2p/susi/webmail/WebMail.java:660 +#: src/src/i2p/susi/webmail/WebMail.java:848 msgid "User logged out." msgstr "Пользователь отключился." -#: src/src/i2p/susi/webmail/WebMail.java:664 +#: src/src/i2p/susi/webmail/WebMail.java:851 msgid "Internal error, lost connection." msgstr "Внутренняя ошибка, соединение потеряно." -#: src/src/i2p/susi/webmail/WebMail.java:760 +#: src/src/i2p/susi/webmail/WebMail.java:1008 #, java-format msgid "On {0} {1} wrote:" msgstr "В сообщении от {0} {1} написал(a):" -#: src/src/i2p/susi/webmail/WebMail.java:807 +#: src/src/i2p/susi/webmail/WebMail.java:1055 msgid "begin forwarded mail" msgstr "начало пересланного сообщения" -#: src/src/i2p/susi/webmail/WebMail.java:829 +#: src/src/i2p/susi/webmail/WebMail.java:1077 msgid "end forwarded mail" msgstr "конец пересланного сообщения" -#: src/src/i2p/susi/webmail/WebMail.java:836 -#: src/src/i2p/susi/webmail/WebMail.java:1769 +#: src/src/i2p/susi/webmail/WebMail.java:1084 +#: src/src/i2p/susi/webmail/WebMail.java:2290 msgid "Could not fetch mail body." msgstr "Не удалось скачать тело сообщения." -#: src/src/i2p/susi/webmail/WebMail.java:864 +#: src/src/i2p/susi/webmail/WebMail.java:1114 msgid "Message id not valid." msgstr "Message id некорректен." -#: src/src/i2p/susi/webmail/WebMail.java:947 +#: src/src/i2p/susi/webmail/WebMail.java:1152 +msgid "Configuration reloaded" +msgstr "Конфигурация перезагружена" + +#: src/src/i2p/susi/webmail/WebMail.java:1213 #, java-format msgid "No Encoding found for {0}" msgstr "Не найдена кодировка для {0}" -#: src/src/i2p/susi/webmail/WebMail.java:951 +#: src/src/i2p/susi/webmail/WebMail.java:1217 #, java-format msgid "Could not encode data: {0}" msgstr "Не удаётся закодировать данные: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:956 +#: src/src/i2p/susi/webmail/WebMail.java:1222 #, java-format msgid "Error reading uploaded file: {0}" msgstr "Ошибка при чтении загруженного файла: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:1034 -msgid "Error parsing download parameter." -msgstr "Ошибка при разборе параметра скачивания." +#. error if we get here +#: src/src/i2p/susi/webmail/WebMail.java:1307 +#: src/src/i2p/susi/webmail/WebMail.java:1310 +msgid "Attachment not found." +msgstr "Вложение не найдено." -#: src/src/i2p/susi/webmail/WebMail.java:1078 +#: src/src/i2p/susi/webmail/WebMail.java:1357 +#: src/src/i2p/susi/webmail/WebMail.java:1483 msgid "Invalid pagesize number, resetting to default value." msgstr "Некорректный размер страницы, устанавливается значение по умолчанию." -#: src/src/i2p/susi/webmail/WebMail.java:1102 +#: src/src/i2p/susi/webmail/WebMail.java:1381 msgid "No messages marked for deletion." msgstr "Не отмечено сообщений для удаления." -#: src/src/i2p/susi/webmail/WebMail.java:1122 -#, java-format -msgid "Error deleting message: {0}" -msgstr "Ошибка при удалении сообщения: {0}" - -#: src/src/i2p/susi/webmail/WebMail.java:1133 +#: src/src/i2p/susi/webmail/WebMail.java:1397 #, java-format msgid "1 message deleted." msgid_plural "{0} messages deleted." @@ -175,12 +179,21 @@ msgstr[0] "{0} сообщение удалено." msgstr[1] "{0} сообщения удалено." msgstr[2] "{0} сообщений удалены." -#: src/src/i2p/susi/webmail/WebMail.java:1314 -#: src/src/i2p/susi/webmail/WebMail.java:1653 +#: src/src/i2p/susi/webmail/WebMail.java:1462 +msgid "Configuration saved" +msgstr "Конфигурация сохранена" + +#: src/src/i2p/susi/webmail/WebMail.java:1673 +#: src/src/i2p/susi/webmail/WebMail.java:2085 msgid "Login" msgstr "Логин" -#: src/src/i2p/susi/webmail/WebMail.java:1316 +#. mailbox.getNumMails() forces a connection, don't use it +#. Not only does it slow things down, but a failure causes all our messages to +#. "vanish" +#. subtitle = ngettext("1 Message", "{0} Messages", +#. sessionObject.mailbox.getNumMails()); +#: src/src/i2p/susi/webmail/WebMail.java:1678 #, java-format msgid "1 Message" msgid_plural "{0} Messages" @@ -188,267 +201,324 @@ msgstr[0] "{0} сообщение" msgstr[1] "{0} сообщения" msgstr[2] "{0} сообщений" -#: src/src/i2p/susi/webmail/WebMail.java:1318 +#: src/src/i2p/susi/webmail/WebMail.java:1684 msgid "Show Message" msgstr "Покзать сообщение" -#: src/src/i2p/susi/webmail/WebMail.java:1384 +#: src/src/i2p/susi/webmail/WebMail.java:1686 +msgid "New Message" +msgstr "Новое письмо" + +#: src/src/i2p/susi/webmail/WebMail.java:1688 +msgid "Configuration" +msgstr "Конфигурация" + +#: src/src/i2p/susi/webmail/WebMail.java:1699 +msgid "SusiMail" +msgstr "SusiMail" + +#: src/src/i2p/susi/webmail/WebMail.java:1712 +msgid "Message has not been sent. Do you want to discard it?" +msgstr "Письмо не было отправлено. Отменить его?" + +#: src/src/i2p/susi/webmail/WebMail.java:1773 #, java-format msgid "Error decoding content: {0}" msgstr "Ошибка при декодировании контента: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:1389 -msgid "Error decoding content: No encoder found." -msgstr "Ошибка при декодировании контента: кодек не найден." - -#: src/src/i2p/susi/webmail/WebMail.java:1436 +#: src/src/i2p/susi/webmail/WebMail.java:1833 msgid "no subject" msgstr "без темы" -#: src/src/i2p/susi/webmail/WebMail.java:1453 +#: src/src/i2p/susi/webmail/WebMail.java:1850 msgid "Found no valid sender address." msgstr "Не найдено корректного адреса отправителя." -#: src/src/i2p/susi/webmail/WebMail.java:1459 +#: src/src/i2p/susi/webmail/WebMail.java:1856 #, java-format msgid "Found no valid address in \\''{0}\\''." msgstr "Не найдено корректного адреса в \\''{0}\\''." -#: src/src/i2p/susi/webmail/WebMail.java:1478 +#: src/src/i2p/susi/webmail/WebMail.java:1877 msgid "No recipients found." msgstr "Не найдено получателей." -#: src/src/i2p/susi/webmail/WebMail.java:1485 -msgid "Quoted printable encoder not available." -msgstr "Кодек quoted printable недоступен." - -#: src/src/i2p/susi/webmail/WebMail.java:1490 -msgid "Header line encoder not available." -msgstr "Кодек для заголовка недоступен." - -#: src/src/i2p/susi/webmail/WebMail.java:1540 +#: src/src/i2p/susi/webmail/WebMail.java:1941 msgid "Mail sent." msgstr "Сообщение отправлено." -#: src/src/i2p/susi/webmail/WebMail.java:1579 +#: src/src/i2p/susi/webmail/WebMail.java:1985 msgid "Send" msgstr "Отправить" -#: src/src/i2p/susi/webmail/WebMail.java:1580 +#: src/src/i2p/susi/webmail/WebMail.java:1986 +#: src/src/i2p/susi/webmail/WebMail.java:2199 +#: src/src/i2p/susi/webmail/WebMail.java:2330 msgid "Cancel" msgstr "Отмена" -#: src/src/i2p/susi/webmail/WebMail.java:1581 -msgid "Delete Attachment" -msgstr "Удалить вложение" +#: src/src/i2p/susi/webmail/WebMail.java:2029 +#: src/src/i2p/susi/webmail/WebMail.java:2128 +#: src/src/i2p/susi/webmail/WebMail.java:2278 +msgid "From" +msgstr "От" -#: src/src/i2p/susi/webmail/WebMail.java:1582 -#: src/src/i2p/susi/webmail/WebMail.java:1675 -#: src/src/i2p/susi/webmail/WebMail.java:1756 -msgid "Reload Config" -msgstr "Перечитать конфиг" +#: src/src/i2p/susi/webmail/WebMail.java:2030 +msgid "To" +msgstr "Кому" -#: src/src/i2p/susi/webmail/WebMail.java:1583 -#: src/src/i2p/susi/webmail/WebMail.java:1676 -#: src/src/i2p/susi/webmail/WebMail.java:1757 -msgid "Logout" -msgstr "Выйти" +#: src/src/i2p/susi/webmail/WebMail.java:2031 +msgid "Cc" +msgstr "Копия" -#: src/src/i2p/susi/webmail/WebMail.java:1606 -#: src/src/i2p/susi/webmail/WebMail.java:1761 -msgid "From:" -msgstr "От:" +#: src/src/i2p/susi/webmail/WebMail.java:2032 +msgid "Bcc" +msgstr "Скрытая копия" -#: src/src/i2p/susi/webmail/WebMail.java:1607 -msgid "To:" -msgstr "Кому:" - -#: src/src/i2p/susi/webmail/WebMail.java:1608 -msgid "Cc:" -msgstr "Копия:" - -#: src/src/i2p/susi/webmail/WebMail.java:1609 -msgid "Bcc:" -msgstr "Скрытая копия:" - -#: src/src/i2p/susi/webmail/WebMail.java:1610 -#: src/src/i2p/susi/webmail/WebMail.java:1763 -msgid "Subject:" -msgstr "Тема:" - -#: src/src/i2p/susi/webmail/WebMail.java:1611 +#: src/src/i2p/susi/webmail/WebMail.java:2033 msgid "Bcc to self" msgstr "Послать скрытую копию самому себе" -#: src/src/i2p/susi/webmail/WebMail.java:1614 -msgid "New Attachment:" -msgstr "Новое вложение:" - -#: src/src/i2p/susi/webmail/WebMail.java:1614 -msgid "Upload File" -msgstr "Прикрепить" - -#: src/src/i2p/susi/webmail/WebMail.java:1620 -msgid "Attachments:" -msgstr "Вложения:" - -#. current postman hq length limits 16/12, new postman version 32/32 -#: src/src/i2p/susi/webmail/WebMail.java:1642 -msgid "User" -msgstr "Пользователь" - -#: src/src/i2p/susi/webmail/WebMail.java:1643 -msgid "Password" -msgstr "Пароль" - -#: src/src/i2p/susi/webmail/WebMail.java:1648 -msgid "Host" -msgstr "Хост" - -#: src/src/i2p/susi/webmail/WebMail.java:1649 -msgid "POP3-Port" -msgstr "POP3-порт" - -#: src/src/i2p/susi/webmail/WebMail.java:1650 -msgid "SMTP-Port" -msgstr "SMTP-порт" - -#: src/src/i2p/susi/webmail/WebMail.java:1653 -msgid "Reset" -msgstr "Сброс" - -#: src/src/i2p/susi/webmail/WebMail.java:1654 -msgid "Learn about I2P mail" -msgstr "О почте I2P" - -#: src/src/i2p/susi/webmail/WebMail.java:1655 -msgid "Create Account" -msgstr "Создать учётную запись" - -#: src/src/i2p/susi/webmail/WebMail.java:1667 -msgid "Really delete the marked messages?" -msgstr "Действительно удалить отмеченые сообщения?" - -#: src/src/i2p/susi/webmail/WebMail.java:1667 -msgid "Yes, really delete them!" -msgstr "Да, действительно удалить!" - -#: src/src/i2p/susi/webmail/WebMail.java:1669 -#: src/src/i2p/susi/webmail/WebMail.java:1748 -msgid "New" -msgstr "Новое" - -#: src/src/i2p/susi/webmail/WebMail.java:1670 -#: src/src/i2p/susi/webmail/WebMail.java:1749 -msgid "Reply" -msgstr "Ответить" - -#: src/src/i2p/susi/webmail/WebMail.java:1671 -#: src/src/i2p/susi/webmail/WebMail.java:1750 -msgid "Reply All" -msgstr "Ответить всем" - -#: src/src/i2p/susi/webmail/WebMail.java:1672 -#: src/src/i2p/susi/webmail/WebMail.java:1751 -msgid "Forward" -msgstr "Переслать" - -#: src/src/i2p/susi/webmail/WebMail.java:1673 -#: src/src/i2p/susi/webmail/WebMail.java:1752 -msgid "Delete" -msgstr "Удалить" - -#: src/src/i2p/susi/webmail/WebMail.java:1674 -msgid "Check Mail" -msgstr "Проверить почту" - -#: src/src/i2p/susi/webmail/WebMail.java:1678 -msgid "Sender" -msgstr "Отправитель" - -#: src/src/i2p/susi/webmail/WebMail.java:1679 +#: src/src/i2p/susi/webmail/WebMail.java:2034 +#: src/src/i2p/susi/webmail/WebMail.java:2129 +#: src/src/i2p/susi/webmail/WebMail.java:2280 msgid "Subject" msgstr "Тема" -#: src/src/i2p/susi/webmail/WebMail.java:1680 +#: src/src/i2p/susi/webmail/WebMail.java:2037 +msgid "Add Attachment" +msgstr "Прикрепить файл" + +#. TODO disable/hide in JS if no file selected +#: src/src/i2p/susi/webmail/WebMail.java:2039 +msgid "Add another attachment" +msgstr "Прикрепить ещё один файл" + +#: src/src/i2p/susi/webmail/WebMail.java:2045 +msgid "Attachments" +msgstr "Приложенные файлы" + +#: src/src/i2p/susi/webmail/WebMail.java:2054 +msgid "Delete selected attachments" +msgstr "Удалить выбранные файлы" + +#. current postman hq length limits 16/12, new postman version 32/32 +#: src/src/i2p/susi/webmail/WebMail.java:2073 +msgid "User" +msgstr "Пользователь" + +#: src/src/i2p/susi/webmail/WebMail.java:2074 +msgid "Password" +msgstr "Пароль" + +#: src/src/i2p/susi/webmail/WebMail.java:2079 +msgid "Host" +msgstr "Хост" + +#: src/src/i2p/susi/webmail/WebMail.java:2080 +msgid "POP3 Port" +msgstr "POP3-порт" + +#: src/src/i2p/susi/webmail/WebMail.java:2081 +msgid "SMTP Port" +msgstr "SMTP-порт" + +#: src/src/i2p/susi/webmail/WebMail.java:2086 +msgid "Read Mail Offline" +msgstr "Читать почту в автономном режиме" + +#: src/src/i2p/susi/webmail/WebMail.java:2090 +#: src/src/i2p/susi/webmail/WebMail.java:2218 +msgid "Settings" +msgstr "Настройки" + +#: src/src/i2p/susi/webmail/WebMail.java:2093 +msgid "Learn about I2P mail" +msgstr "Узнать об I2P почте" + +#: src/src/i2p/susi/webmail/WebMail.java:2094 +msgid "Create Account" +msgstr "Создать учётную запись" + +#: src/src/i2p/susi/webmail/WebMail.java:2107 +#: src/src/i2p/susi/webmail/WebMail.java:2262 +msgid "New" +msgstr "Новое" + +#. In theory, these are valid and will apply to the first checked message, +#. but that's not obvious and did it work? +#. button( REPLY, _("Reply") ) + +#. button( REPLYALL, _("Reply All") ) + +#. button( FORWARD, _("Forward") ) + spacer + +#. button( DELETE, _("Delete") ) + spacer + +#: src/src/i2p/susi/webmail/WebMail.java:2114 +msgid "Check Mail" +msgstr "Проверить почту" + +#. if (Config.hasConfigFile()) +#. out.println(button( RELOAD, _("Reload Config") ) + spacer); +#: src/src/i2p/susi/webmail/WebMail.java:2117 +msgid "Logout" +msgstr "Выйти" + +#: src/src/i2p/susi/webmail/WebMail.java:2130 +#: src/src/i2p/susi/webmail/WebMail.java:2282 msgid "Date" msgstr "Дата" -#: src/src/i2p/susi/webmail/WebMail.java:1681 +#: src/src/i2p/susi/webmail/WebMail.java:2133 msgid "Size" msgstr "Размер" -#: src/src/i2p/susi/webmail/WebMail.java:1707 -#, java-format -msgid "1 Byte" -msgid_plural "{0} Bytes" -msgstr[0] "{0} байт" -msgstr[1] "{0} байта" -msgstr[2] "{0} байт" +#: src/src/i2p/susi/webmail/WebMail.java:2173 +msgid "Message is new" +msgstr "Новое письмо" -#: src/src/i2p/susi/webmail/WebMail.java:1712 +#: src/src/i2p/susi/webmail/WebMail.java:2175 +msgid "Message has an attachment" +msgstr "Письмо с вложением" + +#: src/src/i2p/susi/webmail/WebMail.java:2177 +msgid "Message is spam" +msgstr "Письмо является спамом" + +#: src/src/i2p/susi/webmail/WebMail.java:2185 +msgid "No messages" +msgstr "Нет входящих сообщений" + +#. TODO ngettext +#: src/src/i2p/susi/webmail/WebMail.java:2197 +msgid "Really delete the marked messages?" +msgstr "Действительно удалить отмеченые сообщения?" + +#: src/src/i2p/susi/webmail/WebMail.java:2198 +msgid "Yes, really delete them!" +msgstr "Да, действительно удалить!" + +#. TODO js +#: src/src/i2p/susi/webmail/WebMail.java:2202 +msgid "Delete Selected" +msgstr "Удалить выбранное" + +#: src/src/i2p/susi/webmail/WebMail.java:2204 msgid "Mark All" msgstr "Отметить всё" -#: src/src/i2p/susi/webmail/WebMail.java:1713 -msgid "Invert Selection" -msgstr "Инвертировать выделение" +#: src/src/i2p/susi/webmail/WebMail.java:2206 +msgid "Clear All" +msgstr "Удалить все" -#: src/src/i2p/susi/webmail/WebMail.java:1714 -msgid "Clear" -msgstr "Очистить" - -#: src/src/i2p/susi/webmail/WebMail.java:1717 -#: src/src/i2p/susi/webmail/WebMail.java:1718 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 msgid "First" msgstr "Первое" -#: src/src/i2p/susi/webmail/WebMail.java:1717 -#: src/src/i2p/susi/webmail/WebMail.java:1718 -#: src/src/i2p/susi/webmail/WebMail.java:1753 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 +#: src/src/i2p/susi/webmail/WebMail.java:2268 msgid "Previous" msgstr "Предыдущее" -#: src/src/i2p/susi/webmail/WebMail.java:1719 +#: src/src/i2p/susi/webmail/WebMail.java:2234 #, java-format msgid "Page {0} of {1}" msgstr "Страница {0} из {1}" -#: src/src/i2p/susi/webmail/WebMail.java:1721 -#: src/src/i2p/susi/webmail/WebMail.java:1722 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 msgid "Last" msgstr "Последнее" -#: src/src/i2p/susi/webmail/WebMail.java:1721 -#: src/src/i2p/susi/webmail/WebMail.java:1722 -#: src/src/i2p/susi/webmail/WebMail.java:1754 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 +#: src/src/i2p/susi/webmail/WebMail.java:2270 msgid "Next" msgstr "Следующее" -#: src/src/i2p/susi/webmail/WebMail.java:1725 -msgid "Pagesize:" -msgstr "Сообщений на странице:" - -#: src/src/i2p/susi/webmail/WebMail.java:1726 -msgid "Set" -msgstr "Установить" - -#: src/src/i2p/susi/webmail/WebMail.java:1736 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Really delete this message?" msgstr "Действительно удалить это сообщение?" -#: src/src/i2p/susi/webmail/WebMail.java:1736 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Yes, really delete it!" msgstr "Да, удалить это!" -#: src/src/i2p/susi/webmail/WebMail.java:1755 +#: src/src/i2p/susi/webmail/WebMail.java:2263 +msgid "Reply" +msgstr "Ответить" + +#: src/src/i2p/susi/webmail/WebMail.java:2264 +msgid "Reply All" +msgstr "Ответить всем" + +#: src/src/i2p/susi/webmail/WebMail.java:2265 +msgid "Forward" +msgstr "Переслать" + +#: src/src/i2p/susi/webmail/WebMail.java:2266 +msgid "Delete" +msgstr "Удалить" + +#: src/src/i2p/susi/webmail/WebMail.java:2269 msgid "Back to Folder" msgstr "Вернуться к папке" -#: src/src/i2p/susi/webmail/WebMail.java:1762 -msgid "Date:" -msgstr "Дата:" - -#: src/src/i2p/susi/webmail/WebMail.java:1773 +#: src/src/i2p/susi/webmail/WebMail.java:2294 msgid "Could not fetch mail." msgstr "Не удалось скачать почту." + +#: src/src/i2p/susi/webmail/WebMail.java:2312 +msgid "Folder Page Size" +msgstr "" + +#: src/src/i2p/susi/webmail/WebMail.java:2315 +msgid "Set" +msgstr "Установить" + +#: src/src/i2p/susi/webmail/WebMail.java:2318 +msgid "Advanced Configuration" +msgstr "Расширенная конфигурация" + +#: src/src/i2p/susi/webmail/WebMail.java:2329 +msgid "Save Configuration" +msgstr "Сохранить конфигурацию" + +#. this appears in the UI so translate +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789 +msgid "No response from server" +msgstr "Нет ответа от сервера" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664 +msgid "Error connecting to server" +msgstr "Ошибка соединения с сервером" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672 +msgid "Error opening mailbox" +msgstr "Ошибка при открытии почтового ящика" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249 +msgid "Login failed" +msgstr "Ошибка входа" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214 +msgid "Cannot connect" +msgstr "Невозможно подключиться" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237 +msgid "Server refused connection" +msgstr "Сервер отказал в подключении" + +#. TODO which recipient? +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262 +msgid "Mail rejected" +msgstr "Письмо отклонено" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279 +msgid "Error sending mail" +msgstr "Ошибка при отправке письма" diff --git a/apps/susimail/locale/messages_uk.po b/apps/susimail/locale/messages_uk.po index 89d554bcc6..0e8dca6ac4 100644 --- a/apps/susimail/locale/messages_uk.po +++ b/apps/susimail/locale/messages_uk.po @@ -2,170 +2,176 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the susimail package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: -# Denis , 2011. -# , 2011. +# Denis Blank , 2011 +# Denis Blank , 2011 +# LinuxChata, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:05+0000\n" -"PO-Revision-Date: 2011-10-29 20:17+0000\n" -"Last-Translator: Pharmasolin \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/" -"team/uk_UA/)\n" -"Language: uk_UA\n" +"POT-Creation-Date: 2014-05-01 11:45+0000\n" +"PO-Revision-Date: 2014-07-18 21:11+0000\n" +"Last-Translator: LinuxChata\n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Language: uk_UA\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/src/i2p/susi/webmail/WebMail.java:447 -msgid "unknown" -msgstr "Невідомий" - -#: src/src/i2p/susi/webmail/WebMail.java:466 -msgid "Warning: no transfer encoding found, fallback to 7bit." -msgstr "Попередження: не знайдено кодування передачі, повертаємось до 7bit." - -#: src/src/i2p/susi/webmail/WebMail.java:471 +#: src/src/i2p/susi/webmail/MailPart.java:207 #, java-format msgid "No encoder found for encoding \\''{0}\\''." msgstr "Не знайдено кодировщик для кодування \\''{0}\\''." -#: src/src/i2p/susi/webmail/WebMail.java:477 +#: src/src/i2p/susi/webmail/WebMail.java:304 +#: src/src/i2p/susi/webmail/WebMail.java:318 +#: src/src/i2p/susi/webmail/WebMail.java:1005 +msgid "Re:" +msgstr "Re:" + +#: src/src/i2p/susi/webmail/WebMail.java:308 +#: src/src/i2p/susi/webmail/WebMail.java:322 +#: src/src/i2p/susi/webmail/WebMail.java:1043 +msgid "Fwd:" +msgstr "Fwd:" + +#: src/src/i2p/susi/webmail/WebMail.java:594 +msgid "unknown" +msgstr "Невідомий" + +#: src/src/i2p/susi/webmail/WebMail.java:615 msgid "Warning: no charset found, fallback to US-ASCII." msgstr "Попередження: незрозуміле кодування, повертаємось до US-ASCII." -#: src/src/i2p/susi/webmail/WebMail.java:491 +#: src/src/i2p/susi/webmail/WebMail.java:629 #, java-format msgid "Charset \\''{0}\\'' not supported." msgstr "Кодування \\''{0}\\'' не підтримується." -#: src/src/i2p/susi/webmail/WebMail.java:495 +#: src/src/i2p/susi/webmail/WebMail.java:633 #, java-format msgid "Part ({0}) not shown, because of {1}" msgstr "Частина ({0}) не показана, тому що {1}" -#: src/src/i2p/susi/webmail/WebMail.java:518 -msgid "Download" -msgstr "Завантажити" +#: src/src/i2p/susi/webmail/WebMail.java:669 +#: src/src/i2p/susi/webmail/WebMail.java:672 +#, java-format +msgid "Download attachment {0}" +msgstr "Завантажити прикріплені файли {0}" -#: src/src/i2p/susi/webmail/WebMail.java:518 +#: src/src/i2p/susi/webmail/WebMail.java:673 msgid "File is packed into a zipfile for security reasons." msgstr "Файл запакований в zipfile з міркувань безпеки" -#: src/src/i2p/susi/webmail/WebMail.java:518 -#, java-format -msgid "attachment ({0})." -msgstr "прикріплення ({0})." - -#: src/src/i2p/susi/webmail/WebMail.java:522 +#: src/src/i2p/susi/webmail/WebMail.java:678 #, java-format msgid "Attachment ({0})." msgstr "Прикріплення Attachment ({0})" -#: src/src/i2p/susi/webmail/WebMail.java:572 +#: src/src/i2p/susi/webmail/WebMail.java:729 msgid "Need username for authentication." msgstr "Необхідне ім'я користувача для авторизації." -#: src/src/i2p/susi/webmail/WebMail.java:576 +#: src/src/i2p/susi/webmail/WebMail.java:733 msgid "Need password for authentication." msgstr "Необхідний пароль для авторизації." -#: src/src/i2p/susi/webmail/WebMail.java:580 +#: src/src/i2p/susi/webmail/WebMail.java:737 msgid "Need hostname for connect." msgstr "Необхідне ім'я хоста для з'єднання." -#: src/src/i2p/susi/webmail/WebMail.java:585 +#: src/src/i2p/susi/webmail/WebMail.java:742 msgid "Need port number for pop3 connect." msgstr "Необхідний вказати порт для pop3 з'єднання." -#: src/src/i2p/susi/webmail/WebMail.java:592 +#: src/src/i2p/susi/webmail/WebMail.java:749 msgid "POP3 port number is not in range 0..65535." msgstr "POP3 порт може бути лише в числовому проміжку 0..65535." -#: src/src/i2p/susi/webmail/WebMail.java:598 +#: src/src/i2p/susi/webmail/WebMail.java:755 msgid "POP3 port number is invalid." msgstr "POP3 порт вказаний не вірно." -#: src/src/i2p/susi/webmail/WebMail.java:604 +#: src/src/i2p/susi/webmail/WebMail.java:761 msgid "Need port number for smtp connect." msgstr "Необхідно вказати порт для smtp з'єднання." -#: src/src/i2p/susi/webmail/WebMail.java:611 +#: src/src/i2p/susi/webmail/WebMail.java:768 msgid "SMTP port number is not in range 0..65535." msgstr "SMTP порт може бути лише в числовому проміжку 0..65535." -#: src/src/i2p/susi/webmail/WebMail.java:617 +#: src/src/i2p/susi/webmail/WebMail.java:774 msgid "SMTP port number is invalid." msgstr "SMTP порт вказаний не вірно." -#: src/src/i2p/susi/webmail/WebMail.java:664 +#: src/src/i2p/susi/webmail/WebMail.java:848 msgid "User logged out." msgstr "Користувач вийшов." -#: src/src/i2p/susi/webmail/WebMail.java:668 +#: src/src/i2p/susi/webmail/WebMail.java:851 msgid "Internal error, lost connection." msgstr "Внутрішня помилка, з'єднання закрито." -#: src/src/i2p/susi/webmail/WebMail.java:764 +#: src/src/i2p/susi/webmail/WebMail.java:1008 #, java-format msgid "On {0} {1} wrote:" msgstr "В повідомленні від {0}{1} написав(-ла):" -#: src/src/i2p/susi/webmail/WebMail.java:811 +#: src/src/i2p/susi/webmail/WebMail.java:1055 msgid "begin forwarded mail" msgstr "початок пересланого листа" -#: src/src/i2p/susi/webmail/WebMail.java:833 +#: src/src/i2p/susi/webmail/WebMail.java:1077 msgid "end forwarded mail" msgstr "кінець пересланого листа" -#: src/src/i2p/susi/webmail/WebMail.java:840 -#: src/src/i2p/susi/webmail/WebMail.java:1770 +#: src/src/i2p/susi/webmail/WebMail.java:1084 +#: src/src/i2p/susi/webmail/WebMail.java:2290 msgid "Could not fetch mail body." msgstr "Не вдалося отримати текст листа." -#: src/src/i2p/susi/webmail/WebMail.java:868 +#: src/src/i2p/susi/webmail/WebMail.java:1114 msgid "Message id not valid." msgstr "id повідомлення не дійсний." -#: src/src/i2p/susi/webmail/WebMail.java:951 +#: src/src/i2p/susi/webmail/WebMail.java:1152 +msgid "Configuration reloaded" +msgstr "Конфігурація перезавантажена" + +#: src/src/i2p/susi/webmail/WebMail.java:1213 #, java-format msgid "No Encoding found for {0}" msgstr "Не знайдено кодировщика для {0}" -#: src/src/i2p/susi/webmail/WebMail.java:955 +#: src/src/i2p/susi/webmail/WebMail.java:1217 #, java-format msgid "Could not encode data: {0}" msgstr "Не можливо кодувати данні: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:960 +#: src/src/i2p/susi/webmail/WebMail.java:1222 #, java-format msgid "Error reading uploaded file: {0}" msgstr "Помилка читання завантаженого файла: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:1038 -msgid "Error parsing download parameter." -msgstr "Помилка розбору завантаженого параметру." +#. error if we get here +#: src/src/i2p/susi/webmail/WebMail.java:1307 +#: src/src/i2p/susi/webmail/WebMail.java:1310 +msgid "Attachment not found." +msgstr "Прикріплені файли не знайдені" -#: src/src/i2p/susi/webmail/WebMail.java:1082 +#: src/src/i2p/susi/webmail/WebMail.java:1357 +#: src/src/i2p/susi/webmail/WebMail.java:1483 msgid "Invalid pagesize number, resetting to default value." msgstr "Не дійсний розмір сторінки, скудую до параметру за замовчуванням" -#: src/src/i2p/susi/webmail/WebMail.java:1106 +#: src/src/i2p/susi/webmail/WebMail.java:1381 msgid "No messages marked for deletion." msgstr "Не позначені повідомлення для видалення." -#: src/src/i2p/susi/webmail/WebMail.java:1126 -#, java-format -msgid "Error deleting message: {0}" -msgstr "Помилка видалення повідомлення: {0}" - -#: src/src/i2p/susi/webmail/WebMail.java:1137 +#: src/src/i2p/susi/webmail/WebMail.java:1397 #, java-format msgid "1 message deleted." msgid_plural "{0} messages deleted." @@ -173,12 +179,21 @@ msgstr[0] "{0} повідомлення видалено." msgstr[1] "{0} повідомлення видалено.{0}" msgstr[2] "{0} повідомлень видалено." -#: src/src/i2p/susi/webmail/WebMail.java:1313 -#: src/src/i2p/susi/webmail/WebMail.java:1654 +#: src/src/i2p/susi/webmail/WebMail.java:1462 +msgid "Configuration saved" +msgstr "Конфігурація збережена" + +#: src/src/i2p/susi/webmail/WebMail.java:1673 +#: src/src/i2p/susi/webmail/WebMail.java:2085 msgid "Login" msgstr "Логін" -#: src/src/i2p/susi/webmail/WebMail.java:1315 +#. mailbox.getNumMails() forces a connection, don't use it +#. Not only does it slow things down, but a failure causes all our messages to +#. "vanish" +#. subtitle = ngettext("1 Message", "{0} Messages", +#. sessionObject.mailbox.getNumMails()); +#: src/src/i2p/susi/webmail/WebMail.java:1678 #, java-format msgid "1 Message" msgid_plural "{0} Messages" @@ -186,267 +201,324 @@ msgstr[0] "{0} Повідомлення" msgstr[1] "{0} Повідомлення" msgstr[2] "{0} Повідомлень" -#: src/src/i2p/susi/webmail/WebMail.java:1317 +#: src/src/i2p/susi/webmail/WebMail.java:1684 msgid "Show Message" msgstr "Показати повідомлення" -#: src/src/i2p/susi/webmail/WebMail.java:1383 +#: src/src/i2p/susi/webmail/WebMail.java:1686 +msgid "New Message" +msgstr "Нове повідомлення" + +#: src/src/i2p/susi/webmail/WebMail.java:1688 +msgid "Configuration" +msgstr "Конфігурація" + +#: src/src/i2p/susi/webmail/WebMail.java:1699 +msgid "SusiMail" +msgstr "SusiMail" + +#: src/src/i2p/susi/webmail/WebMail.java:1712 +msgid "Message has not been sent. Do you want to discard it?" +msgstr "Повідомлення не було надіслано. Ви хочете його відмінити?" + +#: src/src/i2p/susi/webmail/WebMail.java:1773 #, java-format msgid "Error decoding content: {0}" msgstr "Помилка декодування вмісту: {0}" -#: src/src/i2p/susi/webmail/WebMail.java:1388 -msgid "Error decoding content: No encoder found." -msgstr "Помилка декодування вмісту: Не знайдено кодировщика." - -#: src/src/i2p/susi/webmail/WebMail.java:1435 +#: src/src/i2p/susi/webmail/WebMail.java:1833 msgid "no subject" msgstr "без теми" -#: src/src/i2p/susi/webmail/WebMail.java:1452 +#: src/src/i2p/susi/webmail/WebMail.java:1850 msgid "Found no valid sender address." msgstr "Адреса відправника не дійсна." -#: src/src/i2p/susi/webmail/WebMail.java:1458 +#: src/src/i2p/susi/webmail/WebMail.java:1856 #, java-format msgid "Found no valid address in \\''{0}\\''." msgstr "Знайдена не дійсна адреса в \\''{0}\\''." -#: src/src/i2p/susi/webmail/WebMail.java:1477 +#: src/src/i2p/susi/webmail/WebMail.java:1877 msgid "No recipients found." msgstr "Одержувачів не знайдено." -#: src/src/i2p/susi/webmail/WebMail.java:1484 -msgid "Quoted printable encoder not available." -msgstr "Кодек quoted printable недоступний." - -#: src/src/i2p/susi/webmail/WebMail.java:1489 -msgid "Header line encoder not available." -msgstr "Кодек для заголовку недоступний." - -#: src/src/i2p/susi/webmail/WebMail.java:1540 +#: src/src/i2p/susi/webmail/WebMail.java:1941 msgid "Mail sent." msgstr "Лист надісланий." -#: src/src/i2p/susi/webmail/WebMail.java:1579 +#: src/src/i2p/susi/webmail/WebMail.java:1985 msgid "Send" msgstr "Відправити" -#: src/src/i2p/susi/webmail/WebMail.java:1580 +#: src/src/i2p/susi/webmail/WebMail.java:1986 +#: src/src/i2p/susi/webmail/WebMail.java:2199 +#: src/src/i2p/susi/webmail/WebMail.java:2330 msgid "Cancel" msgstr "Відмінити" -#: src/src/i2p/susi/webmail/WebMail.java:1581 -msgid "Delete Attachment" -msgstr "Видалити Прикріплення" +#: src/src/i2p/susi/webmail/WebMail.java:2029 +#: src/src/i2p/susi/webmail/WebMail.java:2128 +#: src/src/i2p/susi/webmail/WebMail.java:2278 +msgid "From" +msgstr "From" -#: src/src/i2p/susi/webmail/WebMail.java:1582 -#: src/src/i2p/susi/webmail/WebMail.java:1676 -#: src/src/i2p/susi/webmail/WebMail.java:1757 -msgid "Reload Config" -msgstr "Перезавантажити настройки" +#: src/src/i2p/susi/webmail/WebMail.java:2030 +msgid "To" +msgstr "To" -#: src/src/i2p/susi/webmail/WebMail.java:1583 -#: src/src/i2p/susi/webmail/WebMail.java:1677 -#: src/src/i2p/susi/webmail/WebMail.java:1758 -msgid "Logout" -msgstr "Вийти" +#: src/src/i2p/susi/webmail/WebMail.java:2031 +msgid "Cc" +msgstr "Cc" -#: src/src/i2p/susi/webmail/WebMail.java:1606 -#: src/src/i2p/susi/webmail/WebMail.java:1762 -msgid "From:" -msgstr "Від:" +#: src/src/i2p/susi/webmail/WebMail.java:2032 +msgid "Bcc" +msgstr "Bcc" -#: src/src/i2p/susi/webmail/WebMail.java:1607 -msgid "To:" -msgstr "Кому:" - -#: src/src/i2p/susi/webmail/WebMail.java:1608 -msgid "Cc:" -msgstr "Cc:" - -#: src/src/i2p/susi/webmail/WebMail.java:1609 -msgid "Bcc:" -msgstr "Bcc:" - -#: src/src/i2p/susi/webmail/WebMail.java:1610 -#: src/src/i2p/susi/webmail/WebMail.java:1764 -msgid "Subject:" -msgstr "Тема:" - -#: src/src/i2p/susi/webmail/WebMail.java:1611 +#: src/src/i2p/susi/webmail/WebMail.java:2033 msgid "Bcc to self" msgstr "Відправляти приховану копію самому собі" -#: src/src/i2p/susi/webmail/WebMail.java:1614 -msgid "New Attachment:" -msgstr "Нове прикріплення:" - -#: src/src/i2p/susi/webmail/WebMail.java:1614 -msgid "Upload File" -msgstr "Завантажити файл" - -#: src/src/i2p/susi/webmail/WebMail.java:1620 -msgid "Attachments:" -msgstr "Прикріплення:" - -#. current postman hq length limits 16/12, new postman version 32/32 -#: src/src/i2p/susi/webmail/WebMail.java:1643 -msgid "User" -msgstr "Користувач" - -#: src/src/i2p/susi/webmail/WebMail.java:1644 -msgid "Password" -msgstr "Пароль" - -#: src/src/i2p/susi/webmail/WebMail.java:1649 -msgid "Host" -msgstr "Хост" - -#: src/src/i2p/susi/webmail/WebMail.java:1650 -msgid "POP3-Port" -msgstr "POP3-Порт" - -#: src/src/i2p/susi/webmail/WebMail.java:1651 -msgid "SMTP-Port" -msgstr "SMTP-Порт" - -#: src/src/i2p/susi/webmail/WebMail.java:1654 -msgid "Reset" -msgstr "Скинути" - -#: src/src/i2p/susi/webmail/WebMail.java:1655 -msgid "Learn about I2P mail" -msgstr "" - -#: src/src/i2p/susi/webmail/WebMail.java:1656 -msgid "Create Account" -msgstr "Створити обліковий запис" - -#: src/src/i2p/susi/webmail/WebMail.java:1668 -msgid "Really delete the marked messages?" -msgstr "Ви дійсно хочете видалити позначені повідомлення?" - -#: src/src/i2p/susi/webmail/WebMail.java:1668 -msgid "Yes, really delete them!" -msgstr "Так, дійсно видалити їх!" - -#: src/src/i2p/susi/webmail/WebMail.java:1670 -#: src/src/i2p/susi/webmail/WebMail.java:1749 -msgid "New" -msgstr "Новий" - -#: src/src/i2p/susi/webmail/WebMail.java:1671 -#: src/src/i2p/susi/webmail/WebMail.java:1750 -msgid "Reply" -msgstr "Відповісти" - -#: src/src/i2p/susi/webmail/WebMail.java:1672 -#: src/src/i2p/susi/webmail/WebMail.java:1751 -msgid "Reply All" -msgstr "Відповісти всім" - -#: src/src/i2p/susi/webmail/WebMail.java:1673 -#: src/src/i2p/susi/webmail/WebMail.java:1752 -msgid "Forward" -msgstr "Переслати" - -#: src/src/i2p/susi/webmail/WebMail.java:1674 -#: src/src/i2p/susi/webmail/WebMail.java:1753 -msgid "Delete" -msgstr "Видалити" - -#: src/src/i2p/susi/webmail/WebMail.java:1675 -msgid "Check Mail" -msgstr "Перевірити пошту" - -#: src/src/i2p/susi/webmail/WebMail.java:1679 -msgid "Sender" -msgstr "Відправник" - -#: src/src/i2p/susi/webmail/WebMail.java:1680 +#: src/src/i2p/susi/webmail/WebMail.java:2034 +#: src/src/i2p/susi/webmail/WebMail.java:2129 +#: src/src/i2p/susi/webmail/WebMail.java:2280 msgid "Subject" msgstr "Тема" -#: src/src/i2p/susi/webmail/WebMail.java:1681 +#: src/src/i2p/susi/webmail/WebMail.java:2037 +msgid "Add Attachment" +msgstr "Прикріпити файли" + +#. TODO disable/hide in JS if no file selected +#: src/src/i2p/susi/webmail/WebMail.java:2039 +msgid "Add another attachment" +msgstr "Прикріпити інші файли" + +#: src/src/i2p/susi/webmail/WebMail.java:2045 +msgid "Attachments" +msgstr "Прикріплені файли" + +#: src/src/i2p/susi/webmail/WebMail.java:2054 +msgid "Delete selected attachments" +msgstr "Видалити обрані прикріплені файли" + +#. current postman hq length limits 16/12, new postman version 32/32 +#: src/src/i2p/susi/webmail/WebMail.java:2073 +msgid "User" +msgstr "Користувач" + +#: src/src/i2p/susi/webmail/WebMail.java:2074 +msgid "Password" +msgstr "Пароль" + +#: src/src/i2p/susi/webmail/WebMail.java:2079 +msgid "Host" +msgstr "Хост" + +#: src/src/i2p/susi/webmail/WebMail.java:2080 +msgid "POP3 Port" +msgstr "Порт POP3" + +#: src/src/i2p/susi/webmail/WebMail.java:2081 +msgid "SMTP Port" +msgstr "Порт SMTP" + +#: src/src/i2p/susi/webmail/WebMail.java:2086 +msgid "Read Mail Offline" +msgstr "Читати пошту офлайн" + +#: src/src/i2p/susi/webmail/WebMail.java:2090 +#: src/src/i2p/susi/webmail/WebMail.java:2218 +msgid "Settings" +msgstr "Налаштування" + +#: src/src/i2p/susi/webmail/WebMail.java:2093 +msgid "Learn about I2P mail" +msgstr "Дізнатись про I2P пошту" + +#: src/src/i2p/susi/webmail/WebMail.java:2094 +msgid "Create Account" +msgstr "Створити обліковий запис" + +#: src/src/i2p/susi/webmail/WebMail.java:2107 +#: src/src/i2p/susi/webmail/WebMail.java:2262 +msgid "New" +msgstr "Новий" + +#. In theory, these are valid and will apply to the first checked message, +#. but that's not obvious and did it work? +#. button( REPLY, _("Reply") ) + +#. button( REPLYALL, _("Reply All") ) + +#. button( FORWARD, _("Forward") ) + spacer + +#. button( DELETE, _("Delete") ) + spacer + +#: src/src/i2p/susi/webmail/WebMail.java:2114 +msgid "Check Mail" +msgstr "Перевірити пошту" + +#. if (Config.hasConfigFile()) +#. out.println(button( RELOAD, _("Reload Config") ) + spacer); +#: src/src/i2p/susi/webmail/WebMail.java:2117 +msgid "Logout" +msgstr "Вийти" + +#: src/src/i2p/susi/webmail/WebMail.java:2130 +#: src/src/i2p/susi/webmail/WebMail.java:2282 msgid "Date" msgstr "Дата" -#: src/src/i2p/susi/webmail/WebMail.java:1682 +#: src/src/i2p/susi/webmail/WebMail.java:2133 msgid "Size" msgstr "Розмір" -#: src/src/i2p/susi/webmail/WebMail.java:1708 -#, java-format -msgid "1 Byte" -msgid_plural "{0} Bytes" -msgstr[0] "{0} Байт" -msgstr[1] "{0} Байти" -msgstr[2] "{0} Байт" +#: src/src/i2p/susi/webmail/WebMail.java:2173 +msgid "Message is new" +msgstr "Нове повідомлення" -#: src/src/i2p/susi/webmail/WebMail.java:1713 +#: src/src/i2p/susi/webmail/WebMail.java:2175 +msgid "Message has an attachment" +msgstr "Повідомлення містить прикріплені файли" + +#: src/src/i2p/susi/webmail/WebMail.java:2177 +msgid "Message is spam" +msgstr "Повідомлення є спамом" + +#: src/src/i2p/susi/webmail/WebMail.java:2185 +msgid "No messages" +msgstr "Немає повідомлень" + +#. TODO ngettext +#: src/src/i2p/susi/webmail/WebMail.java:2197 +msgid "Really delete the marked messages?" +msgstr "Ви дійсно хочете видалити позначені повідомлення?" + +#: src/src/i2p/susi/webmail/WebMail.java:2198 +msgid "Yes, really delete them!" +msgstr "Так, дійсно видалити їх!" + +#. TODO js +#: src/src/i2p/susi/webmail/WebMail.java:2202 +msgid "Delete Selected" +msgstr "Видалити обрані" + +#: src/src/i2p/susi/webmail/WebMail.java:2204 msgid "Mark All" msgstr "Позначити всі" -#: src/src/i2p/susi/webmail/WebMail.java:1714 -msgid "Invert Selection" -msgstr "Інвертувати виділене" +#: src/src/i2p/susi/webmail/WebMail.java:2206 +msgid "Clear All" +msgstr "Очистити все" -#: src/src/i2p/susi/webmail/WebMail.java:1715 -msgid "Clear" -msgstr "Очистити" - -#: src/src/i2p/susi/webmail/WebMail.java:1718 -#: src/src/i2p/susi/webmail/WebMail.java:1719 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 msgid "First" msgstr "Перше" -#: src/src/i2p/susi/webmail/WebMail.java:1718 -#: src/src/i2p/susi/webmail/WebMail.java:1719 -#: src/src/i2p/susi/webmail/WebMail.java:1754 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 +#: src/src/i2p/susi/webmail/WebMail.java:2268 msgid "Previous" msgstr "Попереднє" -#: src/src/i2p/susi/webmail/WebMail.java:1720 +#: src/src/i2p/susi/webmail/WebMail.java:2234 #, java-format msgid "Page {0} of {1}" msgstr "Сторінка {0} з {1}" -#: src/src/i2p/susi/webmail/WebMail.java:1722 -#: src/src/i2p/susi/webmail/WebMail.java:1723 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 msgid "Last" msgstr "Останнє" -#: src/src/i2p/susi/webmail/WebMail.java:1722 -#: src/src/i2p/susi/webmail/WebMail.java:1723 -#: src/src/i2p/susi/webmail/WebMail.java:1755 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 +#: src/src/i2p/susi/webmail/WebMail.java:2270 msgid "Next" msgstr "Наступне" -#: src/src/i2p/susi/webmail/WebMail.java:1726 -msgid "Pagesize:" -msgstr "Розмір сторінки:" - -#: src/src/i2p/susi/webmail/WebMail.java:1727 -msgid "Set" -msgstr "Встановити" - -#: src/src/i2p/susi/webmail/WebMail.java:1737 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Really delete this message?" msgstr "Ви дійсно хочете видалити ці повідомлення?" -#: src/src/i2p/susi/webmail/WebMail.java:1737 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Yes, really delete it!" msgstr "Так, дійсно видалити це!" -#: src/src/i2p/susi/webmail/WebMail.java:1756 +#: src/src/i2p/susi/webmail/WebMail.java:2263 +msgid "Reply" +msgstr "Відповісти" + +#: src/src/i2p/susi/webmail/WebMail.java:2264 +msgid "Reply All" +msgstr "Відповісти всім" + +#: src/src/i2p/susi/webmail/WebMail.java:2265 +msgid "Forward" +msgstr "Переслати" + +#: src/src/i2p/susi/webmail/WebMail.java:2266 +msgid "Delete" +msgstr "Видалити" + +#: src/src/i2p/susi/webmail/WebMail.java:2269 msgid "Back to Folder" msgstr "Назад в Папку" -#: src/src/i2p/susi/webmail/WebMail.java:1763 -msgid "Date:" -msgstr "Дата:" - -#: src/src/i2p/susi/webmail/WebMail.java:1774 +#: src/src/i2p/susi/webmail/WebMail.java:2294 msgid "Could not fetch mail." msgstr "Не змогли отримати пошту." + +#: src/src/i2p/susi/webmail/WebMail.java:2312 +msgid "Folder Page Size" +msgstr "" + +#: src/src/i2p/susi/webmail/WebMail.java:2315 +msgid "Set" +msgstr "Встановити" + +#: src/src/i2p/susi/webmail/WebMail.java:2318 +msgid "Advanced Configuration" +msgstr "Розширена конфігурація" + +#: src/src/i2p/susi/webmail/WebMail.java:2329 +msgid "Save Configuration" +msgstr "Зберегти конфігурацію" + +#. this appears in the UI so translate +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789 +msgid "No response from server" +msgstr "Немає відповіді від сервера" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664 +msgid "Error connecting to server" +msgstr "Помилка з'єднання з сервером" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672 +msgid "Error opening mailbox" +msgstr "Помилка відкриття поштової скриньки" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249 +msgid "Login failed" +msgstr "Помилка входу" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214 +msgid "Cannot connect" +msgstr "Неможливо підключитися" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237 +msgid "Server refused connection" +msgstr "Сервер відмовився встановлювати з'єднання" + +#. TODO which recipient? +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262 +msgid "Mail rejected" +msgstr "Лист відхилений" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279 +msgid "Error sending mail" +msgstr "Помилка відправки пошти" diff --git a/apps/susimail/locale/messages_zh.po b/apps/susimail/locale/messages_zh.po index 198a60445f..85ac5cf06c 100644 --- a/apps/susimail/locale/messages_zh.po +++ b/apps/susimail/locale/messages_zh.po @@ -2,444 +2,519 @@ # Copyright (C) 2009 The I2P Project # This file is distributed under the same license as the susimail package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: +# xkimo_daeee , 2014 # walking , 2013 # walking , 2011 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 19:56+0000\n" -"PO-Revision-Date: 2013-07-11 06:41+0000\n" -"Last-Translator: xtoaster \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/" -"language/zh_CN/)\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2014-05-01 11:45+0000\n" +"PO-Revision-Date: 2014-07-01 16:20+0000\n" +"Last-Translator: xkimo_daeee \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/src/i2p/susi/webmail/WebMail.java:447 -msgid "unknown" -msgstr "未知" - -#: src/src/i2p/susi/webmail/WebMail.java:466 -msgid "Warning: no transfer encoding found, fallback to 7bit." -msgstr "警告：传输编码检测失败，回退到7位。" - -#: src/src/i2p/susi/webmail/WebMail.java:471 +#: src/src/i2p/susi/webmail/MailPart.java:207 #, java-format msgid "No encoder found for encoding \\''{0}\\''." msgstr "没有找到可用编码器处理编码\\ '' {0} \\ ''。" -#: src/src/i2p/susi/webmail/WebMail.java:477 +#: src/src/i2p/susi/webmail/WebMail.java:304 +#: src/src/i2p/susi/webmail/WebMail.java:318 +#: src/src/i2p/susi/webmail/WebMail.java:1005 +msgid "Re:" +msgstr "回复:" + +#: src/src/i2p/susi/webmail/WebMail.java:308 +#: src/src/i2p/susi/webmail/WebMail.java:322 +#: src/src/i2p/susi/webmail/WebMail.java:1043 +msgid "Fwd:" +msgstr "转发:" + +#: src/src/i2p/susi/webmail/WebMail.java:594 +msgid "unknown" +msgstr "未知" + +#: src/src/i2p/susi/webmail/WebMail.java:615 msgid "Warning: no charset found, fallback to US-ASCII." msgstr "警告：字符集检测失败，回退为US - ASCII。" -#: src/src/i2p/susi/webmail/WebMail.java:491 +#: src/src/i2p/susi/webmail/WebMail.java:629 #, java-format msgid "Charset \\''{0}\\'' not supported." msgstr "不支持字符集\\ '' {0} \\ ''。" -#: src/src/i2p/susi/webmail/WebMail.java:495 +#: src/src/i2p/susi/webmail/WebMail.java:633 #, java-format msgid "Part ({0}) not shown, because of {1}" msgstr "第（{0}）部分没有显示，因为{1}" -#: src/src/i2p/susi/webmail/WebMail.java:518 -msgid "Download" -msgstr "下载" +#: src/src/i2p/susi/webmail/WebMail.java:669 +#: src/src/i2p/susi/webmail/WebMail.java:672 +#, java-format +msgid "Download attachment {0}" +msgstr "下载附件{0}" -#: src/src/i2p/susi/webmail/WebMail.java:518 +#: src/src/i2p/susi/webmail/WebMail.java:673 msgid "File is packed into a zipfile for security reasons." msgstr "出于安全原因，文件被打包为zip文件。" -#: src/src/i2p/susi/webmail/WebMail.java:518 -#, java-format -msgid "attachment ({0})." -msgstr "附件（{0}）。" - -#: src/src/i2p/susi/webmail/WebMail.java:522 +#: src/src/i2p/susi/webmail/WebMail.java:678 #, java-format msgid "Attachment ({0})." msgstr "附件（{0}）。" -#: src/src/i2p/susi/webmail/WebMail.java:572 +#: src/src/i2p/susi/webmail/WebMail.java:729 msgid "Need username for authentication." msgstr "需要认证用的用户名。" -#: src/src/i2p/susi/webmail/WebMail.java:576 +#: src/src/i2p/susi/webmail/WebMail.java:733 msgid "Need password for authentication." msgstr "需要认证用的密码。" -#: src/src/i2p/susi/webmail/WebMail.java:580 +#: src/src/i2p/susi/webmail/WebMail.java:737 msgid "Need hostname for connect." msgstr "需要连接用的主机名。" -#: src/src/i2p/susi/webmail/WebMail.java:585 +#: src/src/i2p/susi/webmail/WebMail.java:742 msgid "Need port number for pop3 connect." msgstr "需要POP3的连接端口号。" -#: src/src/i2p/susi/webmail/WebMail.java:592 +#: src/src/i2p/susi/webmail/WebMail.java:749 msgid "POP3 port number is not in range 0..65535." msgstr "POP3端口号超出范围0-65535。" -#: src/src/i2p/susi/webmail/WebMail.java:598 +#: src/src/i2p/susi/webmail/WebMail.java:755 msgid "POP3 port number is invalid." msgstr "POP3端口号是无效的。" -#: src/src/i2p/susi/webmail/WebMail.java:604 +#: src/src/i2p/susi/webmail/WebMail.java:761 msgid "Need port number for smtp connect." msgstr "需要的SMTP连接端口号。" -#: src/src/i2p/susi/webmail/WebMail.java:611 +#: src/src/i2p/susi/webmail/WebMail.java:768 msgid "SMTP port number is not in range 0..65535." msgstr "SMTP端口号是超出范围0-65535。" -#: src/src/i2p/susi/webmail/WebMail.java:617 +#: src/src/i2p/susi/webmail/WebMail.java:774 msgid "SMTP port number is invalid." msgstr "SMTP端口号无效。" -#: src/src/i2p/susi/webmail/WebMail.java:664 +#: src/src/i2p/susi/webmail/WebMail.java:848 msgid "User logged out." msgstr "用户已登出。" -#: src/src/i2p/susi/webmail/WebMail.java:668 +#: src/src/i2p/susi/webmail/WebMail.java:851 msgid "Internal error, lost connection." msgstr "内部错误，连接已断开。" -#: src/src/i2p/susi/webmail/WebMail.java:764 +#: src/src/i2p/susi/webmail/WebMail.java:1008 #, java-format msgid "On {0} {1} wrote:" msgstr "在 {0} {1} 写到：" -#: src/src/i2p/susi/webmail/WebMail.java:811 +#: src/src/i2p/susi/webmail/WebMail.java:1055 msgid "begin forwarded mail" msgstr "转信开始" -#: src/src/i2p/susi/webmail/WebMail.java:833 +#: src/src/i2p/susi/webmail/WebMail.java:1077 msgid "end forwarded mail" msgstr "转信结束" -#: src/src/i2p/susi/webmail/WebMail.java:840 -#: src/src/i2p/susi/webmail/WebMail.java:1775 +#: src/src/i2p/susi/webmail/WebMail.java:1084 +#: src/src/i2p/susi/webmail/WebMail.java:2290 msgid "Could not fetch mail body." msgstr "无法获取邮件正文。" -#: src/src/i2p/susi/webmail/WebMail.java:868 +#: src/src/i2p/susi/webmail/WebMail.java:1114 msgid "Message id not valid." msgstr "消息ID无效。" -#: src/src/i2p/susi/webmail/WebMail.java:951 +#: src/src/i2p/susi/webmail/WebMail.java:1152 +msgid "Configuration reloaded" +msgstr "重新加载配置" + +#: src/src/i2p/susi/webmail/WebMail.java:1213 #, java-format msgid "No Encoding found for {0}" msgstr "{0}的编码检测失败。" -#: src/src/i2p/susi/webmail/WebMail.java:955 +#: src/src/i2p/susi/webmail/WebMail.java:1217 #, java-format msgid "Could not encode data: {0}" msgstr "无法对数据进行编码：{0}" -#: src/src/i2p/susi/webmail/WebMail.java:960 +#: src/src/i2p/susi/webmail/WebMail.java:1222 #, java-format msgid "Error reading uploaded file: {0}" msgstr "读取上传文件错误：{0}" -#: src/src/i2p/susi/webmail/WebMail.java:1038 -msgid "Error parsing download parameter." -msgstr "下载参数解析错误。" +#. error if we get here +#: src/src/i2p/susi/webmail/WebMail.java:1307 +#: src/src/i2p/susi/webmail/WebMail.java:1310 +msgid "Attachment not found." +msgstr "找不到附件." -#: src/src/i2p/susi/webmail/WebMail.java:1082 +#: src/src/i2p/susi/webmail/WebMail.java:1357 +#: src/src/i2p/susi/webmail/WebMail.java:1483 msgid "Invalid pagesize number, resetting to default value." msgstr "无效的每页数，重置为默认值。" -#: src/src/i2p/susi/webmail/WebMail.java:1106 +#: src/src/i2p/susi/webmail/WebMail.java:1381 msgid "No messages marked for deletion." msgstr "没有邮件被标记来删除。" -#: src/src/i2p/susi/webmail/WebMail.java:1126 -#, java-format -msgid "Error deleting message: {0}" -msgstr "邮件删除错误：{0}" - -#: src/src/i2p/susi/webmail/WebMail.java:1137 +#: src/src/i2p/susi/webmail/WebMail.java:1397 #, java-format msgid "1 message deleted." msgid_plural "{0} messages deleted." msgstr[0] "已删除{0}封邮件。" -#: src/src/i2p/susi/webmail/WebMail.java:1318 -#: src/src/i2p/susi/webmail/WebMail.java:1659 +#: src/src/i2p/susi/webmail/WebMail.java:1462 +msgid "Configuration saved" +msgstr "配置已保存" + +#: src/src/i2p/susi/webmail/WebMail.java:1673 +#: src/src/i2p/susi/webmail/WebMail.java:2085 msgid "Login" msgstr "登录" -#: src/src/i2p/susi/webmail/WebMail.java:1320 +#. mailbox.getNumMails() forces a connection, don't use it +#. Not only does it slow things down, but a failure causes all our messages to +#. "vanish" +#. subtitle = ngettext("1 Message", "{0} Messages", +#. sessionObject.mailbox.getNumMails()); +#: src/src/i2p/susi/webmail/WebMail.java:1678 #, java-format msgid "1 Message" msgid_plural "{0} Messages" msgstr[0] "{0} 封邮件" -#: src/src/i2p/susi/webmail/WebMail.java:1322 +#: src/src/i2p/susi/webmail/WebMail.java:1684 msgid "Show Message" msgstr "显示消息" -#: src/src/i2p/susi/webmail/WebMail.java:1388 +#: src/src/i2p/susi/webmail/WebMail.java:1686 +msgid "New Message" +msgstr "新邮件" + +#: src/src/i2p/susi/webmail/WebMail.java:1688 +msgid "Configuration" +msgstr "配置" + +#: src/src/i2p/susi/webmail/WebMail.java:1699 +msgid "SusiMail" +msgstr "SusiMail" + +#: src/src/i2p/susi/webmail/WebMail.java:1712 +msgid "Message has not been sent. Do you want to discard it?" +msgstr "消息尚未发送. 你想要放弃它吗?" + +#: src/src/i2p/susi/webmail/WebMail.java:1773 #, java-format msgid "Error decoding content: {0}" msgstr "解码错误：{0}" -#: src/src/i2p/susi/webmail/WebMail.java:1393 -msgid "Error decoding content: No encoder found." -msgstr "内容解码错误：没有可用编码器。" - -#: src/src/i2p/susi/webmail/WebMail.java:1440 +#: src/src/i2p/susi/webmail/WebMail.java:1833 msgid "no subject" msgstr "没有主题" -#: src/src/i2p/susi/webmail/WebMail.java:1457 +#: src/src/i2p/susi/webmail/WebMail.java:1850 msgid "Found no valid sender address." msgstr "没有找到有效的发件人地址。" -#: src/src/i2p/susi/webmail/WebMail.java:1463 +#: src/src/i2p/susi/webmail/WebMail.java:1856 #, java-format msgid "Found no valid address in \\''{0}\\''." msgstr "\\ '' {0} \\ ''中没有找到有效的地址。" -#: src/src/i2p/susi/webmail/WebMail.java:1482 +#: src/src/i2p/susi/webmail/WebMail.java:1877 msgid "No recipients found." msgstr "没有找到收件人。" -#: src/src/i2p/susi/webmail/WebMail.java:1489 -msgid "Quoted printable encoder not available." -msgstr "引文可打印编码器不可用。" - -#: src/src/i2p/susi/webmail/WebMail.java:1494 -msgid "Header line encoder not available." -msgstr "标题行编码器不可用。" - -#: src/src/i2p/susi/webmail/WebMail.java:1545 +#: src/src/i2p/susi/webmail/WebMail.java:1941 msgid "Mail sent." msgstr "邮件已发送。" -#: src/src/i2p/susi/webmail/WebMail.java:1584 +#: src/src/i2p/susi/webmail/WebMail.java:1985 msgid "Send" msgstr "发送" -#: src/src/i2p/susi/webmail/WebMail.java:1585 +#: src/src/i2p/susi/webmail/WebMail.java:1986 +#: src/src/i2p/susi/webmail/WebMail.java:2199 +#: src/src/i2p/susi/webmail/WebMail.java:2330 msgid "Cancel" msgstr "取消" -#: src/src/i2p/susi/webmail/WebMail.java:1586 -msgid "Delete Attachment" -msgstr "删除附件" +#: src/src/i2p/susi/webmail/WebMail.java:2029 +#: src/src/i2p/susi/webmail/WebMail.java:2128 +#: src/src/i2p/susi/webmail/WebMail.java:2278 +msgid "From" +msgstr "发件人" -#: src/src/i2p/susi/webmail/WebMail.java:1587 -#: src/src/i2p/susi/webmail/WebMail.java:1681 -#: src/src/i2p/susi/webmail/WebMail.java:1762 -msgid "Reload Config" -msgstr "重新载入配置" +#: src/src/i2p/susi/webmail/WebMail.java:2030 +msgid "To" +msgstr "收件人" -#: src/src/i2p/susi/webmail/WebMail.java:1588 -#: src/src/i2p/susi/webmail/WebMail.java:1682 -#: src/src/i2p/susi/webmail/WebMail.java:1763 -msgid "Logout" -msgstr "注销" +#: src/src/i2p/susi/webmail/WebMail.java:2031 +msgid "Cc" +msgstr "抄送" -#: src/src/i2p/susi/webmail/WebMail.java:1611 -#: src/src/i2p/susi/webmail/WebMail.java:1767 -msgid "From:" -msgstr "来自：" +#: src/src/i2p/susi/webmail/WebMail.java:2032 +msgid "Bcc" +msgstr "密件抄送" -#: src/src/i2p/susi/webmail/WebMail.java:1612 -msgid "To:" -msgstr "致：" - -#: src/src/i2p/susi/webmail/WebMail.java:1613 -msgid "Cc:" -msgstr "抄送：" - -#: src/src/i2p/susi/webmail/WebMail.java:1614 -msgid "Bcc:" -msgstr "密送：" - -#: src/src/i2p/susi/webmail/WebMail.java:1615 -#: src/src/i2p/susi/webmail/WebMail.java:1769 -msgid "Subject:" -msgstr "主题：" - -#: src/src/i2p/susi/webmail/WebMail.java:1616 +#: src/src/i2p/susi/webmail/WebMail.java:2033 msgid "Bcc to self" msgstr "密送给自己" -#: src/src/i2p/susi/webmail/WebMail.java:1619 -msgid "New Attachment:" -msgstr "新附件：" - -#: src/src/i2p/susi/webmail/WebMail.java:1619 -msgid "Upload File" -msgstr "上传文件" - -#: src/src/i2p/susi/webmail/WebMail.java:1625 -msgid "Attachments:" -msgstr "附件：" - -#. current postman hq length limits 16/12, new postman version 32/32 -#: src/src/i2p/susi/webmail/WebMail.java:1648 -msgid "User" -msgstr "用户" - -#: src/src/i2p/susi/webmail/WebMail.java:1649 -msgid "Password" -msgstr "密码" - -#: src/src/i2p/susi/webmail/WebMail.java:1654 -msgid "Host" -msgstr "主机" - -#: src/src/i2p/susi/webmail/WebMail.java:1655 -msgid "POP3-Port" -msgstr "POP3端口" - -#: src/src/i2p/susi/webmail/WebMail.java:1656 -msgid "SMTP-Port" -msgstr "SMTP端口" - -#: src/src/i2p/susi/webmail/WebMail.java:1659 -msgid "Reset" -msgstr "复位" - -#: src/src/i2p/susi/webmail/WebMail.java:1660 -msgid "Learn about I2P mail" -msgstr "了解 I2P 邮件" - -#: src/src/i2p/susi/webmail/WebMail.java:1661 -msgid "Create Account" -msgstr "创建帐户" - -#: src/src/i2p/susi/webmail/WebMail.java:1673 -msgid "Really delete the marked messages?" -msgstr "真要删除标记的邮件？" - -#: src/src/i2p/susi/webmail/WebMail.java:1673 -msgid "Yes, really delete them!" -msgstr "是的，立刻删除！" - -#: src/src/i2p/susi/webmail/WebMail.java:1675 -#: src/src/i2p/susi/webmail/WebMail.java:1754 -msgid "New" -msgstr "新建" - -#: src/src/i2p/susi/webmail/WebMail.java:1676 -#: src/src/i2p/susi/webmail/WebMail.java:1755 -msgid "Reply" -msgstr "回复" - -#: src/src/i2p/susi/webmail/WebMail.java:1677 -#: src/src/i2p/susi/webmail/WebMail.java:1756 -msgid "Reply All" -msgstr "回复所有人" - -#: src/src/i2p/susi/webmail/WebMail.java:1678 -#: src/src/i2p/susi/webmail/WebMail.java:1757 -msgid "Forward" -msgstr "转寄" - -#: src/src/i2p/susi/webmail/WebMail.java:1679 -#: src/src/i2p/susi/webmail/WebMail.java:1758 -msgid "Delete" -msgstr "删除" - -#: src/src/i2p/susi/webmail/WebMail.java:1680 -msgid "Check Mail" -msgstr "检查邮件" - -#: src/src/i2p/susi/webmail/WebMail.java:1684 -msgid "Sender" -msgstr "寄件人" - -#: src/src/i2p/susi/webmail/WebMail.java:1685 +#: src/src/i2p/susi/webmail/WebMail.java:2034 +#: src/src/i2p/susi/webmail/WebMail.java:2129 +#: src/src/i2p/susi/webmail/WebMail.java:2280 msgid "Subject" msgstr "主题" -#: src/src/i2p/susi/webmail/WebMail.java:1686 +#: src/src/i2p/susi/webmail/WebMail.java:2037 +msgid "Add Attachment" +msgstr "添加附件" + +#. TODO disable/hide in JS if no file selected +#: src/src/i2p/susi/webmail/WebMail.java:2039 +msgid "Add another attachment" +msgstr "添加另一个附件" + +#: src/src/i2p/susi/webmail/WebMail.java:2045 +msgid "Attachments" +msgstr "附件" + +#: src/src/i2p/susi/webmail/WebMail.java:2054 +msgid "Delete selected attachments" +msgstr "删除所选的附件" + +#. current postman hq length limits 16/12, new postman version 32/32 +#: src/src/i2p/susi/webmail/WebMail.java:2073 +msgid "User" +msgstr "用户" + +#: src/src/i2p/susi/webmail/WebMail.java:2074 +msgid "Password" +msgstr "密码" + +#: src/src/i2p/susi/webmail/WebMail.java:2079 +msgid "Host" +msgstr "主机" + +#: src/src/i2p/susi/webmail/WebMail.java:2080 +msgid "POP3 Port" +msgstr "POP3 端口" + +#: src/src/i2p/susi/webmail/WebMail.java:2081 +msgid "SMTP Port" +msgstr "SMTP 端口" + +#: src/src/i2p/susi/webmail/WebMail.java:2086 +msgid "Read Mail Offline" +msgstr "脱机阅读邮件" + +#: src/src/i2p/susi/webmail/WebMail.java:2090 +#: src/src/i2p/susi/webmail/WebMail.java:2218 +msgid "Settings" +msgstr "设置" + +#: src/src/i2p/susi/webmail/WebMail.java:2093 +msgid "Learn about I2P mail" +msgstr "了解 I2P 邮件" + +#: src/src/i2p/susi/webmail/WebMail.java:2094 +msgid "Create Account" +msgstr "创建帐户" + +#: src/src/i2p/susi/webmail/WebMail.java:2107 +#: src/src/i2p/susi/webmail/WebMail.java:2262 +msgid "New" +msgstr "新建" + +#. In theory, these are valid and will apply to the first checked message, +#. but that's not obvious and did it work? +#. button( REPLY, _("Reply") ) + +#. button( REPLYALL, _("Reply All") ) + +#. button( FORWARD, _("Forward") ) + spacer + +#. button( DELETE, _("Delete") ) + spacer + +#: src/src/i2p/susi/webmail/WebMail.java:2114 +msgid "Check Mail" +msgstr "检查邮件" + +#. if (Config.hasConfigFile()) +#. out.println(button( RELOAD, _("Reload Config") ) + spacer); +#: src/src/i2p/susi/webmail/WebMail.java:2117 +msgid "Logout" +msgstr "注销" + +#: src/src/i2p/susi/webmail/WebMail.java:2130 +#: src/src/i2p/susi/webmail/WebMail.java:2282 msgid "Date" msgstr "日期" -#: src/src/i2p/susi/webmail/WebMail.java:1687 +#: src/src/i2p/susi/webmail/WebMail.java:2133 msgid "Size" msgstr "大小" -#: src/src/i2p/susi/webmail/WebMail.java:1713 -#, java-format -msgid "1 Byte" -msgid_plural "{0} Bytes" -msgstr[0] "{0} 字节" +#: src/src/i2p/susi/webmail/WebMail.java:2173 +msgid "Message is new" +msgstr "是新邮件" -#: src/src/i2p/susi/webmail/WebMail.java:1718 +#: src/src/i2p/susi/webmail/WebMail.java:2175 +msgid "Message has an attachment" +msgstr "邮件带有附件" + +#: src/src/i2p/susi/webmail/WebMail.java:2177 +msgid "Message is spam" +msgstr "邮件是垃圾邮件" + +#: src/src/i2p/susi/webmail/WebMail.java:2185 +msgid "No messages" +msgstr "没有邮件" + +#. TODO ngettext +#: src/src/i2p/susi/webmail/WebMail.java:2197 +msgid "Really delete the marked messages?" +msgstr "真要删除标记的邮件？" + +#: src/src/i2p/susi/webmail/WebMail.java:2198 +msgid "Yes, really delete them!" +msgstr "是的，立刻删除！" + +#. TODO js +#: src/src/i2p/susi/webmail/WebMail.java:2202 +msgid "Delete Selected" +msgstr "删除所选" + +#: src/src/i2p/susi/webmail/WebMail.java:2204 msgid "Mark All" msgstr "全部标记" -#: src/src/i2p/susi/webmail/WebMail.java:1719 -msgid "Invert Selection" -msgstr "反向选择" +#: src/src/i2p/susi/webmail/WebMail.java:2206 +msgid "Clear All" +msgstr "全部清除" -#: src/src/i2p/susi/webmail/WebMail.java:1720 -msgid "Clear" -msgstr "清除" - -#: src/src/i2p/susi/webmail/WebMail.java:1723 -#: src/src/i2p/susi/webmail/WebMail.java:1724 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 msgid "First" msgstr "第一页" -#: src/src/i2p/susi/webmail/WebMail.java:1723 -#: src/src/i2p/susi/webmail/WebMail.java:1724 -#: src/src/i2p/susi/webmail/WebMail.java:1759 +#: src/src/i2p/susi/webmail/WebMail.java:2231 +#: src/src/i2p/susi/webmail/WebMail.java:2232 +#: src/src/i2p/susi/webmail/WebMail.java:2268 msgid "Previous" msgstr "上一页" -#: src/src/i2p/susi/webmail/WebMail.java:1725 +#: src/src/i2p/susi/webmail/WebMail.java:2234 #, java-format msgid "Page {0} of {1}" msgstr "第{0}页 共{1}页" -#: src/src/i2p/susi/webmail/WebMail.java:1727 -#: src/src/i2p/susi/webmail/WebMail.java:1728 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 msgid "Last" msgstr "最后一页" -#: src/src/i2p/susi/webmail/WebMail.java:1727 -#: src/src/i2p/susi/webmail/WebMail.java:1728 -#: src/src/i2p/susi/webmail/WebMail.java:1760 +#: src/src/i2p/susi/webmail/WebMail.java:2237 +#: src/src/i2p/susi/webmail/WebMail.java:2238 +#: src/src/i2p/susi/webmail/WebMail.java:2270 msgid "Next" msgstr "下一页" -#: src/src/i2p/susi/webmail/WebMail.java:1731 -msgid "Pagesize:" -msgstr "每页容量：" - -#: src/src/i2p/susi/webmail/WebMail.java:1732 -msgid "Set" -msgstr "设置" - -#: src/src/i2p/susi/webmail/WebMail.java:1742 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Really delete this message?" msgstr "真的要删除此邮件？" -#: src/src/i2p/susi/webmail/WebMail.java:1742 +#: src/src/i2p/susi/webmail/WebMail.java:2250 msgid "Yes, really delete it!" msgstr "是的，立刻删除！" -#: src/src/i2p/susi/webmail/WebMail.java:1761 +#: src/src/i2p/susi/webmail/WebMail.java:2263 +msgid "Reply" +msgstr "回复" + +#: src/src/i2p/susi/webmail/WebMail.java:2264 +msgid "Reply All" +msgstr "回复所有人" + +#: src/src/i2p/susi/webmail/WebMail.java:2265 +msgid "Forward" +msgstr "转寄" + +#: src/src/i2p/susi/webmail/WebMail.java:2266 +msgid "Delete" +msgstr "删除" + +#: src/src/i2p/susi/webmail/WebMail.java:2269 msgid "Back to Folder" msgstr "返回到文件夹" -#: src/src/i2p/susi/webmail/WebMail.java:1768 -msgid "Date:" -msgstr "日期：" - -#: src/src/i2p/susi/webmail/WebMail.java:1779 +#: src/src/i2p/susi/webmail/WebMail.java:2294 msgid "Could not fetch mail." msgstr "无法收取邮件。" + +#: src/src/i2p/susi/webmail/WebMail.java:2312 +msgid "Folder Page Size" +msgstr "文件夹页面大小" + +#: src/src/i2p/susi/webmail/WebMail.java:2315 +msgid "Set" +msgstr "设置" + +#: src/src/i2p/susi/webmail/WebMail.java:2318 +msgid "Advanced Configuration" +msgstr "高级配置" + +#: src/src/i2p/susi/webmail/WebMail.java:2329 +msgid "Save Configuration" +msgstr "保存配置" + +#. this appears in the UI so translate +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:747 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:789 +msgid "No response from server" +msgstr "服务器没有响应" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:664 +msgid "Error connecting to server" +msgstr "连接到服务器错误" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:669 +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:672 +msgid "Error opening mailbox" +msgstr "打开邮箱错误" + +#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1021 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249 +msgid "Login failed" +msgstr "登录失败" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214 +msgid "Cannot connect" +msgstr "不能连接" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237 +msgid "Server refused connection" +msgstr "服务器拒绝连接" + +#. TODO which recipient? +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262 +msgid "Mail rejected" +msgstr "邮件被拒绝" + +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276 +#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279 +msgid "Error sending mail" +msgstr "发送邮件错误" diff --git a/apps/susimail/src/WEB-INF/web.xml b/apps/susimail/src/WEB-INF/web.xml index 75aa1fd484..23adde2d5b 100644 --- a/apps/susimail/src/WEB-INF/web.xml +++ b/apps/susimail/src/WEB-INF/web.xml @@ -3,6 +3,15 @@ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"> + + XSSFilter + net.i2p.servlet.filters.XSSFilter + + + XSSFilter + /* + + susimail SusiMail diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java index 462ee32742..95e0829bfe 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java @@ -283,14 +283,14 @@ class Mail { Encoding html = EncodingFactory.getEncoding( "HTML" ); if( html == null ) { - error += "HTML encoder not found.
"; + error += "HTML encoder not found.\n"; ok = false; } Encoding hl = EncodingFactory.getEncoding( "HEADERLINE" ); if( hl == null ) { - error += "Header line encoder not found.
"; + error += "Header line encoder not found.\n"; ok = false; } @@ -369,7 +369,7 @@ class Mail { } } catch( Exception e ) { - error += "Error parsing mail header: " + e.getClass().getName() + "
"; + error += "Error parsing mail header: " + e.getClass().getName() + '\n'; } } } diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index eee7e9fbc6..c3dbd78c3a 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -614,7 +614,7 @@ public class WebMail extends HttpServlet } catch (Exception e1) { showBody = false; - reason += _("Part ({0}) not shown, because of {1}", ident, e1.getClass().getName()) + br; + reason += _("Part ({0}) not shown, because of {1}", ident, e1.toString()) + br; } } if( html ) @@ -677,7 +677,7 @@ public class WebMail extends HttpServlet static String quoteHTML( String line ) { if( line != null ) - line = line.replace("&", "&").replace( "<", "<" ).replace( ">", ">" ); + line = DataHelper.escapeHTML(line); else line = ""; return line; @@ -710,52 +710,52 @@ public class WebMail extends HttpServlet if (buttonPressed(request, LOGIN) || offline) { if( user == null || user.length() == 0 ) { - sessionObject.error += _("Need username for authentication.") + "
"; + sessionObject.error += _("Need username for authentication.") + '\n'; doContinue = false; } if( pass == null || pass.length() == 0 ) { - sessionObject.error += _("Need password for authentication.") + "
"; + sessionObject.error += _("Need password for authentication.") + '\n'; doContinue = false; } if( host == null || host.length() == 0 ) { - sessionObject.error += _("Need hostname for connect.") + "
"; + sessionObject.error += _("Need hostname for connect.") + '\n'; doContinue = false; } int pop3PortNo = 0; if( pop3Port == null || pop3Port.length() == 0 ) { - sessionObject.error += _("Need port number for pop3 connect.") + "
"; + sessionObject.error += _("Need port number for pop3 connect.") + '\n'; doContinue = false; } else { try { pop3PortNo = Integer.parseInt( pop3Port ); if( pop3PortNo < 0 || pop3PortNo > 65535 ) { - sessionObject.error += _("POP3 port number is not in range 0..65535.") + "
"; + sessionObject.error += _("POP3 port number is not in range 0..65535.") + '\n'; doContinue = false; } } catch( NumberFormatException nfe ) { - sessionObject.error += _("POP3 port number is invalid.") + "
"; + sessionObject.error += _("POP3 port number is invalid.") + '\n'; doContinue = false; } } int smtpPortNo = 0; if( smtpPort == null || smtpPort.length() == 0 ) { - sessionObject.error += _("Need port number for smtp connect.") + "
"; + sessionObject.error += _("Need port number for smtp connect.") + '\n'; doContinue = false; } else { try { smtpPortNo = Integer.parseInt( smtpPort ); if( smtpPortNo < 0 || smtpPortNo > 65535 ) { - sessionObject.error += _("SMTP port number is not in range 0..65535.") + "
"; + sessionObject.error += _("SMTP port number is not in range 0..65535.") + '\n'; doContinue = false; } } catch( NumberFormatException nfe ) { - sessionObject.error += _("SMTP port number is invalid.") + "
"; + sessionObject.error += _("SMTP port number is invalid.") + '\n'; doContinue = false; } } @@ -829,10 +829,10 @@ public class WebMail extends HttpServlet sessionObject.mailbox = null; sessionObject.mailCache = null; } - sessionObject.info += _("User logged out.") + "
"; + sessionObject.info += _("User logged out.") + '\n'; sessionObject.state = STATE_AUTH; } else if( sessionObject.mailbox == null ) { - sessionObject.error += _("Internal error, lost connection.") + "
"; + sessionObject.error += _("Internal error, lost connection.") + '\n'; sessionObject.state = STATE_AUTH; } } @@ -1065,7 +1065,7 @@ public class WebMail extends HttpServlet sessionObject.state = STATE_NEW; } else { - sessionObject.error += _("Could not fetch mail body.") + "
"; + sessionObject.error += _("Could not fetch mail body.") + '\n'; } } } @@ -1095,7 +1095,7 @@ public class WebMail extends HttpServlet } catch( NumberFormatException nfe ) { - sessionObject.error += _("Message id not valid.") + "
"; + sessionObject.error += _("Message id not valid.") + '\n'; } } } @@ -1194,7 +1194,7 @@ public class WebMail extends HttpServlet ); } else { - sessionObject.error += _("No Encoding found for {0}", encodeTo) + "
"; + sessionObject.error += _("No Encoding found for {0}", encodeTo) + '\n'; } } catch (EncodingException e1) { @@ -1203,7 +1203,7 @@ public class WebMail extends HttpServlet } } catch (IOException e) { - sessionObject.error += _("Error reading uploaded file: {0}", e.getMessage()) + "
"; + sessionObject.error += _("Error reading uploaded file: {0}", e.getMessage()) + '\n'; } } } @@ -1338,7 +1338,7 @@ public class WebMail extends HttpServlet sessionObject.folder.setPageSize( pageSize ); } catch( NumberFormatException nfe ) { - sessionObject.error += _("Invalid pagesize number, resetting to default value.") + "
"; + sessionObject.error += _("Invalid pagesize number, resetting to default value.") + '\n'; } } if( buttonPressed( request, PREVPAGE ) ) { @@ -1362,7 +1362,7 @@ public class WebMail extends HttpServlet if (m > 0) sessionObject.reallyDelete = true; else - sessionObject.error += _("No messages marked for deletion.") + "
"; + sessionObject.error += _("No messages marked for deletion.") + '\n'; } else { if( buttonPressed( request, REALLYDELETE ) ) { @@ -1379,7 +1379,7 @@ public class WebMail extends HttpServlet sessionObject.folder.removeElements(toDelete); sessionObject.pageChanged = true; sessionObject.info += ngettext("1 message deleted.", "{0} messages deleted.", numberDeleted); - //sessionObject.error += _("Error deleting message: {0}", sessionObject.mailbox.lastError()) + "
"; + //sessionObject.error += _("Error deleting message: {0}", sessionObject.mailbox.lastError()) + '\n'; } } sessionObject.reallyDelete = false; @@ -1466,7 +1466,7 @@ public class WebMail extends HttpServlet } catch (IOException ioe) { sessionObject.error = ioe.toString(); } catch( NumberFormatException nfe ) { - sessionObject.error += _("Invalid pagesize number, resetting to default value.") + "
"; + sessionObject.error += _("Invalid pagesize number, resetting to default value.") + '\n'; } } else if (buttonPressed(request, CANCEL)) { sessionObject.state = (sessionObject.folder != null) ? STATE_LIST : STATE_AUTH; @@ -1562,6 +1562,8 @@ public class WebMail extends HttpServlet httpRequest.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8"); response.setHeader("X-Frame-Options", "SAMEORIGIN"); + response.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"); + response.setHeader("X-XSS-Protection", "1; mode=block"); RequestWrapper request = new RequestWrapper( httpRequest ); SessionObject sessionObject = null; @@ -1668,7 +1670,7 @@ public class WebMail extends HttpServlet } else if( sessionObject.state == STATE_SHOW ) { Mail mail = sessionObject.mailCache.getMail(sessionObject.showUIDL, MailCache.FetchMode.HEADER); if (mail != null && mail.shortSubject != null) - subtitle = mail.shortSubject; + subtitle = mail.shortSubject; // already HTML encoded else subtitle = _("Show Message"); } else if( sessionObject.state == STATE_NEW ) { @@ -1712,10 +1714,10 @@ public class WebMail extends HttpServlet "
" ); if( sessionObject.error != null && sessionObject.error.length() > 0 ) { - out.println( "

" + sessionObject.error + "

" ); + out.println( "

" + quoteHTML(sessionObject.error).replace("\n", "
") + "

" ); } if( sessionObject.info != null && sessionObject.info.length() > 0 ) { - out.println( "

" + sessionObject.info + "

" ); + out.println( "

" + quoteHTML(sessionObject.info).replace("\n", "
") + "

" ); } /* * now write body @@ -1760,7 +1762,7 @@ public class WebMail extends HttpServlet content = part.decode(2); } catch (DecodingException e) { - sessionObject.error += _("Error decoding content: {0}", e.getMessage()) + "
"; + sessionObject.error += _("Error decoding content: {0}", e.getMessage()) + '\n'; content = null; } } @@ -1837,13 +1839,13 @@ public class WebMail extends HttpServlet if( from == null || !Mail.validateAddress( from ) ) { ok = false; - sessionObject.error += _("Found no valid sender address.") + "
"; + sessionObject.error += _("Found no valid sender address.") + '\n'; } else { sender = Mail.getAddress( from ); if( sender == null || sender.length() == 0 ) { ok = false; - sessionObject.error += _("Found no valid address in \\''{0}\\''.", quoteHTML( from )) + "
"; + sessionObject.error += _("Found no valid address in \\''{0}\\''.", quoteHTML( from )) + '\n'; } } @@ -1864,7 +1866,7 @@ public class WebMail extends HttpServlet if( toList.isEmpty() ) { ok = false; - sessionObject.error += _("No recipients found.") + "
"; + sessionObject.error += _("No recipients found.") + '\n'; } Encoding qp = EncodingFactory.getEncoding( "quoted-printable" ); Encoding hl = EncodingFactory.getEncoding( "HEADERLINE" ); @@ -2016,12 +2018,12 @@ public class WebMail extends HttpServlet out.println( "\n" + "\n" + - "\n" + - "\n" + - "\n" + - "\n" + + "\n" + + "\n" + + "\n" + + "\n" + "\n" + - "\n" + + "\n" + "\n" + "" + @@ -2037,7 +2039,7 @@ public class WebMail extends HttpServlet } else { out.println(""); } - out.println(""); + out.println(""); } // TODO disable in JS if none selected out.println("\n" + - "\n" + - "\n"); + "\n" + + "\n" + + "\n"); } out.println( "\n" + @@ -2162,6 +2164,7 @@ public class WebMail extends HttpServlet " onclick=\"deleteboxclicked();\" " + ( idChecked ? "checked" : "" ) + ">" + "
" + _("From") + ":
" + _("To") + ":
" + _("Cc") + ":
" + _("Bcc") + ":
" + _("From") + ":
" + _("To") + ":
" + _("Cc") + ":
" + _("Bcc") + ":
" + _("Bcc to self") + ":
" + _("Subject") + ":
" + _("Subject") + ":
" + "
" + _("Add Attachment") + ":
  " + attachment.getFileName() + "
 " + quoteHTML(attachment.getFileName()) + "
 " + @@ -2066,9 +2068,9 @@ public class WebMail extends HttpServlet //if (!fixed) { if (true) { out.println( - "
" + _("Host") + "
" + _("POP3 Port") + "
" + _("SMTP Port") + "
" + _("Host") + "
" + _("POP3 Port") + "
" + _("SMTP Port") + "
 
" + (mail.isNew() ? "\"\"" : " ") + "" + + // mail.shortSender and mail.shortSubject already html encoded link + mail.shortSender + "" + (mail.hasAttachment() ? "\"\"" : " ") + "" + link + mail.shortSubject + "" + @@ -2312,9 +2315,9 @@ public class WebMail extends HttpServlet Properties config = Config.getProperties(); out.print(":

"); out.println("
"); diff --git a/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java b/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java index 9cbc209bce..f3f7556985 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java +++ b/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java @@ -89,7 +89,7 @@ public class SMTPClient { socket.getOutputStream().flush(); return getResult(); } catch (IOException e) { - error += "IOException occured.
"; + error += "IOException occured.\n"; return 0; } } @@ -193,7 +193,7 @@ public class SMTPClient { buf.setLength(0); } } catch (IOException e) { - error += "IOException occured.
"; + error += "IOException occured.\n"; result = 0; } lastResponse = fullResponse.toString(); @@ -211,7 +211,7 @@ public class SMTPClient { try { socket = new Socket( host, port ); } catch (Exception e) { - error += _("Cannot connect") + ": " + e.getMessage() + "
"; + error += _("Cannot connect") + ": " + e.getMessage() + '\n'; ok = false; } try { @@ -222,7 +222,7 @@ public class SMTPClient { socket.setSoTimeout(120*1000); int result = sendCmd(null); if (result != 220) { - error += _("Server refused connection") + " (" + result + ")
"; + error += _("Server refused connection") + " (" + result + ")\n"; ok = false; } } @@ -234,7 +234,7 @@ public class SMTPClient { if (r.result == 250) { supportsPipelining = r.recv.contains("PIPELINING"); } else { - error += _("Server refused connection") + " (" + r.result + ")
"; + error += _("Server refused connection") + " (" + r.result + ")\n"; ok = false; } } @@ -246,7 +246,7 @@ public class SMTPClient { cmds.add(new SendExpect(base64.encode(user), 334)); cmds.add(new SendExpect(base64.encode(pass), 235)); if (sendCmds(cmds) != 3) { - error += _("Login failed") + "
"; + error += _("Login failed") + '\n'; ok = false; } } @@ -259,7 +259,7 @@ public class SMTPClient { cmds.add(new SendExpect("DATA", 354)); if (sendCmds(cmds) != cmds.size()) { // TODO which recipient? - error += _("Mail rejected") + "
"; + error += _("Mail rejected") + '\n'; ok = false; } } @@ -273,10 +273,10 @@ public class SMTPClient { if (result == 250) mailSent = true; else - error += _("Error sending mail") + " (" + result + ")
"; + error += _("Error sending mail") + " (" + result + ")\n"; } } catch (IOException e) { - error += _("Error sending mail") + ": " + e.getMessage() + "
"; + error += _("Error sending mail") + ": " + e.getMessage() + '\n'; } catch (EncodingException e) { error += e.getMessage(); @@ -284,7 +284,7 @@ public class SMTPClient { if( !mailSent && lastResponse.length() > 0 ) { String[] lines = lastResponse.split( "\r" ); for( int i = 0; i < lines.length; i++ ) - error += lines[i] + "
"; + error += lines[i] + '\n'; } sendCmd("QUIT", false); if( socket != null ) { diff --git a/build.properties b/build.properties index d31351d0b8..8ee39009bf 100644 --- a/build.properties +++ b/build.properties @@ -46,6 +46,27 @@ javac.version=1.6 # This one keeps gcj a lot quieter #javac.compilerargs=-warn:-unchecked,raw,unused,serial +# +# Note to packagers, embedders, distributors: +# +# Strictly speaking, you must either use the compiler for the minimum Java version you are +# targeting (default 1.6, see above), or specify a bootclasspath, which means you need +# the JRE for the target version installed as well. +# +# However, in practice, you can compile with 1.7 and target 1.6 without specifying a bootclasspath, +# and it all works fine. +# +# But you cannot compile with 1.8 and target 1.6 or 1.7 without bootclasspath, +# or your users will get runtime errors. +# Below is an example of a bootclasspath that works on Ubuntu. +# +# For more info: +# http://zzz.i2p/topics/1668 +# https://gist.github.com/AlainODea/1375759b8720a3f9f094 +# +#javac.compilerargs=-bootclasspath /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/jce.jar + + ### UnitTests ## # Location of the libraries required for the ScalaTest tests. # Define this in override.properties or pass in on the command line. diff --git a/build.xml b/build.xml index 670efa628b..14aad90728 100644 --- a/build.xml +++ b/build.xml @@ -520,7 +520,7 @@ - + @@ -558,7 +558,7 @@ - + diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index eed4c6bfef..a2866c6d19 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -16,7 +16,7 @@ package net.i2p; public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.13"; + public final static String VERSION = "0.9.14.1"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/core/java/src/net/i2p/client/DomainSocketFactory.java b/core/java/src/net/i2p/client/DomainSocketFactory.java new file mode 100644 index 0000000000..cf8908499f --- /dev/null +++ b/core/java/src/net/i2p/client/DomainSocketFactory.java @@ -0,0 +1,45 @@ +package net.i2p.client; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; + +import net.i2p.I2PAppContext; + +/** + * Bridge to Unix domain socket (or similar). + *

+ * This is a stub that does nothing. + * This class is replaced in the Android build. + * + * @author str4d + * @since 0.9.14 + */ +public class DomainSocketFactory { + public static String I2CP_SOCKET_ADDRESS = "net.i2p.client.i2cp"; + + /** + * @throws UnsupportedOperationException always + */ + public DomainSocketFactory(I2PAppContext context) { + throw new UnsupportedOperationException(); + } + + /** + * Override in Android. + * @throws IOException + * @throws UnsupportedOperationException always + */ + public Socket createSocket(String name) throws IOException { + throw new UnsupportedOperationException(); + } + + /** + * Override in Android. + * @throws IOException + * @throws UnsupportedOperationException always + */ + public ServerSocket createServerSocket(String name) throws IOException { + throw new UnsupportedOperationException(); + } +} diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 20aa43550b..d146726474 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -52,6 +52,7 @@ import net.i2p.util.LHMCache; import net.i2p.util.Log; import net.i2p.util.OrderedProperties; import net.i2p.util.SimpleTimer2; +import net.i2p.util.SystemVersion; import net.i2p.util.VersionComparator; /** @@ -157,6 +158,12 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa protected static final String PROP_USER = "i2cp.username"; protected static final String PROP_PW = "i2cp.password"; + /** + * Use Unix domain socket (or similar) to connect to a router + * @since 0.9.14 + */ + protected static final String PROP_DOMAIN_SOCKET = "i2cp.domainSocket"; + private static final long VERIFY_USAGE_TIME = 60*1000; private static final long MAX_SEND_WAIT = 10*1000; @@ -279,6 +286,10 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa if (_context.isRouterContext()) // just for logging return "[internal connection]"; + else if (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET))) + // just for logging + return "[Domain socket connection]"; return _options.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1"); } @@ -287,7 +298,9 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa * @since 0.9.7 was in loadConfig() */ private int getPort() { - if (_context.isRouterContext()) + if (_context.isRouterContext() || + (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET)))) // just for logging return 0; String portNum = _options.getProperty(I2PClient.PROP_TCP_PORT, LISTEN_PORT + ""); @@ -447,7 +460,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa try { // protect w/ closeSocket() synchronized(_stateLock) { - // If we are in the router JVM, connect using the interal queue + // If we are in the router JVM, connect using the internal queue if (_context.isRouterContext()) { // _socket and _writer remain null InternalClientManager mgr = _context.internalClientManager(); @@ -457,7 +470,11 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa _queue = mgr.connect(); _reader = new QueuedI2CPMessageReader(_queue, this); } else { - if (Boolean.parseBoolean(_options.getProperty(PROP_ENABLE_SSL))) { + if (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET))) { + final DomainSocketFactory fact = new DomainSocketFactory(_context); + _socket = fact.createSocket(DomainSocketFactory.I2CP_SOCKET_ADDRESS); + } else if (Boolean.parseBoolean(_options.getProperty(PROP_ENABLE_SSL))) { try { I2PSSLSocketFactory fact = new I2PSSLSocketFactory(_context, false, "certificates/i2cp"); _socket = fact.createSocket(_hostname, _portNum); diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java index d22bafd2e5..246af5403a 100644 --- a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java +++ b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java @@ -19,6 +19,7 @@ import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.Signature; +import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** @@ -34,16 +35,11 @@ public final class I2PDatagramDissector { private final DSAEngine dsaEng = DSAEngine.getInstance(); private final SHA256Generator hashGen = SHA256Generator.getInstance(); - private Hash rxHash; - + private byte[] rxHash; private Signature rxSign; - private Destination rxDest; - private final byte[] rxPayload = new byte[DGRAM_BUFSIZE]; - private int rxPayloadLen; - private boolean valid; /** @@ -56,6 +52,17 @@ public final class I2PDatagramDissector { * Load an I2P repliable datagram into the dissector. * Does NOT verify the signature. * + * Format is: + *

    + *
  1. Destination (387+ bytes) + *
  2. Signature (40+ bytes, type and length as implied by signing key type in the Destination) + *
  3. Payload + *
+ * + * For DSA_SHA1 Destinations, the signature is of the SHA-256 Hash of the payload. + * + * As of 0.9.14, for non-DSA_SHA1 Destinations, the signature is of the payload itself. + * * @param dgram non-null I2P repliable datagram to be loaded * * @throws DataFormatException If there's an error in the datagram format @@ -79,14 +86,21 @@ public final class I2PDatagramDissector { rxPayloadLen = dgStream.read(rxPayload); // calculate the hash of the payload - this.rxHash = hashGen.calculateHash(rxPayload, 0, rxPayloadLen); - assert this.hashGen.calculateHash(this.extractPayload()).equals(this.rxHash); + if (type == SigType.DSA_SHA1) { + if (rxHash == null) + rxHash = new byte[Hash.HASH_LENGTH]; + // non-caching + hashGen.calculateHash(rxPayload, 0, rxPayloadLen, rxHash, 0); + //assert this.hashGen.calculateHash(this.extractPayload()).equals(this.rxHash); + } else { + rxHash = null; + } } catch (IOException e) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); log.error("Caught IOException - INCONSISTENT STATE!", e); - } catch(AssertionError e) { - Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); - log.error("Assertion failed!", e); + //} catch(AssertionError e) { + // Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); + // log.error("Assertion failed!", e); } //_log.debug("Datagram payload size: " + rxPayloadLen + "; content:\n" @@ -125,14 +139,16 @@ public final class I2PDatagramDissector { * Extract the hash of the payload of an I2P repliable datagram (previously * loaded with the loadI2PDatagram() method), verifying the datagram * signature. + * + * As of 0.9.14, for signature types other than DSA_SHA1, this returns null. + * * @return The hash of the payload of the I2P repliable datagram * @throws I2PInvalidDatagramException if the signature verification fails */ public Hash getHash() throws I2PInvalidDatagramException { // make sure it has a valid signature this.verifySignature(); - - return this.extractHash(); + return extractHash(); } /** @@ -178,10 +194,18 @@ public final class I2PDatagramDissector { * Extract the hash of the payload of an I2P repliable datagram (previously * loaded with the loadI2PDatagram() method), without verifying the datagram * signature. + * + * As of 0.9.14, for signature types other than DSA_SHA1, this returns null. + * * @return The hash of the payload of the I2P repliable datagram */ public Hash extractHash() { - return this.rxHash; + if (rxHash == null) + return null; + // make a copy as we will reuse rxHash + byte[] hash = new byte[Hash.HASH_LENGTH]; + System.arraycopy(rxHash, 0, hash, 0, Hash.HASH_LENGTH); + return new Hash(hash); } /** @@ -194,12 +218,21 @@ public final class I2PDatagramDissector { if(this.valid) return; - if (rxSign == null || rxSign.getData() == null || rxDest == null || rxDest.getSigningPublicKey() == null) + if (rxSign == null || rxSign.getData() == null || rxDest == null) throw new I2PInvalidDatagramException("Datagram not yet read"); - + // now validate - if (!this.dsaEng.verifySignature(rxSign, rxHash.getData(), rxDest.getSigningPublicKey())) - throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + SigningPublicKey spk = rxDest.getSigningPublicKey(); + SigType type = spk.getType(); + if (type == null) + throw new I2PInvalidDatagramException("unsupported sig type"); + if (type == SigType.DSA_SHA1) { + if (!this.dsaEng.verifySignature(rxSign, rxHash, spk)) + throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + } else { + if (!this.dsaEng.verifySignature(rxSign, rxPayload, 0, rxPayloadLen, spk)) + throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + } // set validated this.valid = true; diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java b/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java index 28336e4126..015bbdbcd8 100644 --- a/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java +++ b/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java @@ -16,8 +16,12 @@ import net.i2p.client.I2PSession; import net.i2p.crypto.DSAEngine; import net.i2p.crypto.SHA256Generator; import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; +import net.i2p.crypto.SigType; import net.i2p.util.Log; +import net.i2p.util.SimpleByteCache; /** * Class for creating I2P repliable datagrams. Note that objects of this class @@ -44,9 +48,9 @@ public final class I2PDatagramMaker { * @param session I2PSession used to send I2PDatagrams through */ public I2PDatagramMaker(I2PSession session) { - this(); this.setI2PDatagramMaker(session); } + /** * Construct a new I2PDatagramMaker that is null. * Use setI2PDatagramMaker to set the parameters. @@ -59,22 +63,53 @@ public final class I2PDatagramMaker { sxPrivKey = session.getPrivateKey(); sxDestBytes = session.getMyDestination().toByteArray(); } + /** * Make a repliable I2P datagram containing the specified payload. * + * Format is: + *
    + *
  1. Destination (387+ bytes) + *
  2. Signature (40+ bytes, type and length as implied by signing key type in the Destination) + *
  3. Payload + *
+ * + * Maximum datagram size is 32768, so maximum payload size is 32341, or less for + * non-DSA_SHA1 destinations. Practical maximum is a few KB less due to + * ElGamal/AES overhead. 10 KB or less is recommended for best results. + * + * For DSA_SHA1 Destinations, the signature is of the SHA-256 Hash of the payload. + * + * As of 0.9.14, for non-DSA_SHA1 Destinations, the signature is of the payload itself. + * * @param payload non-null Bytes to be contained in the I2P datagram. + * @return null on error + * @throws IllegalArgumentException if payload is too big + * @throws IllegalStateException if Destination signature type unsupported */ public byte[] makeI2PDatagram(byte[] payload) { sxDGram.reset(); try { sxDGram.write(sxDestBytes); + SigType type = sxPrivKey.getType(); + if (type == null) + throw new IllegalStateException("Unsupported sig type"); - dsaEng.sign(hashGen.calculateHash(payload).toByteArray(), - sxPrivKey).writeBytes(sxDGram); - + Signature sig; + if (type == SigType.DSA_SHA1) { + byte[] hash = SimpleByteCache.acquire(Hash.HASH_LENGTH); + // non-caching + hashGen.calculateHash(payload, 0, payload.length, hash, 0); + sig = dsaEng.sign(hash, sxPrivKey); + SimpleByteCache.release(hash); + } else { + sig = dsaEng.sign(payload, sxPrivKey); + } + sig.writeBytes(sxDGram); sxDGram.write(payload); - + if (sxDGram.size() > DGRAM_BUFSIZE) + throw new IllegalArgumentException("Too big"); return sxDGram.toByteArray(); } catch (IOException e) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramMaker.class); diff --git a/core/java/src/net/i2p/client/datagram/package.html b/core/java/src/net/i2p/client/datagram/package.html index da3a871400..085df6568c 100644 --- a/core/java/src/net/i2p/client/datagram/package.html +++ b/core/java/src/net/i2p/client/datagram/package.html @@ -10,6 +10,9 @@ in turn, use the {@link net.i2p.client.datagram.I2PDatagramMaker} to build a message that can be parsed.

The datagram format implemented here includes -the sender's {@link net.i2p.data.Destination}, the payload, and a hash of the -payload (signed by the sender's {@link net.i2p.data.SigningPrivateKey}).

+the sender's {@link net.i2p.data.Destination}, the payload, and a signature +(signed by the sender's {@link net.i2p.data.SigningPrivateKey}). +For DSA_SHA1 destinations, the signature is of the SHA-256 Hash of the payload. +For other destination types, the signature is of the payload itself. +

diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java deleted file mode 100644 index 4843ba68d0..0000000000 --- a/core/java/src/net/i2p/client/naming/ExecNamingService.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * By zzz 2008, released into the public domain - * with no warranty of any kind, either expressed or implied. - */ -package net.i2p.client.naming; - -import java.io.InputStream; -import java.util.Locale; -import java.util.Properties; - -import net.i2p.I2PAppContext; -import net.i2p.data.Destination; - -/** - * An interface to an external naming service program, with in-memory caching. - * This can be used as a simple and flexible way to experiment with - * alternative naming systems. - * - * The external command takes a hostname argument and must return (only) the - * 516-byte Base64 destination, or hostname=dest, on stdout. - * A trailing \n or \r\n is acceptable. - * The command must exit 0 on success. Nonzero on failure is optional. - * - * The external command can do local and/or remote (via i2p or not) lookups. - * No timeouts are implemented here - the author of the external program - * must ensure that the program returns in a reasonable amount of time - - * (15 sec max suggested) - * - * Can be used from MetaNamingService, (e.g. after HostsTxtNamingService), - * or as the sole naming service. - * Supports caching, b32, and b64. - * - * Sample chained config to put in configadvanced.jsp (restart required): - * - * i2p.naming.impl=net.i2p.client.naming.MetaNamingService - * i2p.nameservicelist=net.i2p.client.naming.HostsTxtNamingService,net.i2p.client.naming.ExecNamingService - * i2p.naming.exec.command=/usr/local/bin/i2presolve - * - * Sample unchained config to put in configadvanced.jsp (restart required): - * - * i2p.naming.impl=net.i2p.client.naming.ExecNamingService - * i2p.naming.exec.command=/usr/local/bin/i2presolve - * - */ -public class ExecNamingService extends DummyNamingService { - - private final static String PROP_EXEC_CMD = "i2p.naming.exec.command"; - private final static String DEFAULT_EXEC_CMD = "/usr/local/bin/i2presolve"; - private final static String PROP_SHELL_CMD = "i2p.naming.exec.shell"; - private final static String DEFAULT_SHELL_CMD = "/bin/bash"; - - /** - * The naming service should only be constructed and accessed through the - * application context. This constructor should only be used by the - * appropriate application context itself. - * - */ - public ExecNamingService(I2PAppContext context) { - super(context); - } - - @Override - public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) { - Destination d = super.lookup(hostname, null, null); - if (d != null) - return d; - // Base32 failed? - if (hostname.length() == BASE32_HASH_LENGTH + 8 && hostname.toLowerCase(Locale.US).endsWith(".b32.i2p")) - return null; - - hostname = hostname.toLowerCase(Locale.US); - - // lookup - String key = fetchAddr(hostname); - if (key != null) { - _log.error("Success: " + hostname); - d = lookupBase64(key); - putCache(hostname, d); - return d; - } - return null; - } - - // FIXME allow larger Dests for non-null Certs - private static final int MAX_RESPONSE = DEST_SIZE + 68 + 10; // allow for hostname= and some trailing stuff - private String fetchAddr(String hostname) { - String[] commandArr = new String[3]; - commandArr[0] = _context.getProperty(PROP_SHELL_CMD, DEFAULT_SHELL_CMD); - commandArr[1] = "-c"; - String command = _context.getProperty(PROP_EXEC_CMD, DEFAULT_EXEC_CMD) + " " + hostname; - commandArr[2] = command; - - try { - Process get = Runtime.getRuntime().exec(commandArr); - get.waitFor(); - int exitValue = get.exitValue(); - if (exitValue != 0) { - _log.error("Exit " + exitValue + " from " + commandArr[0] + " " + commandArr[1] + " \"" + command + "\""); - return null; - } - InputStream is = get.getInputStream(); - byte[] input = new byte[MAX_RESPONSE]; - int count = is.read(input); - is.close(); - if (count < DEST_SIZE) { - _log.error("Short response: " + command); - return null; - } - String key = new String(input); - if (key.startsWith(hostname + "=")) // strip hostname= - key = key.substring(hostname.length() + 1); - key = key.substring(0, DEST_SIZE); // catch IndexOutOfBounds exception below - if (!key.endsWith("AA")) { - _log.error("Invalid key: " + command); - return null; - } - if (key.replaceAll("[a-zA-Z0-9~-]", "").length() != 0) { - _log.error("Invalid chars: " + command); - return null; - } - return key; - } catch (Throwable t) { - _log.error("Error fetching the addr", t); - } - return null; - } -} diff --git a/core/java/src/net/i2p/crypto/CertUtil.java b/core/java/src/net/i2p/crypto/CertUtil.java index 359ce7aacf..aa484a5226 100644 --- a/core/java/src/net/i2p/crypto/CertUtil.java +++ b/core/java/src/net/i2p/crypto/CertUtil.java @@ -18,6 +18,7 @@ import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.util.Log; import net.i2p.util.SecureFileOutputStream; +import net.i2p.util.SystemVersion; /** * Java X.509 certificate utilities, consolidated from various places. @@ -65,11 +66,18 @@ public class CertUtil { } /** - * Get a value out of the subject distinguished name + * Get a value out of the subject distinguished name. + * + * Warning - unsupported in Android (no javax.naming), returns null. + * * @param type e.g. "CN" * @return value or null if not found */ public static String getSubjectValue(X509Certificate cert, String type) { + if (SystemVersion.isAndroid()) { + error("Don't call this in Android", new UnsupportedOperationException("I did it")); + return null; + } type = type.toUpperCase(Locale.US); X500Principal p = cert.getSubjectX500Principal(); String subj = p.getName(); diff --git a/core/java/src/net/i2p/crypto/DirKeyRing.java b/core/java/src/net/i2p/crypto/DirKeyRing.java index 6085694ead..38ba45bf8e 100644 --- a/core/java/src/net/i2p/crypto/DirKeyRing.java +++ b/core/java/src/net/i2p/crypto/DirKeyRing.java @@ -14,9 +14,11 @@ import java.security.PublicKey; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import net.i2p.util.SystemVersion; + /** - * Dumb storage in a directory for testing. - * No sanitization of filenames, unsafe. + * Simple storage of each cert in a separate file in a directory. + * Limited sanitization of filenames. * * @since 0.9.9 */ @@ -30,7 +32,9 @@ class DirKeyRing implements KeyRing { /** * Cert must be in the file (escaped keyName).crt, - * and have a CN == keyName + * and have a CN == keyName. + * + * CN check unsupported on Android. */ public PublicKey getKey(String keyName, String scope, SigType type) throws GeneralSecurityException, IOException { @@ -49,14 +53,21 @@ class DirKeyRing implements KeyRing { CertificateFactory cf = CertificateFactory.getInstance("X.509"); X509Certificate cert = (X509Certificate)cf.generateCertificate(fis); cert.checkValidity(); - String cn = CertUtil.getSubjectValue(cert, "CN"); - if (!keyName.equals(cn)) - throw new GeneralSecurityException("CN mismatch: " + cn); + if (!SystemVersion.isAndroid()) { + // getSubjectValue() unsupported on Android. + // Any cert problems will be caught in non-Android testing. + String cn = CertUtil.getSubjectValue(cert, "CN"); + if (!keyName.equals(cn)) + throw new GeneralSecurityException("CN mismatch: " + cn); + } return cert.getPublicKey(); } finally { try { if (fis != null) fis.close(); } catch (IOException foo) {} } } + /** + * Unimplemented, unused. + */ public void setKey(String keyName, String scope, PublicKey key) {} } diff --git a/core/java/src/net/i2p/crypto/SessionKeyManager.java b/core/java/src/net/i2p/crypto/SessionKeyManager.java index cb67c9f3fa..c8da3537ad 100644 --- a/core/java/src/net/i2p/crypto/SessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/SessionKeyManager.java @@ -29,7 +29,7 @@ public class SessionKeyManager { /** * A dummy SessionKeyManager for testing or for passing to - * ElGamalAESEngine.encrypt() + * ElGamalAESEngine.decrypt() * * @since 0.9.14 */ @@ -37,7 +37,7 @@ public class SessionKeyManager { /** * A dummy SessionKeyManager for testing or for passing to - * ElGamalAESEngine.encrypt() + * ElGamalAESEngine.decrypt() * * @param context unused * @since public since 0.9.14; protected before that diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java index e248818360..791372dfa6 100644 --- a/core/java/src/net/i2p/crypto/TrustedUpdate.java +++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java @@ -212,9 +212,9 @@ riCe6OlAEiNpcc6mMyIYYWFICbrDFTrDR3wXqwc/Jkcx6L5VVWoagpSzbo3yGhc= } /** - * @since 0.9.8 + * @since 0.9.8, public since 0.9.14.1 */ - Map getKeys() { + public Map getKeys() { return Collections.unmodifiableMap(_trustedKeys); } diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index efc66a2c64..a962230b97 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -478,12 +478,14 @@ public class DataHelper { String val = (String) entry.getValue(); if (name.contains("#") || name.contains("=") || + name.contains("\r") || name.contains("\n") || name.startsWith(";") || val.contains("#") || + val.contains("\r") || val.contains("\n")) { if (iae == null) - iae = new IllegalArgumentException("Invalid character (one of \"#;=\\n\") in key or value: \"" + + iae = new IllegalArgumentException("Invalid character (one of \"#;=\\r\\n\") in key or value: \"" + name + "\" = \"" + val + '\"'); continue; } @@ -1622,11 +1624,13 @@ public class DataHelper { if (orig == null) return ""; String t1 = orig.replace('<', ' '); String rv = t1.replace('>', ' '); + rv = rv.replace('\"', ' '); + rv = rv.replace('\'', ' '); return rv; } - private static final String escapeChars[] = {"&", "\"", "<", ">"}; - private static final String escapeCodes[] = {"&", """, "<", ">"}; + private static final String escapeChars[] = {"&", "\"", "<", ">", "\"", "'"}; + private static final String escapeCodes[] = {"&", """, "<", ">", """, "'"}; /** * Escape a string for inclusion in HTML diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java index 825b632fe1..3f1cfbc661 100644 --- a/core/java/src/net/i2p/data/Payload.java +++ b/core/java/src/net/i2p/data/Payload.java @@ -29,6 +29,9 @@ public class Payload extends DataStructureImpl { private byte[] _encryptedData; private byte[] _unencryptedData; + /** So we don't OOM on I2CP protocol errors. Actual max is smaller. */ + private static final int MAX_LENGTH = 64*1024; + public Payload() { } @@ -51,8 +54,11 @@ public class Payload extends DataStructureImpl { * * Deprecated. * Unless you are doing encryption, use setEncryptedData() instead. + * @throws IllegalArgumentException if bigger than 64KB */ public void setUnencryptedData(byte[] data) { + if (data.length > MAX_LENGTH) + throw new IllegalArgumentException(); _unencryptedData = data; } @@ -61,8 +67,13 @@ public class Payload extends DataStructureImpl { return _encryptedData; } - /** the real data */ + /** + * the real data + * @throws IllegalArgumentException if bigger than 64KB + */ public void setEncryptedData(byte[] data) { + if (data.length > MAX_LENGTH) + throw new IllegalArgumentException(); _encryptedData = data; } @@ -77,7 +88,7 @@ public class Payload extends DataStructureImpl { public void readBytes(InputStream in) throws DataFormatException, IOException { int size = (int) DataHelper.readLong(in, 4); - if (size < 0) throw new DataFormatException("payload size out of range (" + size + ")"); + if (size < 0 || size > MAX_LENGTH) throw new DataFormatException("payload size out of range (" + size + ")"); _encryptedData = new byte[size]; int read = read(in, _encryptedData); if (read != size) throw new DataFormatException("Incorrect number of bytes read in the payload structure"); diff --git a/debian/changelog b/debian/changelog index 989ab9b7db..8915e1f1e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,48 @@ -i2p (0.9.13-1) UNRELEASED; urgency=medium +i2p (0.9.14-1) unstable; urgency=high - * New upstream release - * debconf: Slovak translation + * New upstream release, 0.9.14 + * Fix several XSS issues + - Disable changing news feed URL from UI + - Disable plugin install + - Disable setting unsigned update URL from UI + - Disable clients.config editing from the UI + - Add Content-Security-Policy and X-XSS-Protection headers + - Disable unused ExecNamingService (thx joernchen of Phenoelit) + * Bug fixes + - Fix tunnel building so it doesn't get "stuck" on a single pool + - Reject participating tunnels when hidden + - Several i2psnark improvements and fixes (GUI and DHT), including changes + for better compatibility with Vuze + * Other + - Reseeding now fetches a signed zip file containing router infos for security and speed + - Use JVM's AES implementation if it is faster + - More advanced options shown in the i2ptunnel edit pages + - Per-message reliabilitiy settings in I2CP and error propagation back from router to client + - Lots of findbugs fixes and cleanups + - Support signature types in SAM, bump rev to 3.1 + - New event log page in console + - Jetty 8.1.15.v20140411 + - Tomcat 6.0.41 - -- Kill Your TV Thu, 15 May 2014 23:11:36 +0000 + -- Kill Your TV Sat, 26 Jul 2014 23:23:36 +0000 + +i2p (0.9.13-1) unstable; urgency=medium + + * New Upstream release + * debconf: New Slovak translation + + -- Kill Your TV Thu, 22 May 2014 19:08:45 +0000 + +i2p (0.9.12-2) unstable; urgency=low + + * Re-enable i2p-docs package + * Have libjbigi package depend on i2p-router + * Remove ${misc:Depends} from the i2p dependencies to avoid hard-depending + on i2p-router (= ${source:Version}. This prevents users from trying dev + builds using "dpkg -i i2p-router-${devbuild}_all.deb. The i2p package + already depended on i2p-router. + + -- Kill Your TV Sun, 06 Apr 2014 16:27:31 +0000 i2p (0.9.12-1) unstable; urgency=medium @@ -11,12 +50,10 @@ i2p (0.9.12-1) unstable; urgency=medium -- Kill Your TV Mon, 31 Mar 2014 19:07:54 +0000 -i2p (0.9.11-2) UNRELEASED; urgency=medium +i2p (0.9.11-3) unstable; urgency=medium - * systemd support in Ubuntu Saucy (and newer) and Debian unstable (ticket - #1208) - * Set homepage address to geti2p.net - * Bump standards version (no source changes needed) + * Enable systemd for unstable and saucy|trusty + * Fix postinst -- Kill Your TV Tue, 11 Mar 2014 00:45:52 +0000 diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index c298ac5c57..86eca0ab43 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -89,7 +89,7 @@ Debian wrapper.config to try to prevent confusion. - fi -fi - --WRAPPER_URL="http://www.i2p2.de/manualwrapper" +-WRAPPER_URL="https://geti2p.net/en/misc/manual-wrapper" -unsupported() { - echo "The most likely reason is that a supported version of the java" - echo "wrapper is not available in the I2P installation package for your" @@ -367,16 +367,16 @@ Debian wrapper.config to try to prevent confusion. @@ -185,7 +185,7 @@ msgstr "" - #: ../i2prouter:1807 + #: ../i2prouter:1820 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" msgstr "" - #: ../i2prouter:1812 + #: ../i2prouter:1825 @@ -193,5 +193,5 @@ msgstr "" - #: ../i2prouter:1815 + #: ../i2prouter:1828 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" diff --git a/debian/po/uk.po b/debian/po/uk.po index 1942eab16c..7c445763ba 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -1,31 +1,32 @@ -# Ukrainian debconf translation -# Copyright (C) 2012 The I2P Project -# This file is distributed under the same license as the i2p package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # # Translators: -# Denis , 2011. -# Денис Лысенко , 2012. +# Denis Blank , 2011 +# LinuxChata, 2014 +# Denis Blank , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2011-12-27 22:25+0000\n" -"PO-Revision-Date: 2012-01-10 18:09+0000\n" -"Last-Translator: Denis Lysenko \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/" -"team/uk_UA/)\n" +"PO-Revision-Date: 2014-06-22 10:19+0000\n" +"Last-Translator: LinuxChata\n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/" +"language/uk_UA/)\n" "Language: uk_UA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description #: ../i2p.templates:2001 msgid "Should the I2P router be started at boot?" -msgstr "Чи повинен I2P роутер запускатись при запуску компютера?" +msgstr "Чи повинен I2P роутер запускатись при запуску комп'ютера?" #. Type: boolean #. Description @@ -53,7 +54,7 @@ msgid "" "home/user/i2p, you may enter 'user' here." msgstr "" "При роботі в якості демона, I2P за замовчуванням використовує аккаунт i2psvc " -"для роботи. Для використовування **існуючого** профіля I2P ви можете ввести " +"для роботи. Для використовування **існуючого** профілю I2P ви можете ввести " "тут ім'я іншого користувача. Для прикладу, якщо ваша попередня інсталяція " "I2p знаходиться в /home/user/i2p, ви можете ввести тут 'user'." @@ -64,7 +65,7 @@ msgid "" "Very important: If a user other than the default of 'i2psvc' is entered " "here, the chosen username *MUST* already exist." msgstr "" -"Дуже важливо: Якщо користувач відмінний від стандартний 'i2psvc' введений " +"Дуже важливо: якщо користувач відмінний від стандартний 'i2psvc' введений " "тут, обраний нікнейм *ПОВИНЕН* вже існувати." #. Type: string @@ -78,7 +79,7 @@ msgstr "Пам'ять яка може бути виділена для I2P:" #: ../i2p.templates:4001 msgid "By default, I2P will only be allowed to use up to 128MB of RAM." msgstr "" -"За замовчуванням, I2P буде використовувати до 128 МБ Оперативної Пам'яті." +"За замовчуванням, I2P буде використовувати до 128 МБ оперативної пам'яті." #. Type: string #. Description diff --git a/history.txt b/history.txt index 5fcdc58977..de3a674a29 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,57 @@ +* 2014-08-09 0.9.14.1 released + +2014-08-07 kytv + * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country + database from 2014-08-06. + +2014-08-03 zzz + * Console: + - Fix update buttons + - Don't filter parameter names starting with "nofilter_" + - Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true + - Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true + - Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true + - Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true + - More escaping + * i2psnark: Fix add torrent form + +2014-07-31 zzz + * ExecNamingService: Remove + * Plugins: Add whitelist of keys + +* 2014-07-26 0.9.14 released + +2014-07-26 zzz + * Console: + - Fix several XSS issues (thx Exodus Intelligence) + - Add Content-Security-Policy and X-XSS-Protection headers + - Disable changing news feed URL from UI + - Disable plugin install from UI + - Disable setting unsigned update URL from UI + - Disable /configadvanced + * DataHelper: Disallow \r in storeProps() (thx joernchen of Phenoelit) + * ExecNamingService: Disable (thx joernchen of Phenoelit) + * Startup: Add susimail.config to migrated files + +2014-07-23 kytv + * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country + database from 2014-07-02. + +2014-07-19 zzz + * i2psnark: Don't prefer leeches during end game, to + prevent slowdowns or stalls + * SAM: Add support for RAW on the bridge socket in v3 (ticket #1334) + * Streaming; Disable fail-fast for now. + * SusiMail: Better error message on decode fail + +2014-07-15 str4d + * I2CP: Stubs for I2CP connections over Unix domain sockets + +2014-07-11 zzz + * Datagrams: + - Redefine the repliable datagram signature for non-DSA_SHA1 sig types; + was the sig of the SHA-256 of the payload, now the sig of the payload itself. + 2014-07-03 zzz * Base64: - Catch numerous decoding errors that were previously misdecoded (ticket #1318) diff --git a/installer/install.xml b/installer/install.xml index 8a85a8d5f4..1077aa4996 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.13 + 0.9.14.1 diff --git a/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt b/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt index 52ac1c3808..ad10e3accd 100644 --- a/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt +++ b/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFfzCCA2egAwIBAgIEcpgq/jANBgkqhkiG9w0BAQ0FADBwMQswCQYDVQQGEwJY +MIIFfzCCA2egAwIBAgIESg3kkzANBgkqhkiG9w0BAQ0FADBwMQswCQYDVQQGEwJY WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEZMBcGA1UEAwwQZWNoZWxvbkBtYWls -LmkycDAeFw0xNDA2MjcxNTQwMTJaFw0yNDA2MjYxNTQwMTJaMHAxCzAJBgNVBAYT +LmkycDAeFw0xNDA3MzExNjQ3MDJaFw0yNDA3MzAxNjQ3MDJaMHAxCzAJBgNVBAYT AlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9u eW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRkwFwYDVQQDDBBlY2hlbG9uQG1h -aWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgcD+2Ma/q1zo -Ae9Iurlxj6YwyUTtd6P1ctAOvw9bpgSLW0wMRnRhaCj3d0BWUOY5/42KDvX2JXiO -kz/VuYy29bMHK1pdJZuY1FGFrKudFYJ6qOr+xkiEk5YT8D/RLxWQ1oibFL18nJwd -pSlOT6XhP0uZAdrZy/CaRmIKKZwAcsdUXt+hNVVoyCJHM2x4d5eqahEgjI/39IY/ -5a3kBZDiZI55jDJKsUr4jyq392W6TY03mTeacJzIyMIW6/ut0JkphrZaRY5dtB3i -1RMUWhjuCyg+zHrETSlwIgGhuzxVJLXlSpmCk3UiCsu79lUulZ2ReuifdACJ/e3A -oet2fyjOp+siPaGzdTJ4MjAoMl0uzd1+D4tiq8ajneoEPYxhaeYjeRwPEUcihHjP -cgOKZiV/zUQPoYD3YQ4rwM07sfKLoHO+jxN21t3qXFHce6NwMuiid6mGzl5gVHvq -mt8nI3gJCIfbhUPWyUvdMtMbSHvWnKSwtLthOGLuXrwYMiV/6x5l68+y8waagjkH -fI1H/tKmUT7wcHCldxsQaXbmoEGbboEsjpcm+7+wbk5sTxkqrGxWFrMtlvnBH0fj -dQX/UeG1IPpDi2QqWmPdrIOdKng1a+CMMyDJZX0LcEBmVZzNhRKvZmqAe1vhf+LF -s8adUCnpPm1p3quLrIvoKb2YS4VIl50CAwEAAaMhMB8wHQYDVR0OBBYEFFeW8HLy -KaFZ71umI2XnnddzJO8rMA0GCSqGSIb3DQEBDQUAA4ICAQAKXytX51clQl1jYwGE -in+nUo/XdTIKXlT322SHS36Keg2SlFTnlREIFkuI5J1TM+lILxwgCm+JrN/lknd4 -ZMzJ4RGOMqBhqQG1x/Dgde52pamQqFMeLkh3GiwWYcHfekUt66PqxtQizuG4UNFc -Le98hpLNQoF2p/zW/5f4CtSs/HsO1lGlO9LB0zQtjbegmIZnwj4WOL+qpRbsDeZi -jf1gW0qyLeiQNyXW/e+sujNYe4PIioGombeKrzPoABKD0x2gsI5SVr7e8X3HgtkK -kDUXsQqevRFrifHvF1TjVC1J3YqnuTwYKXqA2d72icLp1U2OY2RFYgJPLZgbj2MK -32EZ1YW4rEf5gfPosN5NBIIsmsxfkji8vC7pe8UeJzxTjM/EuVTTiGjPZbpz/PHY -YliGKKFOe1tStq2zo7FxGRAlH9OGuKtBSw/WyN+NyTTsndOO6RXz4jIf0PBvtyjS -FoyV3W6x7R5WjjlyQOVLEgAfJkEjoACuI6rz48/FKjnyxSRlRo7+9/LfgwiU8ye3 -IuEmA0W2lSSY8lSeJA7p9utKT6zuQwCkgL69u0QSK4GD0G6dteVTlpd99c5xwgVu -cEGSP30XpQMrSknKwv2KHv7nBqRJSPO7JYMl4TjbKr8BM1q5AK8pfYPFgMjFTCwT -/hCfobYS9FLpJCFkIMcnYrhM8g== +aWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmcEgLwwhzLNe +XLOMSrhwB8hWpOhfjo4s6S/wjBtjjUc8nI3D0hSn3HY26p0rvcvNEWexPUpPULmC +exGkU463nu7PiFONiORI1eJAiUFHibRiaA7Wboyo38pO73KirwjG07Y+Ua0jp+HS ++4FQ/I/9H/bPplReTOU/6hmRbgQ69U8nE68HzZHQxP68yVJ2rPHSXMPhF4R1h0G1 +1mCAT+TgTsnwHNGF77XHJnY4/M4e2cgycEZjZow36C3t2mNDVkMgF19QQeb9WmLR +zREn3nq9BJqHpUkn9yWw0kKXTZSds+7UxESfzf3BzK0+hky2fh5H+qbYAo2lz4yj +81MXTAu+4RRkg4DBLlF+2dkclhwQLxxzvkRC6tPkn5i33Yltg7EfzA9IoQ05potJ +I+iOcF+aStfFgFj9u3B5UkcF4P0cH1QD3c6BK4hIezQYqRoPly1gHqg+XdwjG/dr +4as7HA9FTz3p2E8nClpIC1x3hfgwAdfd29aeBxO1WW/z99iMF7TBAF+u5T86XEW1 +WpknqCbTli36yJ8a5fPWxZHrryBRJT5yLxejjFeadtutBSwljiVFq+Y38VqwFivq +VLiBt7IxAsZ8iilgfnnnAvBH6chWfSKb4H7kB4TJvDiV96QmmvoEaWYNHZozMhyK +tO3b5w+xqbJXyCLA3Q75jD0km76hjcECAwEAAaMhMB8wHQYDVR0OBBYEFAHQcAam +QRS/EUhuCSr9pB4Ux0rYMA0GCSqGSIb3DQEBDQUAA4ICAQBq1+1QLmgLAjrTg3tb +4XKgAVICQRoBDNUEobQg3pYeUX9eFNya2RxNljuvYpwT80ilGMPOXcjddmr5ngiK +dbGRcuuJk9MPEHtPaPT3+JJlvKQ3B3g2wva2Wz2OAyLZUGQs389K4nTbwh4QF0n2 +aHFL8BHiD62hiKnCoNaW4ZovUNNvOxo9lMyAiaFU2gqQNcdad8hP9EAllbvbxDx9 +Tjww2UbwQUIHS9rna4Tlu+f0hDXTWIutc2A51W2fJCb7L3+lYO7Wv55ND/WtryLZ +XpMp27+MpuEnN3kQmz/l9R0hIJsWc/x9GQkjm5wEaIZEyTtenqwRKGmVCtAj0Pgv +jn1L3/lWmrNq+OZHb/QeyfKtA3nXfQKVmT98ewQiK/S5i1xIAXCJPytOD887b/o1 +cdurTmCiZMwgiQ+HLJqCg3MDa5mvKqRkRdZXfE6aQWEcSbpAhpV15R17q7L+Fg0W +shLSNucxyGNU8PjiC/nOmqfqUiPiMltJjPmscxBLim8foyxjakC4+6N6m+Jzgznj +PocBehFAfKYj66XEwzIBN7Z2uuXoYH9YptkocFjTzvchcryVulDWZ4FWxreUMhpM +4oyjjhSB4tB9clXlwMqg577q3D6Ms0zLTqsztyPN3zr6jGev3jpVq7Q1GOlciHPv +JNJOWTH/Vas1W6XlwGcOOAARTQ== -----END CERTIFICATE----- diff --git a/installer/resources/certificates/reseed/matt_at_drollette.com.crt b/installer/resources/certificates/reseed/matt_at_drollette.com.crt new file mode 100644 index 0000000000..e490a152a9 --- /dev/null +++ b/installer/resources/certificates/reseed/matt_at_drollette.com.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIEB52rdjANBgkqhkiG9w0BAQ0FADByMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEbMBkGA1UEAwwSbWF0dEBkcm9sbGV0 +dGUuY29tMB4XDTE0MDcyMTEzMjYxM1oXDTI0MDcyMDEzMjYxM1owcjELMAkGA1UE +BhMCWFgxCzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMVSTJQIEFu +b255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGzAZBgNVBAMMEm1hdHRAZHJv +bGxldHRlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5M9wKT +csNLg4EA3fW7LleTQdrm3stPnoUvFmsNZHGgsKt1Nc1qCNis3kr2QEY+4Z398U7r +7xGEQFa7D/9SPHf6n1uVXc9DIcmwBtEB0FPB1XPFp2h00ZXIv24yiLN3GQT1woAM +yEbBWsUgn8K/iMBeA5dU2vPwAbGO/0ibD62frgGdYqU2EeiJ/U6vBmKxvC+q2noL +gnyfQJEJANXgf+Cw/gBaS6yn5ZsYcenLNenID2TQKQ6Q/NxYrDYRdWdId29iwldt +dmNSmASv8C7g9d/isZkpmtYNkE4J4m0W9wKziOoyvLSMo8ec67QmCKaPaYKTHTjx +aUuja02+mnlV4DSdZo6nPkSdokRY0+5e6q7+dIPefu8ealGEAE5oedEfl5iM5Fnz +phTR+ePodBK3sB+bMi1NMppbWugpFpdqs1hg2KNKSSG8C4/eTqf2nnlDiVvvFANc +imt6tk0pZcKqveRiDSgI8mTzTcrNgVClsCLoInY5Vab7onZjY9bGijPQ2i1P6+qu +5G6LiLFW7xFq2BcX1DnTztcJ8Yu9NYHhR21J6u7Dr8YHntes3mnth1F0BX3FVA1s +9SaE9/pNhdqap9owpEhNoE1Ke3LorVLL8jyQsqgRHx8VdhWdi9Ao0mzzeI9HYX0j +nZ7uXK5DqGG74K6eWoS9jZSDJLj3IBkIr3B/AgMBAAGjITAfMB0GA1UdDgQWBBTK +YjH+9Jv82Zqi86r95/1sXUCOnDANBgkqhkiG9w0BAQ0FAAOCAgEAsDyl3dS/5pR1 +iDN0zE70HN1Sjv55c5um6N39rgz8JSObbAMihhpjRXPR6yl0PdfVcswdCuEaaykp +ppPNY5ObqZIdqI92XOaOhSA3AkZwZffbwaoXFYiawq1aQG1HP7oxXzWwbnbPOxgz +6ThNP5DJan53Mk8TAhxoJkEJxVlMwIiC+QEgqDNYrP8oNOR2J1EXgzsHheEKObyP +xTwRYFqZU/7BQlFeB0LG1LIy9zXAHlb/XIor10w6ChPDW7DiDwGq3zDJw1d8eiUn +RoPRmFjTqn+3rGaEkk+vUFHoWo7cLCEIC3+P9wlY4Kel+ldXMmuJ+BZ1glFXeO3L +VO85n7iVIyBbwo7RLtNaBvrRQIEG3ld5UOKklLlWwhrX/FXksEhdFvmuF9sbiYNr +cg81sbwZlX7Gi7VicXkykFFXwRRr3UblDtfeevouxk4nMVzcDsmzGeAZKQBvcxHa +Pzc70YwnVRqTc87c0bEwPoxK1Vb26+DILyDjKb/AkTw/rwj6vcJZP2ad+hpiz5Ka +nlbY2cI3JJb0TQiDiOIk+xFqC5oHUTSEmfqA6sA5o/RqdwDpkfpgI5mCwhYzDSLD +jfS+263ylhanl7oz0sM+GtH63owVbYJAFT2EozT9siTIErvJESL4Z80yUQG63d/7 +fss8T6gOo19esb/KEMZGZE4pAApakWM= +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt b/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt new file mode 100644 index 0000000000..be1010f9b7 --- /dev/null +++ b/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFezCCA2OgAwIBAgIEPSs1SjANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p +MnAwHhcNMTQwNzIxMDAwNjUwWhcNMjQwNzIwMDAwNjUwWjBuMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p +MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnYMNclgj1gIJfot6f +65jbcXpcqf9hhL/uYiU4+uxVevWyJvNHpMzhPWNN4l3HihJJsINsPs/MsZ83Guva +GW5S/93I617kyjs/ZVpEtfABGewho0m9VCBV2/N1mJpHvvR+9OR+YVuWlTB/8sTG +2smdRj/dkKvewN5PSTQH350yT18NR/DmZUU1Iwa7vrNw8ol3rP3qx9UGpFN3JE7V +Q9cA1nktMiFUm76eOPOoln04WDqW2rvArXzvhSApvt0JsLBrZDzM3cx2Rc2UdjIC +h+Ha+G4CLjszfZfQAFJYPred38Gg6wuXiza/wCBSPiB92i94hIQF/OSeukaMiqwG +dRAcBT84/U9bddqHlIICw14PkNHOGUyJGjGKWQl/2bLX43ghWkUJmsTXS3iVcOTc +gb/7MoCRBdL0q2GyEJXuAoKXD9VqD3g+EdcBTQxS9lhZ0iTR7423pg6FP43VMEUC +HUi/BOX1tCY6iRzD1Su6ISIx7klH/sAWWa+SybLFXWtZJxHXXJICiBHJWRbWgtlu +5V+at66yg/LNpyfW3Am08gDV0kiWUBN2Ct4TX9PAQmNDisNgi2AzdZHIfX6tRpU8 +UnNcnZGOh4+HXQwJtI0y83C8TsXJUFYfGFWqXN69sMEmgtX8/w+YUqjtb2GcX1HN +6z9u9lH40JCFHTA/clPqOSQ+MQIDAQABoyEwHzAdBgNVHQ4EFgQU4R6x7ArVpSVs +b8VTBXmodXzyraEwDQYJKoZIhvcNAQENBQADggIBAJEHLSDBRU2x6EalmN2W952p +MEO5lGD+ZfUVK0c44t1O53naffwZx9QmDmrC4TjeQrLOpAXLQ8GJHAGeZVmYRgkf +OioKde5uuqVcxqNxArO8VyYGwsuNVPCaBV+SyIO+EmWogidSIrOP2WsRRS2NBhLV +2dp3TvMeod9bPwRl00guvv9iqL0UVSpQSlfGkAQTVpyADOaQHOzeoCpmtPOfB6OK +syB/Z/6HElKoUbvhynaASLgmo3wM93PVJQ2Ho294bQHtDl2qcOksJQvWfCgi7Zrt +KuHaM/a2kItzI6JmyNFXgsKQSDJ4UvoppppgD7K48zOtSipGuZAADC5w5HdVvIGJ +1Czva8kTcmC6AMc+4tACGqYZEAEokkeXn+pIIqKVj2eQukT/0dLGGHbKmxp3Z0f2 +pIH2Draq8JPdacr9P/xqEWUuViaOuC5OBjY8Fg3fmVCpwefIuk+DBhbJjEugB0Cu +brJpqNznoYahkbyAXIA8T+QJYMhoGWmaIcaPWK6K3nArvaxzwJbb9Egyivhyp9Rr +r2QMEZ+cPO8p1mEhKpL/wGqAzYyla8SJ06PzLc1lQeGiClu1nbZj5AgkZ1DLa8SD +iO7+e6rS0q1bzc7smE5JzZRiOVqKij/ReKa2uebLLI4wgAhz5ymaD1HfZY+3dV9T +WX89Xn2UyQf5kHifiDKL +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/reseed/swat_at_mail.i2p.crt b/installer/resources/certificates/reseed/swat_at_mail.i2p.crt new file mode 100644 index 0000000000..60659598c9 --- /dev/null +++ b/installer/resources/certificates/reseed/swat_at_mail.i2p.crt @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFVjCCAz6gAwIBAgIEU71jgDANBgkqhkiG9w0BAQ0FADBtMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEWMBQGA1UEAwwNc3dhdEBtYWlsLmky +cDAeFw0xNDA3MDkxNTQ1MDRaFw0yNDA3MDgxNTQ1MDRaMG0xCzAJBgNVBAYTAlhY +MQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9ueW1v +dXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRYwFAYDVQQDDA1zd2F0QG1haWwuaTJw +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjSj53hsbTqtzbnlf5LbR +HmfdC2br9QZaB9e5IQKprlTptdzqTrt2LRS6ZaJ06BKJgX3AfLflvyeUDUPoyg63 +I9a1kb1AsrcxvMkHXTUwPaO09caO5/CiQ3zx/iuTl4e0MmGe3cz7jsvZNdOVH0ba +B691GB2UBq2QjobGx01qjWtACCmoQIcEur2ns/l+VzAextBL70dSPN6EJAonQnWc +JvHf1vhXp5DWasaIovm8haNo48QpCo7NllsAjiONQM9rrJITvzFG9hX9cv/B1Kr4 +LCebTXv58ViXXFsnxYhktAFwP33fn1eCLraJ/BpaDR4+s3ovMC/7S+g5//+sQTd1 +pR/kXx4BmZWZdzs083Z/2skQON75j/qnMhUQqpFCqUImm4lOhlIGbzFJ4GQM6VCR +V4BbvC3XuDc6vlivLzWpUEU7Kc6YnfGgi2G//ZCj2CAoR7qZs/n9997C8oAvGY5z +XGVC/GqIFHuFvnDfPDvxGovYjLJ0KrNtAmp2Rb5812glnVdPwbRYRUBg3ICbNey3 +rmGPURDq0aHMTzX4gtM+/hCYYVnkzNMQvYuw9EZLZrK/XdM1a0U4kajZSKKJsTmW +uQwXSUVjTKQh//yL4zPoELucFk5r7apLePEm6aCeWuY2wVkR8KEFgNanwDckWQAm +Lk9r2t+Y/l2jS2NqBWFyr+cCAwEAATANBgkqhkiG9w0BAQ0FAAOCAgEAgFSquj/0 +iZYpFI1XarSIVpGMo0WLAmb9GZCn5yoXSeE6eypI/hHhXA4Bjdk2Ae33pXPNcCV8 +oT/gHj8943Wx7CTxty2zHzIsd92/HG2EG6U/HPp5l7yIJQaWoe/9tjQoaBhipZOK ++MiytkoBWkyXFqXnKQPExiadWB8axHtt66vrikOcSx6Ur3u5DPKybvY4fsuvo4+I +cLLgoueFm6I1WhmkVmjtm4k2yZ/Z3NEYjg52rv8NuYhRwK2JrQeRzMZv/zt5KhOt +05woHrzymjfFBu0M8uxX7EGZBIsc8zcEY7JL/NSMArw/QCgLU5bQF6+CsyxWUkt1 +obMRXU1oS9GjC/1F0kw52NOz2qzBn9tZBc1zs8+GLpYBUf9KiUMFOfJpkr706VqC +orgxRYwncicq+de2PlesxJb3DNPFuAzUNzAqxcVYDoFPAiL1zCEl0nhBrbN+x93X +ojTfV3UlbMjMkQKveYJxsi5/+jO1dHIkXpzK4bwFwHmJ2RCa6PualWhuXldX6mR+ +APoY6xeoPRlyKk+POrSwU+hywUudyPuFyzDMo8n1w4CyqL+/ky3YsLfGBM1phbb2 +GEnZ0J1HW34Pnie1rzaCak+3RfaZsImCwh1xXl/H7Ka9bLeUIfOuipSSroctdaiG +84wIiEjxgjW2ldM37gTX2XtE/blB1YPIZ5U= +-----END CERTIFICATE----- diff --git a/installer/resources/geoip.txt b/installer/resources/geoip.txt index b8acd8c9ed..6dc2503e5a 100644 --- a/installer/resources/geoip.txt +++ b/installer/resources/geoip.txt @@ -1,5 +1,5 @@ # Last updated based on Maxmind GeoLite Country -# dated 2014-05-06 +# dated 2014-08-05 # Script borrowed from Tor # # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip @@ -41,7 +41,8 @@ 18153472,18219007,JP 18219008,18350079,IN 18350080,18874367,CN -18874368,18939903,HK +18874368,18907135,MY +18907136,18939903,HK 18939904,19005439,JP 19005440,19136511,TW 19136512,19202047,HK @@ -82,7 +83,9 @@ 34612736,34620415,EU 34620416,34620927,SE 34620928,34621439,IT -34621440,34636799,EU +34621440,34621951,EU +34621952,34622463,NL +34622464,34636799,EU 34636800,34637311,DE 34637312,34646527,EU 34646528,34647551,DE @@ -252,7 +255,9 @@ 84049920,84082687,RO 84082688,84148223,RU 84148224,84410367,DE -84410368,84434943,RU +84410368,84418559,RU +84418560,84420607,GB +84420608,84434943,RU 84434944,84443135,IT 84443136,84451327,LB 84451328,84457471,RU @@ -266,18 +271,22 @@ 84551680,84557823,DE 84557824,84557824,NL 84557825,84557825,US -84557826,84560635,NL +84557826,84558063,NL +84558064,84558071,US +84558072,84558879,NL +84558880,84558887,US +84558888,84560635,NL 84560636,84560639,US -84560640,84561215,NL +84560640,84561063,NL +84561064,84561071,US +84561072,84561215,NL 84561216,84561247,US 84561248,84561351,NL 84561352,84561359,MY 84561360,84561639,NL 84561640,84561647,ES 84561648,84561655,AF -84561656,84561687,NL -84561688,84561695,US -84561696,84561727,NL +84561656,84561727,NL 84561728,84561791,US 84561792,84562383,NL 84562384,84562391,US @@ -299,7 +308,62 @@ 84565248,84565311,US 84565312,84565655,NL 84565656,84565663,US -84565664,84574207,NL +84565664,84566303,NL +84566304,84566319,US +84566320,84566383,NL +84566384,84566415,US +84566416,84566420,NL +84566421,84566421,US +84566422,84566495,NL +84566496,84566527,US +84566528,84566567,NL +84566568,84566583,US +84566584,84566591,NL +84566592,84566687,US +84566688,84566719,NL +84566720,84566743,US +84566744,84567039,NL +84567040,84567055,US +84567056,84567071,NL +84567072,84567103,US +84567104,84567119,NL +84567120,84567135,US +84567136,84567199,NL +84567200,84567231,US +84567232,84567375,NL +84567376,84567391,US +84567392,84567535,NL +84567536,84567551,US +84567552,84567599,NL +84567600,84567615,US +84567616,84567647,NL +84567648,84567679,US +84567680,84567903,NL +84567904,84567919,US +84567920,84567999,NL +84568000,84568015,US +84568016,84568223,NL +84568224,84568239,US +84568240,84568255,GB +84568256,84568287,NL +84568288,84568303,US +84568304,84568351,NL +84568352,84568399,US +84568400,84568591,NL +84568592,84568607,GB +84568608,84568847,NL +84568848,84568863,US +84568864,84568927,NL +84568928,84568943,GB +84568944,84568991,NL +84568992,84569023,GB +84569024,84569119,NL +84569120,84569135,US +84569136,84569183,NL +84569184,84569199,US +84569200,84570127,NL +84570128,84570143,US +84570144,84574207,NL 84574208,84576255,FR 84576256,84582399,GB 84582400,84590591,DE @@ -366,7 +430,8 @@ 85733376,85737471,GB 85737472,85753855,DE 85753856,85770239,IL -85770240,85786623,DE +85770240,85778431,MD +85778432,85786623,DE 85786624,85852159,IL 85852160,86015999,AE 86016000,86018047,BG @@ -403,17 +468,60 @@ 86245376,86376447,OM 86376448,86409215,AE 86409216,86441983,HU -86441984,86442700,FR +86441984,86442495,FR +86442496,86442499,ES +86442500,86442507,FR +86442508,86442511,ES +86442512,86442687,FR +86442688,86442691,ES +86442692,86442699,FR +86442700,86442700,ES 86442701,86442702,CH -86442703,86442723,FR +86442703,86442703,ES +86442704,86442723,FR 86442724,86442724,PL -86442725,86442751,FR +86442725,86442739,FR +86442740,86442743,ES +86442744,86442751,FR 86442752,86443007,GB 86443008,86443047,FR 86443048,86443051,ES -86443052,86444319,FR -86444320,86444323,ES -86444324,86446407,FR +86443052,86443451,FR +86443452,86443455,ES +86443456,86443535,FR +86443536,86443539,ES +86443540,86444119,FR +86444120,86444123,ES +86444124,86444287,FR +86444288,86444291,NL +86444292,86444315,FR +86444316,86444323,ES +86444324,86444387,FR +86444388,86444391,NL +86444392,86444519,FR +86444520,86444523,ES +86444524,86444563,FR +86444564,86444567,NL +86444568,86444575,FR +86444576,86444579,ES +86444580,86444687,FR +86444688,86444691,ES +86444692,86444835,FR +86444836,86444839,NL +86444840,86444843,ES +86444844,86444879,FR +86444880,86444883,NL +86444884,86444895,FR +86444896,86444903,NL +86444904,86445059,FR +86445060,86445063,NL +86445064,86445111,FR +86445112,86445115,NL +86445116,86445251,FR +86445252,86445255,NL +86445256,86445559,FR +86445560,86445563,NL +86445564,86446407,FR 86446408,86446408,DE 86446409,86446411,FR 86446412,86446412,DE @@ -421,7 +529,13 @@ 86446428,86446431,DE 86446432,86446619,FR 86446620,86446620,DE -86446621,86447095,FR +86446621,86446679,FR +86446680,86446683,ES +86446684,86446719,FR +86446720,86446727,NL +86446728,86446983,FR +86446984,86446991,IT +86446992,86447095,FR 86447096,86447103,ES 86447104,86447255,FR 86447256,86447263,PL @@ -442,19 +556,40 @@ 86449884,86449884,DE 86449885,86450235,FR 86450236,86450239,GB -86450240,86452671,FR +86450240,86451167,FR +86451168,86451175,NL +86451176,86452067,FR +86452068,86452071,ES +86452072,86452299,FR +86452300,86452303,IT +86452304,86452671,FR 86452672,86452735,GB -86452736,86453836,FR +86452736,86453199,FR +86453200,86453203,ES +86453204,86453311,FR +86453312,86453315,ES +86453316,86453836,FR 86453837,86453838,PT -86453839,86454335,FR +86453839,86454187,FR +86454188,86454191,IT +86454192,86454279,FR +86454280,86454287,ES +86454288,86454295,IT +86454296,86454335,FR 86454336,86454343,DE -86454344,86455623,FR +86454344,86454615,FR +86454616,86454619,ES +86454620,86454823,FR +86454824,86454831,ES +86454832,86455623,FR 86455624,86455624,DE 86455625,86456195,FR 86456196,86456211,DE 86456212,86456351,FR 86456352,86456367,CH -86456368,86457059,FR +86456368,86456371,FR +86456372,86456375,ES +86456376,86457059,FR 86457060,86457060,DE 86457061,86457087,FR 86457088,86457091,DE @@ -462,9 +597,15 @@ 86457112,86457112,DE 86457113,86457187,FR 86457188,86457191,ES -86457192,86457455,FR +86457192,86457403,FR +86457404,86457407,ES +86457408,86457455,FR 86457456,86457456,DE -86457457,86467320,FR +86457457,86457799,FR +86457800,86457803,ES +86457804,86466839,FR +86466840,86466847,NL +86466848,86467320,FR 86467321,86467321,FI 86467322,86467999,FR 86468000,86468003,PL @@ -472,17 +613,25 @@ 86468056,86468056,DE 86468057,86468447,FR 86468448,86468479,CZ -86468480,86469183,FR +86468480,86468587,FR +86468588,86468591,ES +86468592,86469183,FR 86469184,86469247,GB 86469248,86469691,FR 86469692,86469695,DE -86469696,86470731,FR +86469696,86469779,FR +86469780,86469783,IT +86469784,86470731,FR 86470732,86470735,BE 86470736,86471179,FR 86471180,86471180,DE 86471181,86473087,FR 86473088,86473151,PT -86473152,86474307,FR +86473152,86473359,FR +86473360,86473363,IT +86473364,86473423,FR +86473424,86473427,NL +86473428,86474307,FR 86474308,86474311,DE 86474312,86474475,FR 86474476,86474479,DE @@ -510,8 +659,7 @@ 86672896,86673407,GB 86673408,86675455,DE 86675456,86677503,IT -86677504,86679551,FR -86679552,86687743,RO +86677504,86687743,FR 86687744,86695935,IQ 86695936,86704127,SA 86704128,86720511,PT @@ -580,7 +728,8 @@ 87425024,87556095,GR 87556096,87558143,ES 87558144,87560191,IT -87560192,87562239,DE +87560192,87562111,DE +87562112,87562239,A1 87562240,87564287,UA 87564288,87566335,HU 87566336,87568383,FR @@ -658,10 +807,10 @@ 87943168,87945215,RU 87945216,87947263,HU 87947264,87949311,NL -87949312,87950847,GB -87950848,87952383,A1 -87952384,87953407,GB -87953408,87965695,A1 +87949312,87949823,GB +87949824,87950079,A1 +87950080,87950335,GB +87950336,87965695,A1 87965696,87967743,DE 87967744,87969791,IT 87969792,87973887,IM @@ -727,7 +876,6 @@ 90488832,90497023,BY 90497024,90499071,NL 90499072,90501119,IT -90501120,90503167,GB 90503168,90505215,IL 90505216,90529791,RU 90529792,90533887,NL @@ -783,7 +931,9 @@ 90757120,90759167,AT 90759168,90761215,NL 90761216,90763263,KZ -90763264,90765311,IL +90763264,90764287,IL +90764288,90764799,US +90764800,90765311,IL 90765312,90767359,PL 90767360,90832895,UA 90832896,90963967,RO @@ -826,11 +976,15 @@ 92721152,92723199,PL 92723200,92725247,RU 92725248,92733439,SY -92733440,92734735,FR +92733440,92734515,FR +92734516,92734519,IT +92734520,92734735,FR 92734736,92734739,DE 92734740,92735615,FR 92735616,92735616,DE -92735617,92735823,FR +92735617,92735619,FR +92735620,92735623,ES +92735624,92735823,FR 92735824,92735827,ES 92735828,92735875,FR 92735876,92735876,DE @@ -838,23 +992,73 @@ 92736000,92736255,GB 92736256,92736479,FR 92736480,92736480,DE -92736481,92738719,FR +92736481,92738663,FR +92738664,92738679,ES +92738680,92738719,FR 92738720,92738727,GB -92738728,92747711,FR +92738728,92740447,FR +92740448,92740455,IT +92740456,92741203,FR +92741204,92741207,IT +92741208,92741387,FR +92741388,92741395,IT +92741396,92742347,FR +92742348,92742351,IT +92742352,92742415,FR +92742416,92742419,IT +92742420,92742487,FR +92742488,92742491,IT +92742492,92742691,FR +92742692,92742695,IT +92742696,92742815,FR +92742816,92742819,ES +92742820,92743243,FR +92743244,92743247,IT +92743248,92743303,FR +92743304,92743307,IT +92743308,92743311,FR +92743312,92743315,IT +92743316,92743355,FR +92743356,92743359,IT +92743360,92743611,FR +92743612,92743615,IT +92743616,92743955,FR +92743956,92743959,IT +92743960,92744243,FR +92744244,92744247,NL +92744248,92744263,FR +92744264,92744267,NL +92744268,92744283,FR +92744284,92744291,NL +92744292,92744555,FR +92744556,92744559,IT +92744560,92747711,FR 92747712,92747775,GB -92747776,92749067,FR +92747776,92748773,FR +92748774,92748774,PT +92748775,92749067,FR 92749068,92749071,GB -92749072,92751711,FR +92749072,92749747,FR +92749748,92749751,ES +92749752,92751711,FR 92751712,92751712,DE -92751713,92757311,FR +92751713,92753547,FR +92753548,92753551,IT +92753552,92754579,FR +92754580,92754583,ES +92754584,92757311,FR 92757312,92757375,ES 92757376,92762127,FR 92762128,92762135,ES 92762136,92782687,FR 92782688,92782719,ES -92782720,92786827,FR +92782720,92783543,FR +92783544,92783547,ES +92783548,92786827,FR 92786828,92786831,IT -92786832,92798975,FR +92786832,92795123,FR +92795124,92795127,IT +92795128,92798975,FR 92798976,93323263,RU 93323264,93335551,CH 93335552,93339647,IL @@ -937,15 +1141,14 @@ 93914320,93914323,AZ 93914324,93914357,NL 93914358,93914358,GB -93914359,93914671,NL -93914672,93914679,US -93914680,93914710,NL +93914359,93914710,NL 93914711,93914711,GB 93914712,93914951,NL 93914952,93914959,US 93914960,93915327,NL 93915328,93915391,US -93915392,93915855,NL +93915392,93915847,NL +93915848,93915855,TR 93915856,93915863,US 93915864,93915895,NL 93915896,93915903,AT @@ -957,11 +1160,7 @@ 93916592,93916599,US 93916600,93916971,NL 93916972,93916975,US -93916976,93917023,NL -93917024,93917031,US -93917032,93917751,NL -93917752,93917759,US -93917760,93918103,NL +93916976,93918103,NL 93918104,93918111,US 93918112,93918215,NL 93918216,93918223,US @@ -981,9 +1180,15 @@ 93920060,93920063,US 93920064,93920163,NL 93920164,93920167,US -93920168,93920575,NL +93920168,93920223,NL +93920224,93920231,US +93920232,93920575,NL 93920576,93920639,US -93920640,93921055,NL +93920640,93920855,NL +93920856,93920863,US +93920864,93920967,NL +93920968,93920975,US +93920976,93921055,NL 93921056,93921059,US 93921060,93921063,NL 93921064,93921071,GB @@ -993,31 +1198,21 @@ 93923568,93923575,US 93923576,93923855,NL 93923856,93923863,US -93923864,93924015,NL -93924016,93924023,IE -93924024,93924407,NL +93923864,93924407,NL 93924408,93924415,JP 93924416,93924591,NL 93924592,93924599,US -93924600,93924927,NL -93924928,93924935,ES -93924936,93925807,NL +93924600,93925807,NL 93925808,93925815,KE -93925816,93926791,NL -93926792,93926799,US -93926800,93927143,NL +93925816,93927143,NL 93927144,93927151,JP 93927152,93927231,NL 93927232,93927247,CL -93927248,93927871,NL +93927248,93927263,NL +93927264,93927271,IT +93927272,93927871,NL 93927872,93927879,US -93927880,93927927,NL -93927928,93927935,US -93927936,93928415,NL -93928416,93928423,US -93928424,93928439,NL -93928440,93928447,US -93928448,93929031,NL +93927880,93929031,NL 93929032,93929039,US 93929040,93929079,NL 93929080,93929087,US @@ -1118,14 +1313,15 @@ 95387904,95388927,DE 95388928,95389183,AU 95389184,95389695,DE -95389696,95390207,GB +95389696,95389951,GB +95389952,95390207,US 95390208,95393151,DE 95393152,95393279,RS 95393280,95393407,DE 95393408,95393535,AE 95393536,95393663,DE 95393664,95393791,QA -95393792,95394047,DE +95393792,95394047,GB 95394048,95395327,AU 95395328,95395839,GB 95395840,95398399,DE @@ -1134,11 +1330,20 @@ 95400448,95400703,GB 95400704,95401471,DE 95401472,95401727,GB -95401728,95402111,DE +95401728,95401903,DE +95401904,95401911,AT +95401912,95401983,DE +95401984,95402111,GB 95402112,95402239,KW -95402240,95402623,DE -95402624,95402751,US -95402752,95403519,DE +95402240,95402495,DE +95402496,95402623,GB +95402624,95402695,US +95402696,95402703,HR +95402704,95402719,DE +95402720,95402751,US +95402752,95403183,DE +95403184,95403191,BE +95403192,95403519,DE 95403520,95403775,GB 95403776,95404799,DE 95404800,95405055,GB @@ -1149,9 +1354,16 @@ 95407360,95407871,US 95407872,95408639,DE 95408640,95409151,GB -95409152,95410687,DE +95409152,95409663,DE +95409664,95409919,US +95409920,95410175,DE +95410176,95410431,AU +95410432,95410447,CH +95410448,95410687,DE 95410688,95410943,GB -95410944,95420415,DE +95410944,95411199,DE +95411200,95411215,NL +95411216,95420415,DE 95420416,95551487,TR 95551488,95555583,AZ 95555584,95557631,GB @@ -1178,7 +1390,8 @@ 95666176,95668223,FR 95668224,95682559,DE 95944704,96075775,PL -96075776,96143359,DE +96075776,96141311,DK +96141312,96143359,DE 96143360,96145407,GE 96145408,96149503,GB 96149504,96151551,ES @@ -1219,11 +1432,9 @@ 96925696,96960511,GB 96960512,96964607,DE 96964608,96968703,NL -96968704,96969303,LT -96969304,96969311,CR -96969312,96972799,LT +96968704,96972799,LT 96972800,96974847,DE -96974848,96985087,RU +96976896,96985087,RU 96985088,96987135,ES 96987136,96989183,UA 96989184,96993279,DE @@ -1257,25 +1468,49 @@ 98734080,98736127,CH 98736128,98738175,RU 98738176,98740223,NO -98740224,98742271,DE +98740224,98741503,DE +98741504,98741759,US +98741760,98742271,DE 98742272,98744319,GB 98744320,98746367,ES 98746368,98762751,TR 98762752,98893823,RU 98893824,98959359,TR 98959360,99024895,DE -99024896,99025151,GB -99025152,99025407,DE +99024896,99025167,GB +99025168,99025407,IT 99025408,99025663,NL -99025664,99026943,DE +99025664,99025919,DE +99025920,99025935,FI +99025936,99026175,SE +99026176,99026943,DE 99026944,99027199,GB -99027200,99027455,DE +99027200,99027215,HR +99027216,99027455,CA 99027456,99027711,PL -99027712,99028991,DE +99027712,99027967,DE +99027968,99027983,ES +99027984,99028223,DE +99028224,99028239,GB +99028240,99028735,DE +99028736,99028751,SE +99028752,99028991,EG 99028992,99029247,GB -99029248,99031295,DE +99029248,99029503,DE +99029504,99029519,IE +99029520,99029759,TR +99029760,99031295,DE 99031296,99031551,GB -99031552,99044863,DE +99031552,99031807,DE +99031808,99031823,GB +99031824,99032063,FR +99032064,99043839,DE +99043840,99043847,AT +99043848,99044351,DE +99044352,99044359,BE +99044360,99044607,DE +99044608,99044615,HR +99044616,99044863,DE 99044864,99045119,GB 99045120,99045375,NL 99045376,99090431,DE @@ -1289,7 +1524,8 @@ 100246016,100246271,GB 100246272,100246527,NL 100246528,100246783,DE -100246784,100247551,SE +100246784,100247039,FR +100247040,100247551,SE 100247552,100249599,CH 100249600,100253695,SI 100253696,100261887,RU @@ -1338,16 +1574,10 @@ 100663296,134874866,US 134874867,134874867,DO 134874868,135192575,US -135192576,135193343,MX -135193344,135193599,US -135193600,135194367,MX -135194368,135194623,US -135194624,135194879,MX -135194880,135195391,US -135195392,135195647,MX -135195648,135197951,US -135197952,135198207,MX -135198208,135603199,US +135192576,135200767,MX +135200768,135432191,US +135432192,135434239,CA +135434240,135603199,US 135603200,135604223,CA 135604224,135607039,US 135607040,135607295,CA @@ -1357,13 +1587,23 @@ 135790592,135790847,CA 135790848,135791103,US 135791104,135791615,CA -135791616,136415665,US +135791616,135792639,US +135792640,135794687,CA +135794688,136237055,US +136237056,136239103,CA +136239104,136404991,US +136404992,136407039,CA +136407040,136413183,US +136413184,136415231,CA +136415232,136415665,US 136415666,136415666,FR 136415667,136689919,US 136689920,136690175,CA 136690176,136699903,US 136699904,136701951,A1 -136701952,152305663,US +136701952,139954241,US +139954242,139954242,ES +139954243,152305663,US 152305664,152338431,GB 152338432,167772159,US 184549376,201897983,US @@ -1400,9 +1640,7 @@ 212788480,212788735,VI 212788736,212788863,US 212788864,212788991,PR -212788992,212789087,US -212789088,212789095,VI -212789096,212791831,US +212788992,212791831,US 212791832,212791839,VI 212791840,212791935,US 212791936,212792063,VI @@ -1410,9 +1648,7 @@ 212793088,212793343,PR 212793344,212794575,US 212794576,212794583,VI -212794584,214237247,US -214237248,214237311,PR -214237312,214698239,US +212794584,214698239,US 214698240,214698255,VI 214698256,214698303,US 214698304,214698311,VI @@ -1421,9 +1657,7 @@ 214699648,214699775,VI 214699776,214778367,US 214778368,214778623,PR -214778624,216417663,US -216417664,216417727,PR -216417728,217709055,US +214778624,217709055,US 217709056,217709311,PR 217709312,219187465,US 219187466,219187467,EU @@ -1440,9 +1674,7 @@ 234947584,234950655,JP 234950656,234951679,AU 234951680,234952703,HK -234954752,234961663,NZ -234961664,234961919,US -234961920,234971135,NZ +234954752,234971135,NZ 234979328,235012095,MY 235012096,235077631,AU 235077632,235143167,JP @@ -1491,8 +1723,7 @@ 247488512,247496703,JP 247496704,247504895,PK 247504896,247508991,AU -247508992,247509247,US -247509248,247513087,AU +247508992,247513087,US 247513088,247529471,MY 247529472,247595007,JP 247595008,247726079,IN @@ -1712,8 +1943,8 @@ 386670592,386736127,US 386736128,386740223,NL 386740224,386842623,US -386842624,386854911,NL -386854912,386862079,US +386842624,386846719,NL +386846720,386862079,US 386862080,386862335,JP 386862336,386875391,US 386875392,386879487,NL @@ -1742,9 +1973,7 @@ 388198400,388202495,NL 388202496,388222975,US 388222976,388227071,NL -388227072,388235263,US -388235264,388239359,NL -388239360,388251647,US +388227072,388251647,US 388251648,388255743,NL 388255744,388272127,US 388272128,388284415,NL @@ -1881,7 +2110,8 @@ 391110912,391111167,GB 391111168,391111679,NL 391111680,391111935,US -391111936,391113471,NL +391111936,391112063,AU +391112064,391113471,NL 391113472,391113983,US 391113984,391114751,NL 391114752,391872511,US @@ -1890,9 +2120,27 @@ 391897088,391905279,CA 391905280,391938047,US 391938048,391946239,CA -391946240,392765439,US +391946240,392429567,US +392429568,392433663,NL +392433664,392441855,US +392441856,392445951,IE +392445952,392452095,US +392452096,392454143,HK +392454144,392458239,JP +392458240,392460287,SG +392460288,392495103,US +392495104,392499199,HK +392499200,392503295,SG +392503296,392507391,US +392507392,392511487,IE +392511488,392515583,NL +392515584,392523775,JP +392523776,392548351,US +392548352,392556543,AU +392556544,392765439,US 392765440,392765695,GB 392765696,394264575,US +394264576,394264831,CA 398458880,398635007,US 398635008,398643199,NL 398643200,398647295,US @@ -1907,7 +2155,9 @@ 398856192,398876671,NL 398876672,398970879,US 398970880,398974975,NL -398974976,399007743,US +398974976,399004671,US +399004672,399006207,FR +399006208,399007743,US 399007744,399011839,NL 399011840,399020031,US 399020032,399028223,NL @@ -1953,9 +2203,9 @@ 400412672,400429055,NL 400429056,400433151,US 400433152,400441343,NL -400441344,400490495,US -400490496,400556031,NL -400556032,400760831,US +400441344,400519167,US +400519168,400527359,NL +400527360,400760831,US 400760832,400769023,CA 400769024,400805887,US 400805888,400809983,CA @@ -1974,7 +2224,9 @@ 400912128,400912383,SG 400912384,401130495,US 401130496,401130751,DE -401130752,401145855,US +401130752,401137151,US +401137152,401137663,GB +401137664,401145855,US 401145856,401211391,CA 401211392,401293311,US 401293312,401297407,CA @@ -2018,7 +2270,10 @@ 402399232,402403327,CA 402403328,402415615,US 402415616,402417663,CA -402417664,405012479,US +402417664,402550015,US +402550016,402550271,CA +402550272,402550783,GB +402550784,405012479,US 405012480,405143551,CA 405143552,405180415,US 405180416,405184511,CA @@ -2040,7 +2295,9 @@ 405995520,406003711,CA 406003712,406011903,US 406011904,406028287,BS -406028288,406110207,US +406028288,406052863,US +406052864,406061055,CA +406061056,406110207,US 406110208,406142975,CA 406142976,406147071,US 406147072,406151167,CA @@ -2071,7 +2328,9 @@ 409255936,409272319,CA 409272320,409337855,US 409337856,409354239,CA -409354240,409731071,US +409354240,409550847,US +409550848,409567231,CA +409567232,409731071,US 409731072,409862143,CA 409862144,410124287,US 410124288,410189823,CA @@ -2094,8 +2353,8 @@ 411762688,411770879,CA 411770880,411779071,US 411779072,411828223,PR -411828224,411893759,US -411893760,411975679,CA +411828224,411885567,US +411885568,411975679,CA 411975680,411979775,US 411979776,411983871,CA 411983872,411988735,US @@ -2145,7 +2404,7 @@ 417775616,417796095,CA 417796096,417800191,US 417800192,417808383,BS -417808384,417820671,CA +417808384,417816575,CA 417820672,417832191,US 417832192,417832447,VI 417832448,417857535,US @@ -2209,7 +2468,6 @@ 456542208,456544255,CN 456544256,456548351,AU 456548352,456553471,JP -456553472,456554495,MY 456554496,456555519,PK 456555520,456556543,JP 456556544,456560639,AU @@ -2238,7 +2496,9 @@ 459538432,459539455,AU 459540480,459541503,JP 459541504,459542527,IN -459542528,459544575,HK +459542528,459543295,HK +459543296,459543551,TW +459543552,459544575,HK 459545600,459547647,JP 459548672,459550719,TH 459550720,459554815,JP @@ -2325,8 +2585,7 @@ 460931072,460933119,AU 460933120,460935167,CN 460935168,460937215,ID -460937216,460937727,NZ -460937728,460938239,AU +460937216,460938239,AU 460938240,460939263,JP 460939264,460940287,NZ 460940288,460941311,IN @@ -2350,8 +2609,10 @@ 461047808,461049855,JP 461049856,461050879,TH 461050880,461051903,NZ -461051904,461053951,AU -461053952,461062143,HK +461051904,461054975,AU +461054976,461055999,HK +461056000,461058047,AU +461058048,461062143,HK 461062144,461078527,IN 461078528,461078783,FJ 461078784,461079039,AU @@ -2381,7 +2642,11 @@ 461281280,461282303,PH 461282304,461283327,MY 461283328,461287423,JP -461287424,461307903,HK +461287424,461294591,HK +461294592,461298687,US +461298688,461301759,HK +461301760,461302527,US +461302528,461307903,HK 461307904,461357055,JP 461357056,461369343,AU 461369344,461373439,JP @@ -2438,12 +2703,14 @@ 520323072,520325119,CH 520325120,520327167,FR 520327168,520329215,DE -520329216,520331263,SE +520329216,520330239,SE +520330240,520330751,NL +520330752,520331263,SE 520331264,520339455,IT 520339456,520343551,UA 520343552,520355839,GB 520355840,520421375,ES -520421376,520486911,AT +520421376,520486911,BE 520486912,520488959,NL 520488960,520489983,IT 520489984,520490495,RU @@ -2494,7 +2761,9 @@ 520589312,520593407,IT 520593408,520595455,AM 520595456,520597503,MK -520597504,520601599,DE +520597504,520600319,DE +520600320,520600575,A1 +520600576,520601599,DE 520601600,520609791,SI 520609792,520613887,RU 520613888,520615935,CZ @@ -2535,7 +2804,9 @@ 520988672,520990719,DE 520990720,520992767,RU 520994816,521011199,BG -521011200,521057279,RO +521011200,521020415,RO +521020416,521021439,MD +521021440,521057279,RO 521057280,521058303,MD 521058304,521076735,RO 521076736,521078783,ES @@ -2679,7 +2950,7 @@ 522721280,522741759,RU 522741760,522743807,UA 522743808,522747903,RU -522747904,522780671,UA +522747904,522764287,UA 522780672,522782719,RU 522782720,522784767,UA 522784768,522786815,BG @@ -2854,9 +3125,13 @@ 529596416,529661951,TR 529661952,529727487,GE 529727488,529793023,HR -529793024,529821695,CZ -529821696,529825791,RU -529825792,529826815,CZ +529793024,529793337,CZ +529793338,529793338,RU +529793339,529793535,CZ +529793536,529794303,RU +529794304,529818623,CZ +529818624,529826303,RU +529826304,529826815,CZ 529826816,529827839,RU 529827840,529828863,CZ 529828864,529835007,RU @@ -2923,7 +3198,9 @@ 531263488,531265535,RU 531265536,531267583,GB 531267584,531275775,UA -531275776,531277823,US +531275776,531276799,US +531276800,531277311,GB +531277312,531277823,US 531277824,531279871,RU 531279872,531281919,CZ 531281920,531283967,RU @@ -2970,11 +3247,11 @@ 531429136,531429143,IT 531429144,531429167,GB 531429168,531429175,IT -531429176,531429239,GB +531429176,531429207,GB +531429208,531429215,IT +531429216,531429239,GB 531429240,531429247,IT -531429248,531429335,GB -531429336,531429343,IT -531429344,531429391,GB +531429248,531429391,GB 531429392,531429399,IT 531429400,531429407,GB 531429408,531429415,IT @@ -2988,9 +3265,7 @@ 531430848,531430855,IT 531430856,531430927,GB 531430928,531430935,IT -531430936,531431031,GB -531431032,531431039,IT -531431040,531431423,GB +531430936,531431423,GB 531431424,531496959,RO 531496960,531628031,PL 531628032,531660799,TR @@ -3161,7 +3436,9 @@ 533837824,533839871,DE 533839872,533856255,IS 533856256,533858303,FR -533858304,533859647,TR +533858304,533858751,TR +533858752,533858815,AT +533858816,533859647,TR 533859648,533859663,AT 533859664,533860351,TR 533862400,533864447,GB @@ -3188,9 +3465,7 @@ 533970944,533987327,SE 533987328,534118399,DE 534118400,534151167,KW -534151168,534177791,DE -534177792,534179839,NL -534179840,534183935,DE +534151168,534183935,DE 534183936,534249471,RO 534249472,534253567,GB 534253568,534257663,FR @@ -3230,7 +3505,8 @@ 534513408,534513663,SE 534513664,534515455,US 534515456,534515711,DE -534515712,534517759,US +534515712,534515967,GB +534515968,534517759,US 534517760,534518783,NL 534518784,534519039,DE 534519040,534519167,NL @@ -3254,9 +3530,7 @@ 534523136,534523391,NL 534523392,534523903,DE 534523904,534530047,US -534530048,534541311,DE -534541312,534543359,US -534543360,534544383,DE +534530048,534544383,DE 534544384,534546431,RO 534546432,534548479,DE 534548480,534550527,PL @@ -3291,12 +3565,9 @@ 539623424,539624577,NL 539624578,539624578,EU 539624579,539627519,NL -539627520,539629743,US -539629744,539629751,GB -539629752,539629975,US +539627520,539629975,GB 539629976,539629983,DE -539629984,539630079,GB -539630080,539630975,US +539629984,539630975,GB 539630976,539630983,PT 539630984,539630991,FI 539630992,539630999,NO @@ -3306,27 +3577,36 @@ 539631024,539631031,ES 539631032,539631039,IE 539631040,539631047,IT -539631048,539656191,US +539631048,539631615,GB +539631616,539635711,NL +539635712,539656191,US 539656192,539660287,IN -539660288,539668819,US +539660288,539666431,HK +539666432,539668479,JP +539668480,539668819,AU 539668820,539668823,NZ -539668824,539668891,US -539668892,539668892,AU -539668893,539671103,US -539671104,539671135,JP -539671136,540737535,US +539668824,539670527,AU +539670528,539672575,JP +539672576,540725247,US +540725248,540727295,FR +540727296,540729343,DE +540729344,540731391,US +540731392,540733439,GB +540733440,540737535,NL 540737536,540737757,BZ 540737758,540737758,BR 540737759,540803071,BZ 540803072,540811263,US 540811264,540814335,SG 540814336,540814591,AP -540814592,540815359,SG -540815360,540820959,US +540814592,540819455,SG +540819456,540820959,US 540820960,540820975,CA 540820976,540826383,US 540826384,540826399,CA -540826400,543752191,US +540826400,543690751,US +543690752,543691007,AR +543691008,543752191,US 543752192,543752447,BM 543752448,543755007,BR 543755008,543755263,CW @@ -3508,7 +3788,8 @@ 621330432,621346815,PL 621346816,621355007,RU 621355008,621357055,UA -621357056,621361151,RU +621357056,621360895,RU +621360896,621361151,DE 621361152,621363199,GB 621363200,621381631,RU 621381632,621383679,FR @@ -3525,9 +3806,10 @@ 621404160,621408255,IT 621408256,621410303,RU 621410304,621412351,IR -621412352,621430783,DE +621412352,621428735,NL +621428736,621430783,DE 621430784,621432831,ES -621432832,621436927,CZ +621432832,621436927,IT 621436928,621445119,DE 621445120,621805567,ES 621805568,621813759,NL @@ -3661,7 +3943,24 @@ 623071232,623073279,FI 623073280,623075327,GB 623075328,623077375,DK -623077376,623083519,CH +623077376,623077783,CH +623077784,623077791,NL +623077792,623077807,CH +623077808,623077815,BE +623077816,623077819,SE +623077820,623077827,CH +623077828,623077831,US +623077832,623077833,PT +623077834,623077835,ES +623077836,623077837,CR +623077838,623077839,KN +623077840,623077843,BR +623077844,623077849,HK +623077850,623077851,ZA +623077852,623077855,SG +623077856,623077857,WS +623077858,623077861,NZ +623077862,623083519,CH 623083520,623116287,RO 623116288,623378431,KW 623378432,623509503,OM @@ -3691,9 +3990,11 @@ 623800320,623801087,SE 623801088,623801599,US 623801600,623801855,SE -623801856,623802111,NL -623802112,623802879,SE -623802880,623804415,NL +623801856,623802367,NL +623802368,623802879,SE +623802880,623804148,NL +623804149,623804159,SE +623804160,623804415,NL 623804416,623806463,RU 623806464,623808511,NL 623808512,623810559,RU @@ -3741,7 +4042,11 @@ 624575400,624575403,US 624575404,624575679,NL 624575680,624575743,US -624575744,624576127,NL +624575744,624575871,NL +624575872,624575879,US +624575880,624576031,NL +624576032,624576039,US +624576040,624576127,NL 624576128,624576131,US 624576132,624576471,NL 624576472,624576479,US @@ -3755,9 +4060,15 @@ 624577308,624577311,US 624577312,624577483,NL 624577484,624577487,US -624577488,624578719,NL +624577488,624577863,NL +624577864,624577871,DK +624577872,624578415,NL +624578416,624578423,US +624578424,624578719,NL 624578720,624578723,GB -624578724,624578951,NL +624578724,624578887,NL +624578888,624578895,US +624578896,624578951,NL 624578952,624578955,US 624578956,624579075,NL 624579076,624579079,US @@ -3789,9 +4100,7 @@ 624582288,624582295,US 624582296,624582399,NL 624582400,624582403,US -624582404,624582591,NL -624582592,624582599,US -624582600,624584111,NL +624582404,624584111,NL 624584112,624584119,US 624584120,624584159,NL 624584160,624584175,US @@ -3799,14 +4108,57 @@ 624584384,624584391,US 624584392,624584415,NL 624584416,624584423,US -624584424,624590847,NL -624590848,624640951,FR +624584424,624586279,NL +624586280,624586287,US +624586288,624587583,NL +624587584,624587599,US +624587600,624587871,NL +624587872,624587903,US +624587904,624588383,NL +624588384,624588391,US +624588392,624588399,GB +624588400,624588927,NL +624588928,624588943,GB +624588944,624589159,NL +624589160,624589167,IT +624589168,624589199,NL +624589200,624589215,KE +624589216,624589223,NL +624589224,624589231,US +624589232,624589719,NL +624589720,624589727,US +624589728,624589967,NL +624589968,624589975,US +624589976,624590847,NL +624590848,624640527,FR +624640528,624640543,GB +624640544,624640759,FR +624640760,624640767,NL +624640768,624640951,FR 624640952,624640959,PT -624640960,624658323,FR +624640960,624643019,FR +624643020,624643023,IT +624643024,624645147,FR +624645148,624645151,IT +624645152,624646343,FR +624646344,624646347,NL +624646348,624646583,FR +624646584,624646591,NL +624646592,624647171,FR +624647172,624647183,ES +624647184,624648139,FR +624648140,624648143,ES +624648144,624657711,FR +624657712,624657715,ES +624657716,624657883,FR +624657884,624657887,ES +624657888,624658323,FR 624658324,624658327,IE 624658328,624658479,FR 624658480,624658483,DE -624658484,624660827,FR +624658484,624659031,FR +624659032,624659039,IT +624659040,624660827,FR 624660828,624660831,ES 624660832,624661247,FR 624661248,624661251,ES @@ -3816,21 +4168,75 @@ 624661956,624661959,PL 624661960,624663951,FR 624663952,624663955,ES -624663956,624664676,FR +624663956,624664527,FR +624664528,624664531,ES +624664532,624664615,FR +624664616,624664619,IT +624664620,624664676,FR 624664677,624664677,IE 624664678,624665587,FR 624665588,624665591,DE -624665592,624669795,FR +624665592,624665803,FR +624665804,624665807,NL +624665808,624665951,FR +624665952,624665955,NL +624665956,624667471,FR +624667472,624667475,IT +624667476,624668063,FR +624668064,624668079,BE +624668080,624668639,FR +624668640,624668643,NL +624668644,624669795,FR 624669796,624669799,ES -624669800,624673535,FR +624669800,624671455,FR +624671456,624671471,ES +624671472,624672547,FR +624672548,624672551,ES +624672552,624672559,FR +624672560,624672563,IT +624672564,624673287,FR +624673288,624673295,DE +624673296,624673451,FR +624673452,624673455,ES +624673456,624673535,FR 624673536,624673791,ES -624673792,624673903,FR +624673792,624673803,FR +624673804,624673807,NL +624673808,624673903,FR 624673904,624673919,ES -624673920,624676003,FR +624673920,624675691,FR +624675692,624675695,ES +624675696,624675775,FR +624675776,624675779,ES +624675780,624676003,FR 624676004,624676007,DE 624676008,624676087,FR 624676088,624676091,DE -624676092,624681807,FR +624676092,624676715,FR +624676716,624676719,ES +624676720,624677463,FR +624677464,624677467,ES +624677468,624677683,FR +624677684,624677687,NL +624677688,624677767,FR +624677768,624677775,NL +624677776,624678391,FR +624678392,624678399,NL +624678400,624678487,FR +624678488,624678495,NL +624678496,624679175,FR +624679176,624679183,NL +624679184,624679199,FR +624679200,624679203,ES +624679204,624679679,FR +624679680,624679687,NL +624679688,624679843,FR +624679844,624679847,ES +624679848,624680931,FR +624680932,624680935,NL +624680936,624681351,FR +624681352,624681359,NL +624681360,624681807,FR 624681808,624681823,BE 624681824,624683775,FR 624683776,624683779,DE @@ -3838,17 +4244,50 @@ 624683784,624683787,DE 624683788,624683975,FR 624683976,624683983,GB -624683984,624684207,FR +624683984,624684183,FR +624684184,624684191,IT +624684192,624684199,FR +624684200,624684203,IT +624684204,624684207,FR 624684208,624684211,ES 624684212,624684799,FR 624684800,624684803,DE -624684804,624685919,FR +624684804,624685711,FR +624685712,624685715,ES +624685716,624685799,FR +624685800,624685803,ES +624685804,624685919,FR 624685920,624685923,ES -624685924,624687343,FR +624685924,624685943,FR +624685944,624685947,IT +624685948,624686627,FR +624686628,624686631,ES +624686632,624686667,FR +624686668,624686671,ES +624686672,624686711,FR +624686712,624686715,ES +624686716,624687343,FR 624687344,624687346,CZ -624687347,624688731,FR -624688732,624688735,PL -624688736,624689076,FR +624687347,624687347,ES +624687348,624687827,FR +624687828,624687831,ES +624687832,624688007,FR +624688008,624688015,ES +624688016,624688307,FR +624688308,624688311,ES +624688312,624688487,FR +624688488,624688491,ES +624688492,624688639,FR +624688640,624688643,ES +624688644,624688691,FR +624688692,624688695,ES +624688696,624688779,FR +624688780,624688783,ES +624688784,624688791,FR +624688792,624688795,ES +624688796,624688831,FR +624688832,624688835,ES +624688836,624689076,FR 624689077,624689078,BE 624689079,624689151,FR 624689152,624691199,DE @@ -3958,7 +4397,7 @@ 627048448,627113983,DK 627113984,627145727,RO 627145728,627146751,ES -627146752,627179519,RO +627146752,627179519,NL 627179520,627212287,IR 627212288,627216383,FI 627216384,627218431,GB @@ -3981,7 +4420,7 @@ 627834880,627965951,PL 627965952,628006911,RU 628006912,628015103,GE -628015104,628017151,GB +628015104,628017151,FR 628017152,628019199,CH 628019200,628021247,UZ 628021248,628023295,GB @@ -4170,8 +4609,8 @@ 630802432,630804479,GB 630804480,630806527,CH 630806528,630808575,ES -630808576,630810175,NL -630810176,630816767,CH +630808576,630810623,NL +630810624,630816767,CH 630816768,630833151,RO 630833152,630849535,NL 630849536,630980607,TR @@ -4187,8 +4626,8 @@ 631007232,631017471,RO 631017472,631018495,MD 631018496,631039999,RO -631040000,631042047,MD -631042048,631044095,RO +631040000,631043071,MD +631043072,631044095,RO 631044096,631045119,MD 631045120,631046143,RO 631046144,631048191,DK @@ -4219,7 +4658,17 @@ 632946688,632963071,AT 632963072,632979455,AM 632979456,633012223,IT -633012224,633077759,FR +633012224,633063679,FR +633063680,633063935,PL +633063936,633064191,FR +633064192,633064447,GB +633064448,633065727,FR +633065728,633065983,DE +633065984,633066239,FR +633066240,633066495,ES +633066496,633066751,FR +633066752,633067007,IT +633067008,633077759,FR 633077760,633094143,RU 633094144,633098239,NL 633098240,633100287,HU @@ -4272,7 +4721,9 @@ 634124288,634126335,CH 634126336,634191871,RU 634191872,634193919,TR -634193920,634195967,SK +634193920,634194687,SK +634194688,634194815,CZ +634194816,634195967,SK 634195968,634198015,RU 634198016,634200063,BA 634200064,634202111,IS @@ -4283,7 +4734,11 @@ 634216448,634220543,HR 634220544,634222591,IQ 634222592,634224639,DK -634224640,634388479,IT +634224640,634349121,IT +634349122,634349122,US +634349123,634349126,IT +634349127,634349127,US +634349128,634388479,IT 634388480,634396671,SE 634396672,634398719,BA 634398720,634400767,KZ @@ -4327,20 +4782,16 @@ 635191296,635195391,RS 635195392,635197439,RU 635197440,635199591,GB -635199592,635199607,IT -635199608,635199647,GB +635199592,635199599,IT +635199600,635199647,GB 635199648,635199655,IT -635199656,635199663,GB -635199664,635199671,IT -635199672,635199775,GB +635199656,635199775,GB 635199776,635199783,IT 635199784,635200167,GB 635200168,635200175,IT 635200176,635200199,GB 635200200,635200207,IT -635200208,635200231,GB -635200232,635200239,IT -635200240,635200263,GB +635200208,635200263,GB 635200264,635200271,IT 635200272,635200335,GB 635200336,635200343,IT @@ -4356,7 +4807,9 @@ 635200960,635200967,IT 635200968,635200991,GB 635200992,635200999,IT -635201000,635201087,GB +635201000,635201023,GB +635201024,635201031,IT +635201032,635201087,GB 635201088,635201095,IT 635201096,635201159,GB 635201160,635201167,IT @@ -4375,7 +4828,9 @@ 635240448,635256831,IR 635273216,635281407,UA 635281408,635283455,RO -635283456,635284479,DE +635283456,635283967,DE +635283968,635284223,RO +635284224,635284479,DE 635284480,635284991,A1 635284992,635285503,US 635285504,635287551,ME @@ -4487,7 +4942,6 @@ 637323264,637325311,FR 637325312,637325567,US 637325568,637327359,NO -637327360,637329407,IR 637329408,637329663,SI 637329664,637330175,FR 637330176,637330431,DE @@ -4533,7 +4987,9 @@ 641769728,641769983,CA 641769984,641771519,US 641771520,641771775,CA -641771776,642093055,US +641771776,641773055,US +641773056,641773311,CA +641773312,642093055,US 642093056,642094591,CA 642094592,642388479,US 642388480,642388735,CA @@ -4707,7 +5163,9 @@ 645873664,645874175,CA 645874176,645875711,US 645875712,645876735,CA -645876736,654311423,US +645876736,645989450,US +645989451,645989451,CA +645989452,654311423,US 654311424,654311679,CN 654311680,654311935,AU 654311936,654376959,CN @@ -5354,7 +5812,6 @@ 702447616,702449663,EG 702449664,702451711,ZA 702451712,702453759,NG -702453760,702455807,TZ 702455808,702457855,KE 702457856,702459903,EG 702459904,702461951,TZ @@ -5467,10 +5924,14 @@ 703753216,703753471,ZA 703753472,703754239,MG 703754240,703755263,GH -703755264,703757311,ZA +703755264,703755899,ZA +703755900,703755900,YT +703755901,703757311,ZA 703757312,703758335,RE 703758336,703759359,CD -703759360,704118783,ZA +703759360,703760383,ZA +703760384,703761407,GH +703761408,704118783,ZA 704118784,704380927,MA 704380928,704643071,LY 704643072,704644095,CN @@ -5540,10 +6001,91 @@ 717881344,720437247,CN 720437248,720502783,AU 720502784,721420287,CN -721420288,738197503,JP +721420288,737479679,JP +737479680,737480703,IN +737480704,737490943,JP +737490944,737491967,FJ +737491968,737511423,JP +737511424,737512447,IN +737512448,737514495,JP +737514496,737515519,IN +737515520,737516543,JP +737516544,737517567,IN +737517568,737526783,JP +737526784,737527295,US +737527296,737529855,JP +737529856,737530879,IN +737530880,737941503,JP +737941504,737944575,IN +737944576,737950719,JP +737950720,737951743,IN +737951744,737958911,JP +737958912,737959935,IN +737959936,737965055,JP +737965056,737966079,IN +737966080,737967103,JP +737967104,737967359,AU +737967360,737991679,JP +737991680,737992191,IN +737992192,737999320,JP +737999321,737999321,IN +737999322,738197503,JP 738197504,746717183,US 746717184,746782719,DE 746782720,755105791,US +759169024,759171071,ID +759171072,759174143,IN +759174144,759175167,MO +759175168,759176191,PK +759176192,759178239,TW +759178240,759179263,AU +759179264,759180287,SG +759180288,759181311,ID +759181312,759182335,NZ +759182336,759183359,HK +759183360,759184383,AU +759184384,759185407,NZ +759185408,759186431,HK +759186432,759187455,AU +759187456,759187967,SG +759187968,759188479,TW +759188480,759189503,TH +759189504,759190527,PH +759190528,759193599,IN +759193600,759195647,ID +759195648,759196671,IN +759196672,759197695,HK +759197696,759198207,CN +759198208,759198719,IN +759198720,759199743,NZ +759199744,759200767,PH +759200768,759201791,KH +759201792,759202815,SG +759202816,759204863,BD +759204864,759206911,KR +759206912,759207935,AU +759207936,759208959,KR +759208960,759209983,IN +759209984,759211007,NP +759211008,759212031,BD +759212032,759213055,MY +759213056,759214079,KR +759214080,759215103,IN +759215104,759216127,PK +759216128,759217151,TH +759217152,759220223,IN +759220224,759221247,NZ +759221248,759227391,IN +759227392,759229439,TW +759229440,759230463,IN +759230464,759232511,HK +759232512,759233535,BT +759233536,759234559,ID +759234560,759235583,SG +759235584,759236607,NZ +759236608,759237631,IN +759237632,759238655,AU +765460480,767557631,UY 771751936,771817471,RU 771817472,771948543,TR 771948544,772014079,RU @@ -5589,19 +6131,19 @@ 772841472,772843519,GB 772843520,772845567,IT 772845568,772847615,RU -772847616,772847703,GB -772847704,772847711,US -772847712,772848191,GB +772847616,772848103,NL +772848104,772848111,US +772848112,772848191,NL 772848192,772848223,US -772848224,772848303,GB -772848304,772848311,US -772848312,772848871,GB +772848224,772848871,NL 772848872,772848879,US -772848880,772849255,GB +772848880,772849231,NL +772849232,772849247,MY +772849248,772849255,NL 772849256,772849263,US -772849264,772849271,GB +772849264,772849271,NL 772849272,772849279,US -772849280,772849663,GB +772849280,772849663,NL 772849664,772851711,BG 772851712,772853759,CH 772853760,772855807,GB @@ -5620,7 +6162,7 @@ 772884480,772886527,LB 772886528,772888575,FR 772888576,772890623,GB -772890624,772892671,RU +772890624,772892671,NL 772892672,772894719,GB 772894720,772896767,PL 772896768,772898815,RS @@ -5883,7 +6425,6 @@ 773758976,773761023,UA 773761024,773763071,IT 773763072,773765119,TR -773765120,773767167,NL 773767168,773769215,GB 773769216,773771263,FR 773771264,773773311,DK @@ -6000,7 +6541,8 @@ 774160703,774160735,CH 774160736,774160768,GR 774160769,774160801,IL -774160802,774160832,BG +774160802,774160802,A1 +774160803,774160832,BG 774160833,774160864,NO 774160865,774160869,BR 774160870,774160873,CA @@ -6029,7 +6571,7 @@ 774161127,774161136,SC 774161137,774161146,SG 774161147,774161149,BY -774161150,774161151,VA +774161150,774161151,A1 774161152,774161162,AQ 774161163,774161172,KR 774161173,774161182,TH @@ -6044,7 +6586,8 @@ 774161263,774161272,TR 774161273,774161282,MT 774161283,774161292,SE -774161293,774161312,HK +774161293,774161302,HK +774161303,774161312,A1 774161313,774161322,IE 774161323,774161332,PK 774161333,774161337,KW @@ -6060,9 +6603,9 @@ 774161383,774161387,EE 774161388,774161392,LU 774161393,774161397,SK -774161398,774161402,SI +774161398,774161402,A1 774161403,774161405,LC -774161406,774161408,VA +774161406,774161408,A1 774161409,774161418,US 774161419,774161428,GL 774161429,774161438,HU @@ -6077,7 +6620,8 @@ 774161529,774161538,DO 774161539,774161548,PY 774161549,774161558,EE -774161559,774161568,BR +774161559,774161566,BR +774161567,774161568,SK 774161569,774161578,LC 774161579,774161588,VE 774161589,774161598,TC @@ -6085,9 +6629,10 @@ 774161629,774161638,PA 774161639,774161648,RU 774161649,774161658,HK -774161659,774161664,VA +774161659,774161664,A1 774161665,774161674,US -774161675,774161684,CL +774161675,774161675,CL +774161676,774161684,A1 774161685,774161694,GR 774161695,774161704,AG 774161705,774161714,AM @@ -6106,82 +6651,26 @@ 774161835,774161844,SB 774161845,774161854,VU 774161855,774161864,MX -774161865,774161869,AR +774161865,774161865,AR +774161866,774161869,A1 774161870,774161874,ES -774161875,774161879,GE -774161880,774161884,RS -774161885,774161889,DE -774161890,774161894,IT -774161895,774161899,BE +774161875,774161899,A1 774161900,774161904,FR -774161905,774161909,CZ -774161910,774161914,LT -774161915,774161917,PL -774161918,774161920,VA -774161921,774161940,GB -774161941,774161950,AU -774161951,774161955,IT -774161956,774161960,NZ -774161961,774161965,PL -774161966,774161970,NL -774161971,774161975,CA -774161976,774161980,US -774161981,774161985,GB -774161986,774161990,IQ -774161991,774161995,LT -774161996,774162000,ER -774162001,774162005,KE -774162006,774162010,DE -774162011,774162015,TN -774162016,774162020,TT -774162021,774162025,BO -774162026,774162030,CH -774162031,774162035,AU -774162036,774162040,AL -774162041,774162045,AD -774162046,774162050,HR -774162051,774162055,ME -774162056,774162060,BR +774161905,774162060,A1 774162061,774162065,US -774162066,774162070,BR -774162071,774162075,EC -774162076,774162080,SH -774162081,774162085,CR -774162086,774162090,KH -774162091,774162095,VN -774162096,774162100,CR -774162101,774162105,US +774162066,774162105,A1 774162106,774162110,GB -774162111,774162115,SO -774162116,774162120,FI -774162121,774162125,DZ +774162111,774162125,A1 774162126,774162130,MO -774162131,774162135,MR -774162136,774162140,CM -774162141,774162145,SV -774162146,774162150,HN -774162151,774162155,US -774162156,774162160,UY -774162161,774162165,LV -774162166,774162170,MD +774162131,774162170,A1 774162171,774162173,GB -774162174,774162176,VA -774162177,774162181,LK -774162182,774162186,IE -774162187,774162196,CR -774162197,774162206,DE -774162207,774162216,CX -774162217,774162225,VA +774162174,774162225,A1 774162226,774162236,GB -774162237,774162246,CH -774162247,774162266,US -774162267,774162276,PT -774162277,774162286,AE -774162287,774162296,IO +774162237,774162246,A1 +774162247,774162256,US +774162257,774162296,A1 774162297,774162306,GB -774162307,774162316,RE -774162317,774162326,TK -774162327,774162336,CV +774162307,774162336,A1 774162337,774162346,AZ 774162347,774162366,US 774162367,774162376,MX @@ -6192,7 +6681,7 @@ 774162397,774162406,SZ 774162407,774162416,SD 774162417,774162426,BF -774162427,774162432,VA +774162427,774162432,A1 774162433,774162442,GB 774162443,774162452,BA 774162453,774162462,BO @@ -6223,13 +6712,15 @@ 774162673,774162677,KG 774162678,774162682,MG 774162683,774162687,US -774162688,774162688,VA +774162688,774162688,A1 774162689,774162693,US 774162694,774162698,MZ 774162699,774162703,NP -774162704,774162778,US +774162704,774162738,US +774162739,774162743,A1 +774162744,774162778,US 774162779,774162787,CA -774162788,774162788,VA +774162788,774162788,A1 774162789,774162798,CA 774162799,774162803,BN 774162804,774162808,TM @@ -6254,46 +6745,36 @@ 774162929,774162933,NR 774162934,774162938,GS 774162939,774162942,UM -774162943,774162944,VA +774162943,774162944,A1 774162945,774162964,IT 774162965,774162966,MX 774162967,774162967,LI 774162968,774162969,MX 774162970,774162970,BY -774162971,774162974,MX +774162971,774162971,MX +774162972,774162974,A1 774162975,774162975,MY -774162976,774162979,VA +774162976,774162979,A1 774162980,774162980,IN 774162981,774162983,BO 774162984,774162987,SX 774162988,774162991,MX -774162992,774162999,VA +774162992,774162999,A1 774163000,774163000,PK 774163001,774163009,BO 774163010,774163010,VE 774163011,774163014,BO -774163015,774163024,RU -774163025,774163034,UA -774163035,774163071,VA +774163015,774163071,A1 774163072,774163074,GW 774163075,774163124,IT -774163125,774163134,TJ -774163135,774163139,TG -774163140,774163144,AS -774163145,774163149,BD -774163150,774163154,BT -774163155,774163159,GF -774163160,774163164,GP -774163165,774163169,GN -774163170,774163174,MU -774163175,774163179,CG -774163180,774163203,VA +774163125,774163127,TJ +774163128,774163203,A1 774163204,774163210,AU 774163211,774163215,TD 774163216,774163220,CD 774163221,774163225,DJ 774163226,774163230,CF -774163231,774163235,VA +774163231,774163235,A1 774163236,774163240,MF 774163241,774163245,VC 774163246,774163250,PM @@ -6306,19 +6787,20 @@ 774163281,774163283,KP 774163284,774163290,FK 774163291,774163330,IT -774163331,774163335,UG +774163331,774163331,UG +774163332,774163335,A1 774163336,774163339,MP 774163340,774163343,TL 774163344,774163347,WF 774163348,774163351,SD -774163352,774163359,SS +774163352,774163359,A1 774163360,774163367,BQ 774163368,774163375,CW 774163376,774163383,IT -774163384,774163399,GE -774163400,774163415,US -774163416,774163454,IT -774163455,774163455,VA +774163384,774163391,GE +774163392,774163399,A1 +774163400,774163411,US +774163412,774163455,A1 774163456,774166527,DK 774166528,774168575,EE 774168576,774176767,PL @@ -6426,7 +6908,9 @@ 778247680,778248191,RS 778248192,778249727,AL 778249728,778249983,RS -778249984,778305535,AL +778249984,778304305,AL +778304306,778304306,SI +778304307,778305535,AL 778305536,778371071,IR 778371072,778436607,RU 778436608,778476031,RO @@ -6444,15 +6928,21 @@ 778666480,778666495,DE 778666496,778666879,FR 778666880,778666943,GB -778666944,778668863,FR +778666944,778667391,FR +778667392,778667395,IT +778667396,778668863,FR 778668864,778668895,DE 778668896,778670975,FR 778670976,778670976,DE -778670977,778673187,FR +778670977,778671201,FR +778671202,778671202,ES +778671203,778673187,FR 778673188,778673191,ES 778673192,778673207,FR 778673208,778673211,ES -778673212,778673883,FR +778673212,778673383,FR +778673384,778673387,IT +778673388,778673883,FR 778673884,778673887,ES 778673888,778675763,FR 778675764,778675767,PL @@ -6460,7 +6950,9 @@ 778675796,778675799,ES 778675800,778675891,FR 778675892,778675895,ES -778675896,778677471,FR +778675896,778677071,FR +778677072,778677075,NL +778677076,778677471,FR 778677472,778677475,DE 778677476,778677503,FR 778677504,778677507,GB @@ -6474,17 +6966,27 @@ 778680228,778680231,IE 778680232,778680683,FR 778680684,778680687,ES -778680688,778681503,FR +778680688,778681487,FR +778681488,778681495,NL +778681496,778681503,FR 778681504,778681507,DE 778681508,778681519,FR 778681520,778681523,ES -778681524,778691711,FR +778681524,778681823,FR +778681824,778681827,IT +778681828,778691619,FR +778691620,778691623,IT +778691624,778691711,FR 778691712,778691727,GB 778691728,778692499,FR 778692500,778692503,ES -778692504,778692743,FR +778692504,778692535,FR +778692536,778692539,IT +778692540,778692743,FR 778692744,778692747,ES -778692748,778693427,FR +778692748,778693095,FR +778693096,778693099,ES +778693100,778693427,FR 778693428,778693431,ES 778693432,778693759,FR 778693760,778693763,ES @@ -6643,7 +7145,9 @@ 782663680,782667519,NL 782667520,782667775,LU 782667776,782671871,NL -782671872,782675967,LT +782671872,782672871,LT +782672872,782672879,IL +782672880,782675967,LT 782675968,782680063,NL 782680064,782696447,RU 782696448,782712831,DE @@ -6725,7 +7229,9 @@ 783687680,783689727,PT 783689728,783691775,FR 783691776,783693823,BY -783693824,783695871,GB +783693824,783694367,GB +783694368,783694399,DE +783694400,783695871,GB 783695872,783697919,TR 783697920,783699967,FR 783699968,783702015,UA @@ -6788,7 +7294,15 @@ 784039936,784072703,PL 784072704,784105471,RU 784105472,784138239,HR -784138240,784171007,DE +784138240,784169215,DE +784169216,784169231,AL +784169232,784169247,BG +784169248,784169263,CZ +784169264,784169279,MK +784169280,784169343,AT +784169344,784169407,HU +784169408,784169471,SE +784169472,784171007,DE 784171008,784203775,PT 784203776,784236543,GR 784236544,784269311,RO @@ -6933,7 +7447,9 @@ 786919800,786919807,IT 786919808,786919879,GB 786919880,786919887,IT -786919888,786920191,GB +786919888,786919967,GB +786919968,786919975,IT +786919976,786920191,GB 786920192,786920199,IT 786920200,786920343,GB 786920344,786920351,IT @@ -6943,7 +7459,9 @@ 786920840,786920847,IT 786920848,786920855,GB 786920856,786920863,IT -786920864,786921455,GB +786920864,786921303,GB +786921304,786921311,IT +786921312,786921455,GB 786921456,786921463,IT 786921464,786921471,GB 786921472,786923519,ES @@ -6978,13 +7496,14 @@ 787013632,787015679,DE 787015680,787017727,UA 787017728,787019775,RU -787019776,787021823,NL 787021824,787038207,BG 787038208,787038463,GB 787038464,787038719,IE 787038720,787038975,DE 787038976,787039231,FR -787039232,787054591,GB +787039232,787039247,AR +787039248,787039263,PE +787039264,787054591,GB 787054592,787070975,IT 787070976,787087359,RU 787087360,787095551,TR @@ -7098,7 +7617,8 @@ 787703808,787705855,AT 787705856,787707903,RO 787707904,787709951,DE -787709952,787724287,RU +787709952,787718143,NL +787718144,787724287,RU 787724288,787726335,UA 787726336,787742719,RU 787742720,787759103,NL @@ -7139,7 +7659,7 @@ 788078592,788086783,NL 788086784,788094975,BG 788094976,788100095,IR -788100096,788101119,PL +788100096,788101119,BG 788101120,788103167,IR 788103168,788111359,HU 788111360,788119551,LT @@ -7321,7 +7841,8 @@ 830475264,830476287,AU 830476288,830480383,JP 830480384,830488575,SG -830488576,830496767,TW +830488576,830492671,HK +830492672,830496767,TW 830496768,830498815,JP 830498816,830499839,GU 830499840,830500863,IN @@ -7339,7 +7860,9 @@ 831389696,831512575,KR 831512576,831513599,AU 831513600,831514623,NZ -831514624,831515647,HK +831514624,831514975,HK +831514976,831515007,AU +831515008,831515647,HK 831515648,831516671,AU 831516672,831518719,JP 831518720,831519743,AU @@ -7424,15 +7947,14 @@ 839339608,839339609,A1 839339610,839352319,US 839352320,839356415,NL -839356416,839359487,US +839356416,839357439,US +839357440,839358463,FR +839358464,839359487,GB 839359488,839360511,DE -839360512,839364607,NL -839364608,839365631,US -839365632,839366655,NL -839366656,839366911,US +839360512,839366655,NL +839366656,839366911,AT 839366912,839367167,CZ -839367168,839367679,NL -839367680,839368703,US +839367168,839368703,NL 839368704,839385087,CZ 839385088,840269823,US 840269824,840273919,CA @@ -7440,7 +7962,11 @@ 840278016,840282111,CA 840282112,840294399,US 840294400,840298495,CA -840298496,840898047,US +840298496,840838508,US +840838509,840838509,UA +840838510,840838510,US +840838511,840838512,UA +840838513,840898047,US 840898048,840898559,CA 840898560,840909055,US 840909056,840909311,CA @@ -7489,7 +8015,9 @@ 905969664,910688255,US 910688256,911147007,IE 911147008,911212543,AU -911212544,912195583,US +911212544,911998975,US +911998976,912031743,JP +912031744,912195583,US 912195584,912261119,JP 912261120,917635071,US 917635072,917700607,JP @@ -7548,12 +8076,15 @@ 960676608,960676863,PL 960676864,960692223,DE 960692224,960724991,FR -960724992,960726783,EU +960724992,960726783,NL 960726784,960727039,ZA 960727040,960727295,US -960727296,960729343,EU +960727296,960728319,NL +960728320,960728575,EU +960728576,960729343,NL 960729344,960729599,ZA -960729600,960733183,EU +960729600,960729855,EU +960729856,960733183,NL 960733184,960733439,BE 960733440,960733695,EU 960733696,960733951,BE @@ -7717,7 +8248,31 @@ 962416640,962461695,EU 962461696,962469887,IE 962469888,962527231,TR -962527232,972744447,EU +962527232,962592767,EU +962592768,962594815,IN +962594816,962596863,EU +962596864,962598911,SG +962598912,962600959,EU +962600960,962609151,HK +962609152,962613247,JP +962613248,962617343,EU +962617344,962621439,AU +962621440,962674687,EU +962674688,962676735,BR +962676736,962680831,EU +962680832,962689023,US +962689024,962723839,EU +962723840,962732031,GB +962732032,962740223,DE +962740224,962744319,SE +962744320,962748415,EU +962748416,962752511,BH +962752512,962756607,ZA +962756608,968818687,EU +968818688,968819711,DE +968819712,968851455,EU +968851456,968852479,US +968852480,972744447,EU 972744448,972744703,IN 972744704,972747263,EU 972747264,972747519,US @@ -7754,7 +8309,8 @@ 977797120,978321407,KR 978321408,978452479,JP 978452480,978485247,CN -978485248,978518015,SG +978485248,978501631,TH +978501632,978518015,SG 978518016,978583551,CN 978599936,978640895,AU 978640896,978644991,NZ @@ -7955,22 +8511,32 @@ 1024327680,1024344063,US 1024344064,1024352255,SG 1024352256,1024360447,AU -1024360448,1024363263,JP +1024360448,1024361167,JP +1024361168,1024361183,HK +1024361184,1024362911,JP +1024362912,1024362943,SG +1024362944,1024363263,JP 1024363264,1024363519,SG 1024363520,1024363775,JP 1024363776,1024364031,AU -1024364032,1024365055,JP +1024364032,1024364063,JP +1024364064,1024364079,AU +1024364080,1024365055,JP 1024365056,1024365311,AP 1024365312,1024365727,JP 1024365728,1024365759,SG -1024365760,1024372543,JP +1024365760,1024368639,JP +1024368640,1024369407,MY +1024369408,1024371199,JP +1024371200,1024371455,PH +1024371456,1024372543,JP 1024372544,1024372607,HK 1024372608,1024373263,JP 1024373264,1024373279,HK 1024373280,1024375295,JP 1024375296,1024375551,AU 1024375552,1024376831,JP -1024376832,1024393215,PH +1024376832,1024378879,PH 1024393216,1024458751,HK 1024458752,1024491519,SG 1024491520,1024589823,IN @@ -8022,8 +8588,10 @@ 1027866624,1027997695,AU 1027997696,1028128767,TW 1028128768,1029046271,KR -1029046272,1029144575,JP -1029144576,1029160959,SG +1029046272,1029148671,JP +1029148672,1029152767,HK +1029152768,1029156863,SG +1029156864,1029160959,AU 1029160960,1029177343,CN 1029177344,1029242879,AU 1029242880,1029308415,JP @@ -8147,7 +8715,9 @@ 1041710672,1041710687,FR 1041710688,1041711551,GB 1041711552,1041711559,FR -1041711560,1041712631,GB +1041711560,1041711943,GB +1041711944,1041711951,FR +1041711952,1041712631,GB 1041712632,1041712639,FR 1041712640,1041715071,GB 1041715072,1041715079,FR @@ -8430,15 +9000,17 @@ 1045037056,1045118975,GR 1045118976,1045119231,US 1045119232,1045135359,GR -1045135360,1045136065,DE -1045136066,1045136066,UA -1045136067,1045152603,DE +1045135360,1045152603,DE 1045152604,1045152606,SG 1045152607,1045154629,DE 1045154630,1045154630,SG -1045154631,1045159711,DE +1045154631,1045158306,DE +1045158307,1045158307,SG +1045158308,1045159711,DE 1045159712,1045159712,EG -1045159713,1045168127,DE +1045159713,1045163508,DE +1045163509,1045163511,SG +1045163512,1045168127,DE 1045168128,1045233663,RU 1045233664,1045241855,GB 1045241856,1045250047,IT @@ -8531,7 +9103,9 @@ 1046488320,1046488575,DE 1046488576,1046489087,GB 1046489088,1046489119,DE -1046489120,1046489391,GB +1046489120,1046489311,GB +1046489312,1046489327,ES +1046489328,1046489391,GB 1046489392,1046489407,IT 1046489408,1046489471,GB 1046489472,1046489487,ES @@ -8583,13 +9157,15 @@ 1046504448,1046508543,DE 1046508544,1046511615,GB 1046511616,1046515711,DE -1046515712,1046519615,GB -1046519616,1046519623,AT -1046519624,1046525183,GB +1046515712,1046518783,GB +1046518784,1046519807,DE +1046519808,1046525183,GB 1046525184,1046525695,DE 1046525696,1046529023,GB 1046529024,1046530047,DE -1046530048,1046531839,GB +1046530048,1046530973,GB +1046530974,1046530974,DE +1046530975,1046531839,GB 1046531840,1046532095,DE 1046532096,1046533375,GB 1046533376,1046533383,DE @@ -8750,7 +9326,6 @@ 1048707072,1048772607,GB 1048772608,1048903679,NL 1048903680,1048911871,GB -1048911872,1048920063,IT 1048920064,1048936447,NL 1048936448,1048944639,PL 1048944640,1048952831,RU @@ -8804,9 +9379,7 @@ 1049709824,1049710079,A2 1049710080,1049710335,GB 1049710336,1049710591,A2 -1049710592,1049714687,GB -1049714688,1049715711,IR -1049715712,1049716735,GB +1049710592,1049716735,GB 1049716736,1049717759,IQ 1049717760,1049722879,GB 1049722880,1049731071,IS @@ -8905,12 +9478,7 @@ 1051803648,1051820031,CZ 1051820032,1051852799,NL 1051852800,1051918335,AT -1051918336,1051918591,PL -1051918592,1051919359,AT -1051919360,1051920383,PL -1051920384,1051920895,AT -1051920896,1051921919,PL -1051921920,1051922431,AT +1051918336,1051922431,PL 1051922432,1051924479,CH 1051924480,1051948031,AT 1051948032,1051949055,CH @@ -9237,7 +9805,9 @@ 1053868000,1053868007,EU 1053868008,1053868015,DE 1053868016,1053868031,EU -1053868032,1053868447,ES +1053868032,1053868351,ES +1053868352,1053868415,EU +1053868416,1053868447,ES 1053868448,1053868455,GB 1053868456,1053868463,ES 1053868464,1053868479,EU @@ -9501,9 +10071,7 @@ 1063567360,1063568895,A2 1063568896,1063569151,TZ 1063569152,1063575551,A2 -1063575552,1063727615,US -1063727616,1063728127,GU -1063728128,1063747583,US +1063575552,1063747583,US 1063747584,1063747839,A2 1063747840,1063748095,UG 1063748096,1063748607,A2 @@ -9536,9 +10104,13 @@ 1064221952,1064222207,MX 1064222208,1064445183,US 1064445184,1064445439,PK -1064445440,1065530879,US +1064445440,1065519871,US +1065519872,1065520127,GB +1065520128,1065525791,US +1065525792,1065525807,IN +1065525808,1065530879,US 1065530880,1065533439,TC -1065533440,1065537535,US +1065533440,1065537535,GB 1065537536,1065541631,TC 1065541632,1065547775,US 1065547776,1065548031,FK @@ -9555,9 +10127,7 @@ 1066255872,1066256383,A1 1066256384,1066311679,US 1066311680,1066315775,CA -1066315776,1066332671,US -1066332672,1066336255,CA -1066336256,1066352639,US +1066315776,1066352639,US 1066352640,1066354943,JM 1066354944,1066355199,BB 1066355200,1066355711,JM @@ -9641,21 +10211,9 @@ 1071166464,1071167487,A2 1071167488,1071169535,US 1071169536,1071171583,TW -1071171584,1071196159,US -1071196160,1071198207,HK -1071198208,1071199231,JP -1071199232,1071201279,US -1071201280,1071202303,TH -1071202304,1071204351,US -1071204352,1071205375,HK -1071205376,1071206399,US -1071206400,1071208447,HK -1071208448,1071210495,TW -1071210496,1071216639,US -1071216640,1071217663,AU -1071217664,1071227903,US -1071227904,1071228927,A2 -1071228928,1071251711,US +1071171584,1071206911,US +1071206912,1071207167,HK +1071207168,1071251711,US 1071251712,1071252479,HK 1071252480,1071254783,US 1071254784,1071255039,GB @@ -9782,15 +10340,29 @@ 1071487712,1071489023,HK 1071489024,1071517695,US 1071517696,1071519743,HK -1071519744,1071579391,US +1071519744,1071522817,US +1071522818,1071522818,MW +1071522819,1071579391,US 1071579392,1071579647,CA -1071579648,1071954303,US +1071579648,1071727023,US +1071727024,1071727027,GB +1071727028,1071954223,US +1071954224,1071954231,GB +1071954232,1071954303,US 1071954304,1071954319,GB -1071954320,1072228863,US +1071954320,1071954391,US +1071954392,1071954399,GB +1071954400,1071998999,US +1071999000,1071999003,GB +1071999004,1072157631,US +1072157632,1072157663,DE +1072157664,1072228863,US 1072228864,1072229375,CA 1072229376,1072360703,US 1072360704,1072360959,HK -1072360960,1072405457,US +1072360960,1072361471,US +1072361472,1072361727,GB +1072361728,1072405457,US 1072405458,1072405458,A1 1072405459,1072707327,US 1072707328,1072707583,IN @@ -9847,13 +10419,11 @@ 1073027072,1073028351,NI 1073028352,1073028607,US 1073028608,1073029119,GD -1073029120,1073031167,PR -1073031168,1073031423,US +1073029120,1073031423,US 1073031424,1073031679,CW -1073031680,1073033215,US -1073033216,1073034239,CW +1073031680,1073034239,US 1073034240,1073034495,BB -1073034496,1073035263,CW +1073034496,1073035263,US 1073035264,1073036032,GD 1073036033,1073036543,US 1073036544,1073037055,MX @@ -10043,12 +10613,12 @@ 1075973888,1075974143,CA 1075974144,1075975167,US 1075975168,1075975679,CA -1075975680,1075976127,US -1075976128,1075976159,CA -1075976160,1075976191,US +1075975680,1075976191,US 1075976192,1075976447,CA 1075976448,1075976959,US -1075976960,1075978239,CA +1075976960,1075977215,CA +1075977216,1075977983,US +1075977984,1075978239,CA 1075978240,1075982335,US 1075982336,1075982591,CA 1075982592,1075982847,US @@ -10056,8 +10626,10 @@ 1075983104,1075983359,US 1075983360,1075984383,CA 1075984384,1075985919,US -1075985920,1075987455,CA -1075987456,1075987967,US +1075985920,1075986687,CA +1075986688,1075986943,US +1075986944,1075987199,CA +1075987200,1075987967,US 1075987968,1075988223,CA 1075988224,1075988319,US 1075988320,1075988351,CA @@ -10184,28 +10756,20 @@ 1077477376,1077506047,US 1077506048,1077510143,LS 1077510144,1077512191,US -1077512192,1077513983,SE -1077513984,1077567487,US +1077512192,1077514239,SE +1077514240,1077567487,US 1077567488,1077571583,A2 1077571584,1077641215,US 1077641216,1077657599,CA -1077657600,1077840383,US -1077840384,1077840511,A1 -1077840512,1077841151,US +1077657600,1077841151,US 1077841152,1077841407,GB -1077841408,1077844383,US -1077844384,1077844391,A1 -1077844392,1077848575,US +1077841408,1077848575,US 1077848576,1077848831,GR 1077848832,1077852671,US 1077852672,1077852927,CA -1077852928,1077857279,US -1077857280,1077857535,CA -1077857536,1077865983,US +1077852928,1077865983,US 1077865984,1077866239,CA -1077866240,1077870335,US -1077870336,1077870591,CN -1077870592,1077977087,US +1077866240,1077977087,US 1077977088,1077985279,CA 1077985280,1077993471,US 1077993472,1078001663,CA @@ -10220,7 +10784,9 @@ 1078280192,1078280447,CA 1078280448,1078280575,US 1078280576,1078280583,CA -1078280584,1078281300,US +1078280584,1078281071,US +1078281072,1078281079,CA +1078281080,1078281300,US 1078281301,1078281301,CA 1078281302,1078281511,US 1078281512,1078281519,CA @@ -10230,9 +10796,11 @@ 1078281728,1078281735,CA 1078281736,1078282239,US 1078282240,1078283015,CA -1078283016,1078284031,US -1078284032,1078284159,CA -1078284160,1078284479,US +1078283016,1078283831,US +1078283832,1078283839,CA +1078283840,1078284031,US +1078284032,1078284287,CA +1078284288,1078284479,US 1078284480,1078284543,CA 1078284544,1078284703,US 1078284704,1078284719,CA @@ -10267,24 +10835,26 @@ 1078435880,1078438399,US 1078438400,1078438655,CA 1078438656,1078438911,US -1078438912,1078439167,CN +1078438912,1078438929,CN +1078438930,1078438930,US +1078438931,1078439167,CN 1078439168,1078439679,US 1078439680,1078439935,NL -1078439936,1078443799,US -1078443800,1078443807,A1 -1078443808,1078455551,US +1078439936,1078453935,US +1078453936,1078453951,AT +1078453952,1078454703,US +1078454704,1078454719,AT +1078454720,1078455343,US +1078455344,1078455359,AT +1078455360,1078455551,US 1078455552,1078455807,NL 1078455808,1078456319,US 1078456320,1078460415,CA -1078460416,1078504959,US -1078504960,1078505471,CA -1078505472,1078517759,US +1078460416,1078517759,US 1078517760,1078525951,CA 1078525952,1078575359,US 1078575360,1078575615,CA -1078575616,1078621695,US -1078621696,1078621951,IN -1078621952,1078722559,US +1078575616,1078722559,US 1078722560,1078734847,AR 1078734848,1078737919,CO 1078737920,1078738943,EC @@ -10324,113 +10894,66 @@ 1079377920,1079378943,CA 1079378944,1079379199,US 1079379200,1079379455,CA -1079379456,1079379711,US -1079379712,1079380927,CA -1079380928,1079380991,US -1079380992,1079381759,CA -1079381760,1079382271,US -1079382272,1079382527,CA -1079382528,1079383039,US +1079379456,1079383039,US 1079383040,1079383295,VG -1079383296,1079383551,CA -1079383552,1079383807,US +1079383296,1079383807,US 1079383808,1079384063,MH 1079384064,1079384319,LR 1079384320,1079384575,CA 1079384576,1079385087,ZW -1079385088,1079385343,US -1079385344,1079385471,CA -1079385472,1079385479,US -1079385480,1079386623,CA +1079385088,1079385599,US +1079385600,1079386623,CA 1079386624,1079386879,SG 1079386880,1079387135,EG 1079387136,1079387903,US 1079387904,1079388159,PH -1079388160,1079389695,CA -1079389696,1079389951,US -1079389952,1079390719,CA -1079390720,1079391487,US -1079391488,1079391743,CA +1079388160,1079389183,CA +1079389184,1079389951,US +1079389952,1079390207,CA +1079390208,1079391743,US 1079391744,1079392255,HT 1079392256,1079393791,CA -1079393792,1079394047,US -1079394048,1079394303,CA +1079393792,1079394303,US 1079394304,1079395327,EC 1079395328,1079396095,US 1079396096,1079396351,CA 1079396352,1079397375,MP 1079397376,1079397631,MH -1079397632,1079397887,CA -1079397888,1079398399,US -1079398400,1079399935,CA -1079399936,1079400447,US -1079400448,1079401215,CA -1079401216,1079401471,US -1079401472,1079403263,CA +1079397632,1079400959,US +1079400960,1079401215,CA +1079401216,1079402495,US +1079402496,1079403263,CA 1079403264,1079403519,US 1079403520,1079403775,CA -1079403776,1079403807,US -1079403808,1079403903,CA -1079403904,1079403935,US -1079403936,1079403999,CA -1079404000,1079404031,US -1079404032,1079404543,CA -1079404544,1079404799,US -1079404800,1079404959,CA -1079404960,1079404991,US -1079404992,1079405023,CA -1079405024,1079405055,US -1079405056,1079405439,CA -1079405440,1079405567,US -1079405568,1079407103,CA -1079407104,1079407359,US -1079407360,1079407615,CA -1079407616,1079408127,US -1079408128,1079408639,CA -1079408640,1079408895,US +1079403776,1079405567,US +1079405568,1079406079,CA +1079406080,1079408895,US 1079408896,1079409407,PK 1079409408,1079409919,US -1079409920,1079410687,CA -1079410688,1079410943,US -1079410944,1079411199,CA -1079411200,1079411455,US +1079409920,1079410175,CA +1079410176,1079411455,US 1079411456,1079411711,PK -1079411712,1079411743,US -1079411744,1079412735,CA -1079412736,1079413247,US -1079413248,1079413311,CA -1079413312,1079413343,US -1079413344,1079414271,CA +1079411712,1079413759,US +1079413760,1079414271,CA 1079414272,1079415039,US 1079415040,1079415295,HN -1079415296,1079415871,US -1079415872,1079415879,CA -1079415880,1079415887,US -1079415888,1079421951,CA -1079421952,1079422207,US -1079422208,1079425023,CA -1079425024,1079425279,US -1079425280,1079427583,CA +1079415296,1079416831,US +1079416832,1079418879,CA +1079418880,1079422975,US +1079422976,1079423999,CA +1079424000,1079425791,US +1079425792,1079426047,CA +1079426048,1079427327,US +1079427328,1079427583,CA 1079427584,1079428095,PW -1079428096,1079429263,CA -1079429264,1079429267,US -1079429268,1079429279,CA -1079429280,1079429295,US -1079429296,1079429375,CA -1079429376,1079429631,US -1079429632,1079431679,CA +1079428096,1079431679,US 1079431680,1079432191,ZM -1079432192,1079432703,CA -1079432704,1079432959,US +1079432192,1079432959,US 1079432960,1079433215,CA 1079433216,1079435263,CR 1079435264,1079435775,CO -1079435776,1079437311,CA -1079437312,1079439359,US -1079439360,1079442431,CA -1079442432,1079442687,US -1079442688,1079443455,CA -1079443456,1079459839,US +1079435776,1079436031,CA +1079436032,1079459839,US 1079459840,1079508991,CA 1079508992,1079566847,US 1079566848,1079567103,GB @@ -10592,9 +11115,7 @@ 1082952704,1082952959,CA 1082952960,1082982399,US 1082982400,1083015167,CA -1083015168,1083265023,US -1083265024,1083265279,CA -1083265280,1083396095,US +1083015168,1083396095,US 1083396096,1083400191,BM 1083400192,1083437055,US 1083437056,1083441151,CA @@ -10620,7 +11141,7 @@ 1085849600,1085857791,CA 1085857792,1085915135,US 1085915136,1085923327,PR -1085927424,1085997055,US +1085923328,1085997055,US 1085997056,1086013439,CA 1086013440,1086042111,US 1086042112,1086046207,CA @@ -10672,7 +11193,9 @@ 1087467292,1087467295,BR 1087467296,1087496703,US 1087496704,1087496959,CA -1087496960,1087593983,US +1087496960,1087508161,US +1087508162,1087508162,JP +1087508163,1087593983,US 1087593984,1087594239,MX 1087594240,1087608319,US 1087608320,1087608575,GB @@ -10826,9 +11349,7 @@ 1090445312,1090453503,CA 1090453504,1091798783,US 1091798784,1091799039,CN -1091799040,1091802111,US -1091802112,1091802367,CA -1091802368,1091803135,US +1091799040,1091803135,US 1091803136,1091803391,CN 1091803392,1091807231,US 1091807232,1091807487,CA @@ -10903,9 +11424,7 @@ 1093123952,1093123967,CA 1093123968,1093124607,US 1093124608,1093124863,CA -1093124864,1093125119,US -1093125120,1093125631,CA -1093125632,1093126143,US +1093124864,1093126143,US 1093126144,1093126399,CA 1093126400,1093126911,US 1093126912,1093127167,CA @@ -10924,8 +11443,10 @@ 1093137152,1093137407,US 1093137408,1093137791,CA 1093137792,1093137919,US -1093137920,1093138431,CA -1093138432,1093139711,US +1093137920,1093138175,CA +1093138176,1093138303,US +1093138304,1093138319,CA +1093138320,1093139711,US 1093139712,1093140223,CA 1093140224,1093697535,US 1093697536,1093699071,BB @@ -10943,9 +11464,7 @@ 1093723648,1093724415,BB 1093724416,1093725183,VC 1093725184,1093730303,BB -1093730304,1093730815,US -1093730816,1093731071,A1 -1093731072,1093733887,US +1093730304,1093733887,US 1093733888,1093734143,A1 1093734144,1093965960,US 1093965961,1093965961,NL @@ -10982,7 +11501,9 @@ 1096890880,1096891135,GB 1096891136,1096925183,US 1096925184,1096941567,CA -1096941568,1097727999,US +1096941568,1097076123,US +1097076124,1097076127,DE +1097076128,1097727999,US 1097728000,1097736191,CA 1097736192,1097768959,US 1097768960,1097785343,CA @@ -11016,9 +11537,7 @@ 1101304064,1101304319,EC 1101304320,1101304831,US 1101304832,1101305855,HN -1101305856,1101306047,US -1101306048,1101306079,PR -1101306080,1101352959,US +1101305856,1101352959,US 1101352960,1101355007,HN 1101355008,1101402031,US 1101402032,1101402047,PR @@ -11127,7 +11646,9 @@ 1105034496,1105034751,IT 1105034752,1105099519,US 1105099520,1105099775,EC -1105099776,1106469887,US +1105099776,1106381199,US +1106381200,1106381207,UM +1106381208,1106469887,US 1106469888,1106470911,BS 1106470912,1106475007,US 1106475008,1106475519,CO @@ -11218,9 +11739,7 @@ 1110126592,1110130687,CA 1110130688,1110310911,US 1110310912,1110376447,CA -1110376448,1110441983,US -1110441984,1110442239,CA -1110442240,1110443535,US +1110376448,1110443535,US 1110443536,1110443543,CA 1110443544,1110444287,US 1110444288,1110444799,CA @@ -11285,7 +11804,9 @@ 1110700032,1110704127,CA 1110704128,1110852863,US 1110852864,1110853119,A2 -1110853120,1110855679,US +1110853120,1110853631,US +1110853632,1110854655,GB +1110854656,1110855679,US 1110855680,1110856703,CN 1110856704,1110857727,IN 1110857728,1110858751,SG @@ -11297,7 +11818,7 @@ 1110867456,1110867967,JM 1110867968,1110887423,US 1110887424,1110887679,IE -1110887680,1110929407,US +1110887680,1110925311,US 1110929408,1110933503,BM 1110933504,1110937599,US 1110937600,1110937855,A1 @@ -11330,11 +11851,7 @@ 1113604096,1113657343,US 1113657344,1113661439,CA 1113661440,1113669631,US -1113669632,1113670143,CA -1113670144,1113670911,US -1113670912,1113671167,CA -1113671168,1113671423,US -1113671424,1113677823,CA +1113669632,1113677823,CA 1113677824,1113718783,US 1113718784,1113743359,DO 1113743360,1113752332,US @@ -11352,27 +11869,24 @@ 1114062848,1114095615,US 1114095616,1114103807,CA 1114103808,1114505215,US -1114505216,1114507455,CA -1114507456,1114507459,US -1114507460,1114508287,CA -1114508288,1114508799,US -1114508800,1114511359,CA -1114511360,1114511871,US -1114511872,1114513407,CA -1114513408,1114515455,SA +1114505216,1114506239,CA +1114506240,1114506751,US +1114506752,1114507263,CA +1114507264,1114511871,US +1114511872,1114512127,CA +1114512128,1114513407,US +1114513408,1114513471,SA +1114513472,1114513535,US +1114513536,1114515455,SA 1114515456,1114517503,US -1114517504,1114519551,CA -1114519552,1114520063,US +1114517504,1114518015,CA +1114518016,1114520063,US 1114520064,1114520319,PH 1114520320,1114520575,US 1114520576,1114520831,PH -1114520832,1114523647,CA -1114523648,1114523903,US -1114523904,1114524159,CA +1114520832,1114524159,US 1114524160,1114524671,ZA -1114524672,1114529791,CA -1114529792,1114530047,US -1114530048,1114533375,CA +1114524672,1114533375,US 1114533376,1114533887,ZA 1114533888,1114537983,AO 1114537984,1114550271,CA @@ -11531,8 +12045,7 @@ 1118976000,1118976255,GB 1118976256,1118980607,A2 1118980608,1118980863,TZ -1118980864,1118981119,CW -1118981120,1118983423,A2 +1118980864,1118983423,A2 1118983424,1118983679,NI 1118983680,1118984447,A2 1118984448,1118984703,SA @@ -11576,8 +12089,8 @@ 1119215616,1119289343,US 1119289344,1119354879,CA 1119354880,1119428607,US -1119428608,1119431679,VI -1119431680,1119432191,US +1119428608,1119431663,VI +1119431664,1119432191,US 1119432192,1119432703,VI 1119432704,1119436799,CA 1119436800,1119440895,US @@ -11588,74 +12101,46 @@ 1119502336,1119510527,CA 1119510528,1119558143,US 1119558144,1119558655,PR -1119558656,1119571967,US +1119558656,1119568383,US +1119568384,1119568639,GB +1119568640,1119570175,US +1119570176,1119570303,GB +1119570304,1119571967,US 1119571968,1119576063,CA 1119576064,1119580159,US 1119580160,1119584255,CA 1119584256,1120149503,US 1120149504,1120153599,CA -1120153600,1120272383,US -1120272384,1120274431,CA -1120274432,1120274943,US -1120274944,1120276991,CA -1120276992,1120277503,US -1120277504,1120278527,CA -1120278528,1120278543,US -1120278544,1120280575,CA -1120280576,1120280831,US -1120280832,1120281599,CA -1120281600,1120282367,US +1120153600,1120274943,US +1120274944,1120274991,CA +1120274992,1120282367,US 1120282368,1120282623,SY 1120282624,1120282879,US 1120282880,1120283135,SY -1120283136,1120283391,US -1120283392,1120283647,CA +1120283136,1120283647,US 1120283648,1120284671,EC 1120284672,1120286719,CA -1120286720,1120289023,US -1120289024,1120290303,CA -1120290304,1120290559,US -1120290560,1120293119,CA -1120293120,1120293631,US -1120293632,1120299007,CA -1120299008,1120299263,PK -1120299264,1120299519,US -1120299520,1120300799,PK -1120300800,1120301055,US -1120301056,1120304895,CA -1120304896,1120305151,US -1120305152,1120306687,CA +1120286720,1120294911,US +1120294912,1120297215,CA +1120297216,1120306687,US 1120306688,1120306943,PH 1120306944,1120307199,US 1120307200,1120307967,EC 1120307968,1120308223,PH -1120308224,1120309247,CA -1120309248,1120309503,US -1120309504,1120309759,CA -1120309760,1120310015,US +1120308224,1120310015,US 1120310016,1120310783,PH -1120310784,1120311807,CA -1120311808,1120312063,US +1120310784,1120312063,US 1120312064,1120312319,PH -1120312320,1120312575,CA +1120312320,1120312575,US 1120312576,1120312831,PH -1120312832,1120313343,CA -1120313344,1120313599,US -1120313600,1120315135,CA -1120315136,1120315391,US -1120315392,1120317815,CA -1120317816,1120317823,US -1120317824,1120317831,CA -1120317832,1120317839,US -1120317840,1120321535,CA -1120321536,1120346111,US +1120312832,1120346111,US 1120346112,1120350207,CA 1120350208,1120370687,US 1120370688,1120371199,CA 1120371200,1120372223,US 1120372224,1120372479,CA -1120372480,1120372735,US -1120372736,1120373247,CA +1120372480,1120372991,US +1120372992,1120373247,CA 1120373248,1120373503,US 1120373504,1120374015,CA 1120374016,1120374527,US @@ -11754,8 +12239,8 @@ 1120874752,1120875007,A2 1120875008,1120875263,AS 1120875264,1120876031,US -1120876032,1120876799,A2 -1120876800,1120877567,US +1120876032,1120877055,A2 +1120877056,1120877567,US 1120877568,1120877823,A2 1120877824,1120878335,US 1120878336,1120878591,A2 @@ -11781,9 +12266,7 @@ 1121254144,1121255423,CA 1121255424,1121714998,US 1121714999,1121714999,KW -1121715000,1121715935,US -1121715936,1121715943,A1 -1121715944,1121878015,US +1121715000,1121878015,US 1121878016,1121910783,CA 1121910784,1122074623,US 1122074624,1122087935,CA @@ -11822,16 +12305,16 @@ 1123336192,1123352575,CA 1123352576,1123534847,US 1123534848,1123536895,AW -1123536896,1123584511,US -1123584512,1123584767,ES -1123584768,1123589631,US +1123536896,1123589631,US 1123589632,1123589887,DE 1123589888,1123590143,US 1123590144,1123598335,VI 1123598336,1123606527,CA 1123606528,1123635199,US 1123635200,1123635455,AU -1123635456,1123635670,GB +1123635456,1123635639,GB +1123635640,1123635640,RU +1123635641,1123635670,GB 1123635671,1123635671,RU 1123635672,1123635711,GB 1123635712,1123638527,US @@ -11882,7 +12365,9 @@ 1125120256,1125120511,MA 1125120512,1125156304,US 1125156305,1125156305,DE -1125156306,1125238553,US +1125156306,1125237919,US +1125237920,1125237923,GB +1125237924,1125238553,US 1125238554,1125238554,ES 1125238555,1125290241,US 1125290242,1125290242,AE @@ -11892,7 +12377,9 @@ 1125474304,1125478399,CA 1125478400,1125481215,US 1125481216,1125481727,CA -1125481728,1125498879,US +1125481728,1125489151,US +1125489152,1125490687,CA +1125490688,1125498879,US 1125498880,1125501439,CA 1125501440,1125501695,US 1125501696,1125508095,CA @@ -11939,7 +12426,11 @@ 1130538752,1130539007,GU 1130539008,1133461247,US 1133461248,1133461503,CA -1133461504,1134029311,US +1133461504,1133785439,US +1133785440,1133785471,GB +1133785472,1133789695,US +1133789696,1133789823,GB +1133789824,1134029311,US 1134029312,1134029567,A2 1134029568,1134444543,US 1134444544,1134448639,CA @@ -12023,7 +12514,8 @@ 1138184192,1138184447,SG 1138184448,1138184959,US 1138184960,1138185215,AU -1138185216,1138188287,US +1138185216,1138185727,CA +1138185728,1138188287,US 1138188288,1138192383,PR 1138192384,1138196479,US 1138196480,1138204671,CA @@ -12043,7 +12535,9 @@ 1138508576,1138508591,IT 1138508592,1138509823,US 1138509824,1138510847,IN -1138510848,1138544895,US +1138510848,1138528255,US +1138528256,1138528511,CA +1138528512,1138544895,US 1138544896,1138545151,GB 1138545152,1138593791,US 1138593792,1138597887,CA @@ -12073,8 +12567,7 @@ 1139169280,1139170303,PR 1139170304,1139171071,US 1139171072,1139171327,PR -1139171328,1139175423,GT -1139175424,1139175679,US +1139171328,1139175679,US 1139175680,1139175807,PR 1139175808,1139179519,US 1139179520,1139195903,CA @@ -12082,9 +12575,7 @@ 1139216384,1139220479,CA 1139220480,1139265535,US 1139265536,1139269631,CA -1139269632,1145089791,US -1145089792,1145090047,JP -1145090048,1145188351,US +1139269632,1145188351,US 1145188352,1145192447,CA 1145192448,1145242111,US 1145242112,1145242367,NO @@ -12216,7 +12707,9 @@ 1159004160,1159102719,US 1159102720,1159102975,A1 1159102976,1159112703,US -1159112704,1159113471,A1 +1159112704,1159112959,A1 +1159112960,1159113215,US +1159113216,1159113471,A1 1159113472,1159113727,US 1159113728,1159113983,A1 1159113984,1159115519,US @@ -12247,9 +12740,7 @@ 1159421952,1159430143,CA 1159430144,1159512575,US 1159512576,1159512831,CA -1159512832,1159513087,US -1159513088,1159513343,CA -1159513344,1159513599,US +1159512832,1159513599,US 1159513600,1159514879,CA 1159514880,1159515135,US 1159515136,1159515647,CA @@ -12264,9 +12755,9 @@ 1159518048,1159518191,US 1159518192,1159518199,CA 1159518200,1159519743,US -1159519744,1159520767,CA -1159520768,1159521279,US -1159521280,1159521791,CA +1159519744,1159520255,CA +1159520256,1159521535,US +1159521536,1159521791,CA 1159521792,1159522815,US 1159522816,1159523071,CA 1159523072,1159523583,US @@ -12317,7 +12808,9 @@ 1160563200,1160563711,MP 1160563712,1160609791,US 1160609792,1160610815,MX -1160610816,1160667135,US +1160610816,1160665599,US +1160665600,1160665855,CH +1160665856,1160667135,US 1160667136,1160667903,CA 1160667904,1160668159,US 1160668160,1160675327,CA @@ -12388,11 +12881,7 @@ 1161627704,1161627711,DE 1161627712,1161631623,US 1161631624,1161631631,KW -1161631632,1161634079,US -1161634080,1161634087,AF -1161634088,1161634559,US -1161634560,1161634815,IN -1161634816,1161649407,US +1161631632,1161649407,US 1161649408,1161649663,AR 1161649664,1161764863,US 1161764864,1161773055,CA @@ -12401,11 +12890,15 @@ 1161818112,1161822207,CA 1161822208,1161830425,US 1161830426,1161830426,UA -1161830427,1161831384,US +1161830427,1161830596,US +1161830597,1161830597,UA +1161830598,1161831384,US 1161831385,1161831385,UA 1161831386,1161832483,US 1161832484,1161832484,UA -1161832485,1161835230,US +1161832485,1161835225,US +1161835226,1161835226,UA +1161835227,1161835230,US 1161835231,1161835231,PH 1161835232,1161837567,US 1161837568,1161837823,JP @@ -12451,16 +12944,16 @@ 1162475008,1162477567,BB 1162477568,1162715135,US 1162715136,1162723327,CA -1162723328,1162807295,US +1162723328,1162806527,US +1162806528,1162806783,PR +1162806784,1162807295,US 1162807296,1162809343,PR 1162809344,1162811391,US 1162811392,1162811647,CW 1162811648,1162812159,US 1162812160,1162812415,DO 1162812416,1162813439,BS -1162813440,1162817535,US -1162817536,1162821631,GT -1162821632,1162823679,US +1162813440,1162823679,US 1162823680,1162825727,GT 1162825728,1162831871,US 1162831872,1162833919,PR @@ -12473,7 +12966,7 @@ 1162840064,1162853375,US 1162853376,1162854399,PR 1162854400,1162858495,JM -1162858496,1162862591,HN +1162858496,1162862591,US 1162862592,1162866687,PR 1162866688,1162870783,US 1162870784,1162871295,BB @@ -12522,20 +13015,18 @@ 1163533808,1163533823,CA 1163533824,1163534255,US 1163534256,1163534271,CA -1163534272,1163535359,US -1163535360,1163535615,CA -1163535616,1163535871,US -1163535872,1163536383,CA +1163534272,1163536127,US +1163536128,1163536383,CA 1163536384,1163537663,US -1163537664,1163539455,CA -1163539456,1163540351,US +1163537664,1163538431,CA +1163538432,1163540351,US 1163540352,1163540479,CA 1163540480,1163540735,US 1163540736,1163541503,CA 1163541504,1163542015,US 1163542016,1163542783,CA -1163542784,1163543039,US -1163543040,1163543551,CA +1163542784,1163543295,US +1163543296,1163543551,CA 1163543552,1163544063,US 1163544064,1163544319,CA 1163544320,1163544831,US @@ -12582,9 +13073,7 @@ 1163554816,1163555839,CA 1163555840,1163556095,US 1163556096,1163556607,CA -1163556608,1163559679,US -1163559680,1163559935,CA -1163559936,1163560959,US +1163556608,1163560959,US 1163560960,1163561983,CA 1163561984,1163562239,US 1163562240,1163563007,CA @@ -12612,8 +13101,8 @@ 1163582112,1163582207,US 1163582208,1163583487,CA 1163583488,1163587583,US -1163587584,1163588095,CA -1163588096,1163588351,US +1163587584,1163587839,CA +1163587840,1163588351,US 1163588352,1163588607,CA 1163588608,1163588863,US 1163588864,1163589631,CA @@ -12639,8 +13128,10 @@ 1168394144,1168394151,CA 1168394152,1168394239,US 1168394240,1168394495,CA -1168394496,1168394687,US -1168394688,1168394751,CA +1168394496,1168394575,US +1168394576,1168394591,CA +1168394592,1168394719,US +1168394720,1168394751,CA 1168394752,1168420863,US 1168420864,1168424959,CA 1168424960,1168461823,US @@ -12651,7 +13142,9 @@ 1168510976,1168515071,CA 1168515072,1168535551,US 1168535552,1168539647,CA -1168539648,1168670719,US +1168539648,1168593151,US +1168593152,1168593279,CA +1168593280,1168670719,US 1168670720,1168687103,CA 1168687104,1168697599,US 1168697600,1168697855,GB @@ -12662,9 +13155,7 @@ 1168859136,1168863231,CA 1168863232,1168867327,US 1168867328,1168875519,CA -1168875520,1168887807,US -1168887808,1168891903,CA -1168891904,1168916479,US +1168875520,1168916479,US 1168916480,1168932863,CA 1168932864,1168936959,US 1168936960,1168949247,CA @@ -12690,7 +13181,9 @@ 1168960672,1168960703,CA 1168960704,1168961023,US 1168961024,1168961791,CA -1168961792,1168961887,US +1168961792,1168961807,US +1168961808,1168961815,CA +1168961816,1168961887,US 1168961888,1168961919,CA 1168961920,1168962303,US 1168962304,1168962559,CA @@ -12709,7 +13202,9 @@ 1169203200,1169211391,CA 1169211392,1170190335,US 1170190336,1170190847,GB -1170190848,1170461183,US +1170190848,1170227199,US +1170227200,1170231295,NL +1170231296,1170461183,US 1170461184,1170461695,CO 1170461696,1170465791,US 1170465792,1170466047,CY @@ -12731,8 +13226,8 @@ 1176620032,1176620447,US 1176620448,1176620479,CA 1176620480,1176621311,US -1176621312,1176621575,CA -1176621576,1176622079,US +1176621312,1176621567,CA +1176621568,1176622079,US 1176622080,1176622335,GB 1176622336,1176622591,US 1176622592,1176623103,CA @@ -12779,7 +13274,13 @@ 1176917840,1176925007,CA 1176925008,1176925015,NG 1176925016,1176928255,CA -1176928256,1177008127,US +1176928256,1177000703,US +1177000704,1177000711,CA +1177000712,1177000719,US +1177000720,1177000735,CA +1177000736,1177000751,US +1177000752,1177000759,CA +1177000760,1177008127,US 1177008128,1177009151,A2 1177009152,1177022975,US 1177022976,1177023231,GB @@ -12817,7 +13318,9 @@ 1189672252,1189672447,A1 1189672448,1191673855,US 1191673856,1191706623,CA -1191706624,1192296447,US +1191706624,1192232127,US +1192232128,1192232159,PA +1192232160,1192296447,US 1192296448,1192361983,CA 1192361984,1192427519,US 1192427520,1192460287,CA @@ -12869,7 +13372,9 @@ 1208935984,1208935991,IN 1208935992,1208935999,JP 1208936000,1208936003,HK -1208936004,1208936191,US +1208936004,1208936031,US +1208936032,1208936039,IN +1208936040,1208936191,US 1208936192,1208936199,AU 1208936200,1208936207,SG 1208936208,1208936215,HK @@ -12905,7 +13410,12 @@ 1209729024,1209786367,JM 1209786368,1209810943,US 1209810944,1209819135,CA -1209819136,1209824511,US +1209819136,1209823487,US +1209823488,1209823519,GB +1209823520,1209823543,US +1209823544,1209823551,GB +1209823552,1209824447,US +1209824448,1209824511,GB 1209824512,1209824767,CN 1209824768,1209861119,US 1209861120,1209861375,CA @@ -12954,7 +13464,9 @@ 1211308168,1211308175,CA 1211308176,1211308287,US 1211308288,1211308543,CA -1211308544,1211308799,US +1211308544,1211308719,US +1211308720,1211308727,CA +1211308728,1211308799,US 1211308800,1211310079,CA 1211310080,1211316479,US 1211316480,1211316991,CA @@ -12973,11 +13485,7 @@ 1211334656,1211367935,US 1211367936,1211368191,CA 1211368192,1211368447,EE -1211368448,1211384327,US -1211384328,1211384335,A1 -1211384336,1211388159,US -1211388160,1211388287,A1 -1211388288,1211432959,US +1211368448,1211432959,US 1211432960,1211473919,CA 1211473920,1211596799,US 1211596800,1211605999,CA @@ -13037,15 +13545,15 @@ 1245144576,1245144831,CH 1245144832,1245183999,US 1245184000,1245446143,CA -1245446144,1246887935,US -1246887936,1246888191,PL -1246888192,1246890431,US +1245446144,1246890431,US 1246890432,1246890463,CA 1246890464,1246890464,A1 1246890465,1246890495,CA 1246890496,1246902783,US 1246902784,1246903039,NL -1246903040,1246937087,US +1246903040,1246923519,US +1246923520,1246923775,AU +1246923776,1246937087,US 1246937088,1246945279,CA 1246945280,1247027199,US 1247027200,1247035391,A2 @@ -13170,9 +13678,9 @@ 1249396736,1249397759,CA 1249397760,1249409023,US 1249409024,1249410047,CA -1249410048,1249435359,US -1249435360,1249435367,CA -1249435368,1249452031,US +1249410048,1249434623,US +1249434624,1249435647,CA +1249435648,1249452031,US 1249452032,1249453055,CA 1249453056,1249474559,US 1249474560,1249475583,CA @@ -13217,7 +13725,9 @@ 1249715968,1249716735,US 1249716736,1249716991,DE 1249716992,1249720319,US -1249720320,1249720575,AU +1249720320,1249720511,AU +1249720512,1249720527,IN +1249720528,1249720575,AU 1249720576,1249720591,FR 1249720592,1249720599,GB 1249720600,1249720607,IT @@ -13246,7 +13756,9 @@ 1249721512,1249721519,TR 1249721520,1249721527,ZA 1249721528,1249721535,DK -1249721536,1249721599,US +1249721536,1249721543,US +1249721544,1249721551,GB +1249721552,1249721599,US 1249721600,1249721607,AT 1249721608,1249721615,BE 1249721616,1249721623,CH @@ -13323,11 +13835,7 @@ 1255276544,1255342079,CA 1255342080,1255367167,US 1255367168,1255367423,DE -1255367424,1255372287,US -1255372288,1255372543,PA -1255372544,1255372799,US -1255372800,1255373055,DE -1255373056,1255489535,US +1255367424,1255489535,US 1255489536,1255505919,PR 1255505920,1255514111,US 1255514112,1255522303,CA @@ -13345,8 +13853,8 @@ 1256001536,1256005631,CA 1256005632,1256030207,US 1256030208,1256034303,CA -1256034304,1256054527,US -1256054528,1256054783,CZ +1256034304,1256054399,US +1256054400,1256054783,CZ 1256054784,1256079359,US 1256079360,1256087551,KY 1256087552,1263271423,US @@ -13544,7 +14052,8 @@ 1296250496,1296250527,FR 1296250528,1296250559,DK 1296250560,1296250623,FR -1296250624,1296250879,BE +1296250624,1296250847,BE +1296250848,1296250879,GB 1296250880,1296251199,FR 1296251200,1296251231,NL 1296251232,1296251391,FR @@ -13558,7 +14067,12 @@ 1296252592,1296252595,GB 1296252596,1296252607,FR 1296252608,1296252615,NL -1296252616,1296252871,FR +1296252616,1296252623,ES +1296252624,1296252655,FR +1296252656,1296252663,IE +1296252664,1296252667,FR +1296252668,1296252671,GB +1296252672,1296252871,FR 1296252872,1296252879,DE 1296252880,1296256839,FR 1296256840,1296256847,US @@ -13683,7 +14197,6 @@ 1296738304,1296740351,CH 1296740352,1296744447,RU 1296744448,1296746495,GB -1296746496,1296748543,SI 1296748544,1296750591,FR 1296750592,1296752639,NO 1296752640,1296754687,BA @@ -14048,8 +14561,7 @@ 1307636992,1307637247,LV 1307637248,1307637503,EE 1307637504,1307637759,LV -1307637760,1307639551,EE -1307639552,1307639807,LT +1307637760,1307639807,LT 1307639808,1307643903,IT 1307643904,1307652095,RU 1307652096,1307656191,ES @@ -14103,7 +14615,9 @@ 1307817984,1307818048,GB 1307818049,1307818049,BE 1307818050,1307818239,GB -1307818240,1307819519,EU +1307818240,1307819007,EU +1307819008,1307819263,GB +1307819264,1307819519,EU 1307819520,1307819775,GB 1307819776,1307820031,EU 1307820032,1307824127,ES @@ -14135,8 +14649,7 @@ 1307926528,1307930623,KZ 1307930624,1307934719,RU 1307934720,1307938815,FR -1307938816,1307941119,US -1307941120,1307942911,TR +1307938816,1307942911,US 1307942912,1307947007,RU 1307947008,1307951103,CH 1307951104,1307959295,RU @@ -14381,8 +14894,7 @@ 1314652160,1314717695,HU 1314717696,1314783231,SA 1314783232,1314848767,DE -1314848768,1314881535,GB -1314881536,1315045375,RO +1314848768,1315045375,RO 1315045376,1315176447,SK 1315176448,1315307519,QA 1315307520,1315438591,CZ @@ -14522,7 +15034,7 @@ 1317928960,1317945343,BG 1317945344,1317978111,AT 1317978112,1317994495,RU -1317994496,1318010879,NL +1317994496,1318010879,DE 1318010880,1318027263,DK 1318027264,1318043647,IE 1318043648,1318584319,GB @@ -14545,9 +15057,7 @@ 1318707200,1318707455,FR 1318707456,1318713023,GB 1318713024,1318713087,FR -1318713088,1318714367,GB -1318714368,1318715390,FR -1318715391,1318715391,GB +1318713088,1318715391,GB 1318715392,1318723583,BG 1318723584,1318731775,IR 1318731776,1318739967,PL @@ -14655,7 +15165,6 @@ 1331902464,1331904511,MK 1331904512,1331908607,GB 1331908608,1331910655,DE -1331910656,1331912703,BH 1331912704,1331914751,DE 1331914752,1331916799,RU 1331916800,1331918847,IT @@ -14687,7 +15196,6 @@ 1332609024,1332613119,PL 1332613120,1332617215,UA 1332617216,1332621311,CZ -1332621312,1332625407,UA 1332625408,1332629503,RU 1332629504,1332633599,DE 1332633600,1332637695,UA @@ -14758,23 +15266,21 @@ 1334378496,1334411263,IT 1334411264,1334444031,RU 1334444032,1334476799,SE -1334476800,1334484223,DK -1334484224,1334484479,SE -1334484480,1334484735,DK -1334484736,1334484991,SE -1334484992,1334495231,DK -1334495232,1334495743,SE -1334495744,1334495999,DK -1334496000,1334496255,SE -1334496256,1334497023,DK -1334497024,1334497279,SE -1334497280,1334497535,DK -1334497536,1334498047,SE -1334498048,1334498559,DK -1334498560,1334499071,SE -1334499072,1334500351,DK -1334500352,1334500607,SE -1334500608,1334509567,DK +1334476800,1334477311,DK +1334477312,1334478847,SE +1334478848,1334479359,DK +1334479360,1334479871,SE +1334479872,1334480639,DK +1334480640,1334484991,SE +1334484992,1334487039,DK +1334487040,1334487295,SE +1334487296,1334489087,DK +1334489088,1334501631,SE +1334501632,1334508031,DK +1334508032,1334508415,SE +1334508416,1334509055,DK +1334509056,1334509311,SE +1334509312,1334509567,DK 1334509568,1334542335,PL 1334542336,1334575103,RU 1334575104,1334579199,UA @@ -14842,10 +15348,12 @@ 1334723584,1334723839,BE 1334723840,1334724095,DK 1334724096,1334724351,NO -1334724352,1334724863,US +1334724352,1334724607,SE +1334724608,1334724863,US 1334724864,1334725631,NL 1334725632,1334725887,SE -1334725888,1334726399,NL +1334725888,1334726143,NL +1334726144,1334726399,LU 1334726400,1334726655,SE 1334726656,1334734847,RU 1334734848,1334738943,LT @@ -15068,7 +15576,11 @@ 1343220480,1343220671,DE 1343220672,1343220735,FR 1343220736,1343220863,GB -1343220864,1343223679,FR +1343220864,1343221055,FR +1343221056,1343221119,GB +1343221120,1343221759,FR +1343221760,1343222271,GB +1343222272,1343223679,FR 1343223680,1343223687,LB 1343223688,1343224063,FR 1343224064,1343224303,US @@ -15089,14 +15601,12 @@ 1346392064,1346396159,UA 1346396160,1346400255,RU 1346400256,1346404351,IT -1346404352,1346404927,DE -1346404928,1346404943,AT -1346404944,1346408447,DE +1346404352,1346407423,AT +1346407424,1346408447,DE 1346408448,1346412543,LU 1346412544,1346416639,RU 1346416640,1346420735,DE 1346420736,1346424831,NO -1346424832,1346428927,JO 1346428928,1346429183,EU 1346429184,1346433023,FR 1346433024,1346439167,NL @@ -15111,7 +15621,6 @@ 1346478080,1346482175,BA 1346482176,1346486271,CZ 1346486272,1346490367,SE -1346490368,1346494463,GB 1346494464,1346498559,FR 1346498560,1346502655,IM 1346502656,1346510847,DE @@ -15251,7 +15760,9 @@ 1347129344,1347133439,FR 1347133440,1347141631,EG 1347141632,1347145727,CH -1347145728,1347149823,CA +1347145728,1347147263,CA +1347147264,1347147775,GB +1347147776,1347149823,CA 1347149824,1347151423,HU 1347151424,1347158015,AT 1347158016,1347162111,CH @@ -15516,13 +16027,7 @@ 1347305472,1347309567,AL 1347309568,1347313663,DE 1347313664,1347321855,RU -1347321856,1347322111,KW -1347322112,1347322367,US -1347322368,1347322623,KW -1347322624,1347322879,US -1347322880,1347324927,KW -1347324928,1347325439,US -1347325440,1347325951,KW +1347321856,1347325951,US 1347325952,1347327743,CZ 1347327744,1347327999,SK 1347328000,1347330047,CZ @@ -15570,7 +16075,11 @@ 1347481600,1347485695,AT 1347485696,1347493887,DE 1347493888,1347502079,LV -1347502080,1347518463,ES +1347502080,1347505159,ES +1347505160,1347505167,GB +1347505168,1347505215,ES +1347505216,1347505247,GB +1347505248,1347518463,ES 1347518464,1347522559,AT 1347522560,1347526655,LB 1347526656,1347534847,FI @@ -15633,7 +16142,8 @@ 1347755160,1347755175,GR 1347755176,1347756031,CY 1347756032,1347760127,NL -1347760128,1347764223,HU +1347760128,1347762175,CZ +1347762176,1347764223,HU 1347764224,1347772415,GB 1347772416,1347776511,MT 1347776512,1347780607,SE @@ -15800,7 +16310,8 @@ 1348419584,1348427775,HU 1348427776,1348435967,CZ 1348435968,1348440063,FI -1348440064,1348448255,NL +1348440064,1348444159,DE +1348444160,1348448255,NL 1348448256,1348456447,GB 1348456448,1348460543,BH 1348460544,1348464639,SI @@ -15936,20 +16447,21 @@ 1357316096,1357317119,EU 1357317120,1357317375,GB 1357317376,1357317631,A2 -1357317632,1357318143,EU -1357318144,1357320191,QA -1357320192,1357321023,EU +1357317632,1357321023,EU 1357321024,1357321087,KE 1357321088,1357321983,EU 1357321984,1357322239,GB -1357322240,1357322247,DE -1357322248,1357322495,EU +1357322240,1357322255,DE +1357322256,1357322495,EU 1357322496,1357322751,DE 1357322752,1357323519,EU 1357323520,1357323775,GB -1357323776,1357324287,EU +1357323776,1357323779,FI +1357323780,1357324287,EU 1357324288,1357325311,GB -1357325312,1357327359,EU +1357325312,1357326335,EU +1357326336,1357326337,ES +1357326338,1357327359,EU 1357327360,1357327615,FR 1357327616,1357328383,EU 1357328384,1357328639,GB @@ -15967,13 +16479,21 @@ 1357344260,1357344263,FR 1357344264,1357344511,EU 1357344512,1357344767,FR -1357344768,1357347455,EU +1357344768,1357346815,EU +1357346816,1357346835,FR +1357346836,1357346847,EU +1357346848,1357346863,FR +1357346864,1357347335,EU +1357347336,1357347375,FR +1357347376,1357347455,EU 1357347456,1357347583,FR 1357347584,1357347615,EU 1357347616,1357347647,FR 1357347648,1357347839,EU 1357347840,1357348095,PL -1357348096,1357351167,EU +1357348096,1357348383,EU +1357348384,1357348415,ES +1357348416,1357351167,EU 1357351168,1357351423,PL 1357351424,1357359871,EU 1357359872,1357360383,GB @@ -15995,8 +16515,8 @@ 1357373472,1357373479,EU 1357373480,1357373483,GB 1357373484,1357373487,EU -1357373488,1357373503,GB -1357373504,1357373951,EU +1357373488,1357373519,GB +1357373520,1357373951,EU 1357373952,1357374463,GB 1357374464,1357381631,EU 1357381632,1357414399,NO @@ -16042,7 +16562,9 @@ 1357892864,1357893119,NL 1357893120,1357898751,EU 1357898752,1357898879,DE -1357898880,1357899647,EU +1357898880,1357899583,EU +1357899584,1357899615,NL +1357899616,1357899647,EU 1357899648,1357899775,GB 1357899776,1357900415,EU 1357900416,1357900543,SE @@ -16081,17 +16603,15 @@ 1357984320,1357984327,IT 1357984328,1357984367,GB 1357984368,1357984375,IT -1357984376,1357984487,GB -1357984488,1357984495,IT -1357984496,1357984527,GB +1357984376,1357984527,GB 1357984528,1357984551,IT 1357984552,1357984591,GB 1357984592,1357984599,IT 1357984600,1357984671,GB 1357984672,1357984679,IT -1357984680,1357984823,GB -1357984824,1357984831,IT -1357984832,1357984911,GB +1357984680,1357984831,GB +1357984832,1357984839,IT +1357984840,1357984911,GB 1357984912,1357984919,IT 1357984920,1357985015,GB 1357985016,1357985023,IT @@ -16135,7 +16655,6 @@ 1358147584,1358151679,GB 1358151680,1358155775,DE 1358155776,1358159871,CH -1358159872,1358163967,ES 1358163968,1358164223,FR 1358164224,1358164479,MQ 1358164480,1358164991,FR @@ -16267,7 +16786,9 @@ 1358670944,1358670951,FR 1358670952,1358670975,GB 1358670976,1358670991,PT -1358670992,1358671935,GB +1358670992,1358671001,GB +1358671002,1358671002,PT +1358671003,1358671935,GB 1358671936,1358671943,PT 1358671944,1358675967,GB 1358675968,1358676991,SE @@ -16319,9 +16840,7 @@ 1358856192,1358860287,DE 1358860288,1358860835,GB 1358860836,1358860836,EU -1358860837,1358860883,GB -1358860884,1358860884,NG -1358860885,1358861311,GB +1358860837,1358861311,GB 1358861312,1358861361,EU 1358861362,1358861363,DE 1358861364,1358861449,EU @@ -16490,7 +17009,9 @@ 1360281728,1360281855,ES 1360281856,1360282495,NL 1360282496,1360282623,DE -1360282624,1360285695,NL +1360282624,1360284671,NL +1360284672,1360284927,DK +1360284928,1360285695,NL 1360285696,1360289791,DE 1360289792,1360293887,RU 1360293888,1360302079,DE @@ -16839,39 +17360,21 @@ 1365204992,1365209087,CZ 1365209088,1365213183,BE 1365213184,1365217279,RU -1365217280,1365217343,GB -1365217344,1365217351,US -1365217352,1365217423,GB -1365217424,1365217431,US -1365217432,1365217527,GB -1365217528,1365217535,US -1365217536,1365217655,GB +1365217280,1365217655,NL 1365217656,1365217663,US -1365217664,1365218175,GB -1365218176,1365218183,US -1365218184,1365218527,GB -1365218528,1365218535,US -1365218536,1365218967,GB -1365218968,1365218975,US -1365218976,1365219087,GB -1365219088,1365219095,US -1365219096,1365219391,GB +1365217664,1365218191,NL +1365218192,1365218199,US +1365218200,1365219167,NL +1365219168,1365219168,GB +1365219169,1365219391,NL 1365219392,1365219407,MY -1365219408,1365220231,GB +1365219408,1365219703,NL +1365219704,1365219711,US +1365219712,1365220231,NL 1365220232,1365220239,IE -1365220240,1365220359,GB -1365220360,1365220367,US -1365220368,1365220575,GB -1365220576,1365220583,US -1365220584,1365220599,GB -1365220600,1365220607,US -1365220608,1365221183,GB -1365221184,1365221191,US -1365221192,1365221255,GB -1365221256,1365221263,US -1365221264,1365221319,GB -1365221320,1365221327,US -1365221328,1365221375,GB +1365220240,1365221239,NL +1365221240,1365221247,US +1365221248,1365221375,NL 1365221376,1365225471,GE 1365225472,1365229567,UA 1365229568,1365233663,PL @@ -16932,13 +17435,24 @@ 1370095616,1370128383,GB 1370128384,1370161151,SE 1370161152,1370174463,NL -1370174464,1370175487,US -1370175488,1370178815,NL +1370174464,1370174495,BE +1370174496,1370174527,FR +1370174528,1370174559,CH +1370174560,1370174591,HU +1370174592,1370174623,CZ +1370174624,1370174655,PL +1370174656,1370174687,DE +1370174688,1370174719,SE +1370174720,1370174751,DK +1370174752,1370174752,NL +1370174753,1370174783,ES +1370174784,1370174815,CH +1370174816,1370178815,NL 1370178816,1370179071,ES 1370179072,1370181887,NL 1370181888,1370182143,US 1370182144,1370182911,NL -1370182912,1370183167,US +1370182912,1370183167,DE 1370183168,1370185983,NL 1370185984,1370186239,GB 1370186240,1370188543,NL @@ -17504,7 +18018,9 @@ 1388568576,1388576767,CH 1388576768,1388580863,NL 1388580864,1388584959,FR -1388584960,1388587519,EU +1388584960,1388587455,EU +1388587456,1388587471,GB +1388587472,1388587519,EU 1388587520,1388587775,GB 1388587776,1388588287,EU 1388588288,1388588543,GB @@ -17778,8 +18294,8 @@ 1400718336,1400719359,EU 1400719360,1400721407,DE 1400721408,1400723455,EU -1400723456,1400725503,DE -1400725504,1400729599,EU +1400723456,1400727551,DE +1400727552,1400729599,EU 1400729600,1400730623,DE 1400730624,1400731647,EU 1400731648,1400733695,DE @@ -17817,7 +18333,6 @@ 1401452544,1401454591,GB 1401454592,1401456639,DE 1401456640,1401458687,LV -1401458688,1401460735,IT 1401460736,1401462783,PL 1401462784,1401464831,FR 1401464832,1401466879,IE @@ -18033,9 +18548,7 @@ 1403781120,1403797503,RU 1403797504,1403813887,SE 1403813888,1403830271,NL -1403830272,1403838719,CH -1403838720,1403838975,RU -1403838976,1403846655,CH +1403830272,1403846655,CH 1403846656,1403863039,IS 1403863040,1403879423,FR 1403879424,1403895807,ES @@ -18051,81 +18564,26 @@ 1404043264,1404051455,EE 1404051456,1404059647,HR 1404059648,1404076031,NO -1404076032,1404077055,EE +1404076032,1404077055,SE 1404077056,1404081151,LV -1404081152,1404082175,EE +1404081152,1404082175,SE 1404082176,1404083199,DE -1404083200,1404084223,EE +1404083200,1404084223,SE 1404084224,1404092415,NO -1404092416,1404092671,EE -1404092672,1404094719,SE -1404094720,1404094975,EE -1404094976,1404095999,SE -1404096000,1404096255,EE -1404096256,1404098815,SE -1404098816,1404099327,EE -1404099328,1404099583,SE -1404099584,1404099839,EE -1404099840,1404100095,SE -1404100096,1404100607,EE -1404100608,1404101631,SE -1404101632,1404102911,EE -1404102912,1404103679,SE -1404103680,1404104191,EE -1404104192,1404104447,SE -1404104448,1404104703,EE -1404104704,1404107263,SE -1404107264,1404107519,EE -1404107520,1404108287,SE -1404108288,1404108543,EE -1404108544,1404108799,SE +1404092416,1404108799,SE 1404108800,1404112895,NL 1404112896,1404114943,HR -1404114944,1404115199,SE -1404115200,1404115455,EE -1404115456,1404116735,SE -1404116736,1404116991,EE +1404114944,1404116991,SE 1404116992,1404125183,NO -1404125184,1404127231,SE -1404127232,1404127487,EE -1404127488,1404127743,SE -1404127744,1404127999,EE -1404128000,1404130303,SE -1404130304,1404131327,EE -1404131328,1404135423,SE +1404125184,1404135423,SE 1404135424,1404137471,NL 1404137472,1404139519,SE 1404139520,1404141567,NL -1404141568,1404141823,EE -1404141824,1404142079,SE -1404142080,1404142591,EE -1404142592,1404145663,SE -1404145664,1404147199,EE -1404147200,1404147455,SE -1404147456,1404147967,EE -1404147968,1404148991,SE -1404148992,1404149759,EE -1404149760,1404151807,SE -1404151808,1404152319,EE -1404152320,1404153343,SE -1404153344,1404153599,EE -1404153600,1404160511,SE -1404160512,1404161023,EE -1404161024,1404162303,SE -1404162304,1404163583,EE -1404163584,1404163839,SE -1404163840,1404165119,EE -1404165120,1404165375,SE -1404165376,1404165631,EE -1404165632,1404166143,SE +1404141568,1404166143,SE 1404166144,1404174335,LV 1404174336,1404182527,EE -1404182528,1404184063,SE -1404184064,1404184575,EE -1404184576,1404186623,SE -1404186624,1404187647,EE -1404187648,1404188671,SE -1404188672,1404190719,EE +1404182528,1404189183,SE +1404189184,1404190719,EE 1404190720,1404192767,SE 1404192768,1404194815,LV 1404194816,1404198911,LT @@ -18140,53 +18598,26 @@ 1404219392,1404220415,SE 1404220416,1404221439,EE 1404221440,1404222463,RU -1404222464,1404222975,EE -1404222976,1404225535,SE +1404222464,1404225535,SE 1404225536,1404227071,RU -1404227072,1404227583,EE +1404227072,1404227583,SE 1404227584,1404231679,LV -1404231680,1404232191,EE +1404231680,1404232191,SE 1404232192,1404232703,NO -1404232704,1404233215,EE -1404233216,1404234239,SE -1404234240,1404234751,EE +1404232704,1404234751,SE 1404234752,1404239871,HR -1404239872,1404240895,SE -1404240896,1404241663,EE -1404241664,1404241919,SE -1404241920,1404242175,EE -1404242176,1404242751,SE -1404242752,1404242943,EE -1404242944,1404243455,SE -1404243456,1404243711,EE -1404243712,1404248319,SE -1404248320,1404248575,EE -1404248576,1404249087,SE -1404249088,1404249343,EE -1404249344,1404249855,SE -1404249856,1404250111,EE -1404250112,1404256255,SE +1404239872,1404256255,SE 1404256256,1404305407,RU 1404305408,1404313599,EE 1404313600,1404321791,HR 1404321792,1404338175,RU -1404338176,1404339967,SE -1404339968,1404340223,EE +1404338176,1404340223,SE 1404340224,1404342271,HR -1404342272,1404370943,SE -1404370944,1404371455,EE -1404371456,1404373247,SE -1404373248,1404373759,EE -1404373760,1404374015,SE -1404374016,1404374783,EE -1404374784,1404376063,SE -1404376064,1404376575,EE -1404376576,1404379135,SE +1404342272,1404379135,SE 1404379136,1404383231,AT 1404383232,1404385279,HR 1404385280,1404386047,LT -1404386048,1404386303,EE -1404386304,1404387327,SE +1404386048,1404387327,SE 1404387328,1404420095,LT 1404420096,1404436479,RU 1404436480,1404444671,SE @@ -18197,22 +18628,7 @@ 1404446976,1404447999,NO 1404448000,1404448255,SE 1404448256,1404452863,NO -1404452864,1404502527,SE -1404502528,1404502783,EE -1404502784,1404504319,SE -1404504320,1404504575,EE -1404504576,1404505599,SE -1404505600,1404506111,EE -1404506112,1404506623,SE -1404506624,1404506879,EE -1404506880,1404507135,SE -1404507136,1404507391,EE -1404507392,1404507647,SE -1404507648,1404508159,EE -1404508160,1404508927,SE -1404508928,1404509183,EE -1404509184,1404509439,SE -1404509440,1404510207,EE +1404452864,1404510207,SE 1404510208,1404510975,HR 1404510976,1404511231,SE 1404511232,1404512255,HR @@ -18235,10 +18651,7 @@ 1404563456,1404567551,SE 1404567552,1404583935,HR 1404583936,1404600319,NO -1404600320,1404645375,SE -1404645376,1404645887,EE -1404645888,1404677888,SE -1404677889,1404678143,EE +1404600320,1404678143,SE 1404678144,1404680191,HR 1404680192,1404731391,SE 1404731392,1404732159,HR @@ -18304,14 +18717,11 @@ 1404795648,1404795903,SE 1404795904,1404796927,NL 1404796928,1404801023,EE -1404801024,1404802047,SE -1404802048,1404803071,EE +1404801024,1404803071,SE 1404803072,1404803327,LV -1404803328,1404803583,EE +1404803328,1404803583,SE 1404803584,1404804095,LV -1404804096,1404804351,EE -1404804352,1404804607,SE -1404804608,1404805119,EE +1404804096,1404805119,SE 1404805120,1404813311,AT 1404813312,1404815871,EE 1404815872,1404816383,LT @@ -18332,86 +18742,33 @@ 1404870656,1404872703,LT 1404872704,1404874751,SE 1404874752,1404875775,LV -1404875776,1404876799,EE -1404876800,1404887039,SE +1404875776,1404887039,SE 1404887040,1404927999,NL 1404928000,1404944383,SE 1404944384,1404960767,LT -1404960768,1404977151,SE -1404977152,1404977919,EE -1404977920,1404978175,SE -1404978176,1404980223,EE -1404980224,1404980479,SE -1404980480,1404981247,EE -1404981248,1404981503,SE -1404981504,1404983551,EE -1404983552,1404983807,SE -1404983808,1404985087,EE -1404985088,1404985343,SE -1404985344,1404986623,EE -1404986624,1404986879,SE -1404986880,1404987135,EE -1404987136,1404987647,SE -1404987648,1404988415,EE -1404988416,1404988671,SE -1404988672,1404989695,EE -1404989696,1404989951,SE -1404989952,1404990463,EE -1404990464,1404990719,SE -1404990720,1404990975,EE -1404990976,1404991231,SE -1404991232,1404992511,EE -1404992512,1404992767,SE -1404992768,1404993535,EE -1404993536,1405009919,SE -1405009920,1405010687,EE +1404960768,1405009919,SE +1405009920,1405010687,LT 1405010688,1405010943,SE -1405010944,1405011199,EE +1405010944,1405011199,LT 1405011200,1405011711,SE -1405011712,1405013759,EE +1405011712,1405013759,LT 1405013760,1405014015,SE -1405014016,1405020159,EE +1405014016,1405020159,LT 1405020160,1405020415,SE -1405020416,1405020927,EE +1405020416,1405020927,LT 1405020928,1405021183,SE -1405021184,1405021439,EE +1405021184,1405021439,LT 1405021440,1405021951,SE -1405021952,1405022207,EE -1405022208,1405022463,SE -1405022464,1405022719,EE -1405022720,1405023231,SE -1405023232,1405025023,EE -1405025024,1405025279,SE -1405025280,1405026047,EE -1405026048,1405026303,SE +1405021952,1405022207,LT +1405022208,1405026303,SE 1405026304,1405042687,NO -1405042688,1405043711,SE -1405043712,1405044735,EE -1405044736,1405046783,SE -1405046784,1405047039,EE -1405047040,1405047295,SE -1405047296,1405047551,EE -1405047552,1405048831,SE +1405042688,1405048831,SE 1405048832,1405050879,HR 1405050880,1405059071,AT -1405059072,1405060095,SE -1405060096,1405061119,EE -1405061120,1405062143,SE -1405062144,1405062911,EE -1405062912,1405063167,SE +1405059072,1405063167,SE 1405063168,1405067263,NO 1405067264,1405083647,EE -1405083648,1405084415,SE -1405084416,1405087231,EE -1405087232,1405087743,SE -1405087744,1405087999,EE -1405088000,1405088255,SE -1405088256,1405088767,EE -1405088768,1405089535,SE -1405089536,1405089791,EE -1405089792,1405090047,SE -1405090048,1405090559,EE -1405090560,1405091839,SE +1405083648,1405091839,SE 1405091840,1405815295,FR 1405815296,1405815551,MQ 1405815552,1405820927,FR @@ -18443,14 +18800,9 @@ 1406705664,1406708735,IT 1406708736,1406709759,A2 1406709760,1406713855,IT -1406713856,1406717951,AT -1406717952,1406718975,GB -1406718976,1406719103,AT -1406719104,1406719487,GB -1406719488,1406719743,AT +1406713856,1406719743,AT 1406719744,1406719999,GB -1406720000,1406721023,AT -1406721024,1406722047,GB +1406720000,1406722047,AT 1406722048,1406730239,DE 1406730240,1406746623,RU 1406746624,1406754815,BE @@ -18476,9 +18828,7 @@ 1406779392,1406787583,RU 1406787584,1406791167,ES 1406791168,1406791295,GB -1406791296,1406792719,ES -1406792720,1406792735,GB -1406792736,1406793843,ES +1406791296,1406793843,ES 1406793844,1406793847,GB 1406793848,1406794751,ES 1406794752,1406795775,NL @@ -18554,7 +18904,11 @@ 1407549440,1407582207,RU 1407582208,1407614975,PL 1407614976,1407680511,ES -1407680512,1407702271,GB +1407680512,1407695763,GB +1407695764,1407695767,DK +1407695768,1407695771,GB +1407695772,1407695775,DK +1407695776,1407702271,GB 1407702272,1407702527,DE 1407702528,1407711239,GB 1407711240,1407711247,FR @@ -18745,7 +19099,9 @@ 1411874816,1411876863,RU 1411876864,1411878911,EU 1411878912,1411880959,CH -1411880960,1411881215,DE +1411880960,1411880990,DE +1411880991,1411880991,GB +1411880992,1411881215,DE 1411881216,1411881471,US 1411881472,1411883007,DE 1411883008,1411887103,PL @@ -18758,7 +19114,8 @@ 1411907584,1411911679,EU 1411911680,1411915775,US 1411915776,1411919871,EU -1411919872,1411923967,DE +1411919872,1411921919,DE +1411921920,1411923967,EU 1411923968,1411940351,BG 1411940352,1411973119,PL 1411973120,1411999743,SI @@ -18842,7 +19199,9 @@ 1422393344,1422413567,DE 1422413568,1422413695,AT 1422413696,1422413727,US -1422413728,1422491647,DE +1422413728,1422463231,DE +1422463232,1422463743,NL +1422463744,1422491647,DE 1422491648,1422495615,RU 1422495616,1422495679,NL 1422495680,1422508031,RU @@ -18863,7 +19222,9 @@ 1422786560,1422852095,HU 1422852096,1422857087,EU 1422857088,1422857151,FR -1422857152,1422916607,EU +1422857152,1422910207,EU +1422910208,1422910463,NL +1422910464,1422916607,EU 1422916608,1422916863,GB 1422916864,1422917119,EU 1422917120,1422917343,GB @@ -18875,7 +19236,9 @@ 1423966208,1424097279,HU 1424097280,1424228351,CH 1424228352,1424286719,IL -1424286720,1424287743,BG +1424286720,1424286938,BG +1424286939,1424286939,IL +1424286940,1424287743,BG 1424287744,1424359423,IL 1424359424,1424490495,FI 1424490496,1424503711,ES @@ -18895,7 +19258,9 @@ 1424602880,1424603135,US 1424603136,1424604671,GB 1424604672,1424604927,EU -1424604928,1424607743,GB +1424604928,1424604975,GB +1424604976,1424604983,NL +1424604984,1424607743,GB 1424607744,1424607775,DE 1424607776,1424617215,GB 1424617216,1424617231,IT @@ -18992,7 +19357,11 @@ 1425506304,1425522687,NO 1425522688,1425539071,IT 1425539072,1425801215,FI -1425801216,1425817599,BG +1425801216,1425813759,BG +1425813760,1425814015,MK +1425814016,1425814271,BG +1425814272,1425814527,MK +1425814528,1425817599,BG 1425820160,1425820415,DE 1425833984,1425850367,RU 1425850368,1425866751,GB @@ -19084,11 +19453,11 @@ 1427722032,1427722033,SG 1427722034,1427728088,DE 1427728089,1427728100,SG -1427728101,1427739889,DE +1427728101,1427728599,DE +1427728600,1427728600,SK +1427728601,1427739889,DE 1427739890,1427739890,RU -1427739891,1427741358,DE -1427741359,1427741359,EG -1427741360,1427741372,DE +1427739891,1427741372,DE 1427741373,1427741373,AT 1427741374,1427767295,DE 1427767296,1427800063,BE @@ -19123,16 +19492,7 @@ 1428137984,1428140031,GB 1428140032,1428142079,RU 1428142080,1428144127,DE -1428144128,1428145151,FR -1428145152,1428147519,GB -1428147520,1428147583,FR -1428147584,1428147711,GB -1428147712,1428148223,FR -1428148224,1428148735,GB -1428148736,1428148991,FR -1428148992,1428151807,GB -1428151808,1428152063,FR -1428152064,1428152319,GB +1428144128,1428152319,FR 1428152320,1428160511,PL 1428160512,1428260863,IT 1428260864,1428261119,GB @@ -19272,7 +19632,6 @@ 1433755648,1433763839,EE 1433763840,1433772031,FR 1433772032,1433788415,SE -1433788416,1433796607,UZ 1433796608,1433804799,GB 1433804800,1433812991,FR 1433812992,1433821183,BG @@ -19333,7 +19692,9 @@ 1434451968,1434517503,PL 1434517504,1434550271,DK 1434550272,1434583039,SA -1434583040,1434611711,BG +1434583040,1434595327,BG +1434595328,1434596351,MK +1434596352,1434611711,BG 1434611712,1434613759,MK 1434613760,1434615807,BG 1434615808,1434648575,IL @@ -19510,7 +19871,9 @@ 1439346688,1439350783,RU 1439354880,1439358975,PL 1439358976,1439367167,RU -1439367168,1439399935,NL +1439367168,1439373311,NL +1439373312,1439373567,SE +1439373568,1439399935,NL 1439399936,1439432703,DK 1439432704,1439477759,RO 1439477760,1439479807,MD @@ -19566,8 +19929,11 @@ 1440514048,1440546815,DE 1440546816,1440579583,NO 1440579584,1440645119,PL -1440645120,1440677887,RS -1440677888,1440710655,NL +1440645120,1440669695,RS +1440669696,1440671743,NL +1440671744,1440672767,EE +1440672768,1440673791,RS +1440673792,1440710655,NL 1440710656,1440743423,UA 1440743424,1441267711,SE 1441267712,1441275903,DE @@ -19633,8 +19999,7 @@ 1441677312,1441685503,HU 1441685504,1441693695,UA 1441693696,1441694719,BR -1441694720,1441695743,DE -1441695744,1441696767,US +1441694720,1441696767,DE 1441696768,1441697023,AP 1441697024,1441697791,SG 1441697792,1441698815,US @@ -19739,7 +20104,9 @@ 1449840640,1449852927,MD 1449852928,1449869311,RO 1449869312,1449870335,MD -1449870336,1449893887,RO +1449870336,1449883647,RO +1449883648,1449885695,BE +1449885696,1449893887,RO 1449893888,1449895935,MD 1449895936,1449918463,RO 1449918464,1449951231,JO @@ -19817,7 +20184,9 @@ 1466104468,1466104468,GB 1466104469,1466104942,FR 1466104943,1466104943,BE -1466104944,1466105343,FR +1466104944,1466105173,FR +1466105174,1466105174,BE +1466105175,1466105343,FR 1466105344,1466105599,GB 1466105600,1466105855,FR 1466105856,1466122239,PL @@ -19863,7 +20232,9 @@ 1467285504,1467301887,RU 1467301888,1467318271,GB 1467318272,1467334655,RU -1467334656,1467351039,GB +1467334656,1467346495,GB +1467346496,1467346559,A1 +1467346560,1467351039,GB 1467351040,1467367423,NO 1467367424,1467383807,DE 1467383808,1467400191,BG @@ -19879,7 +20250,9 @@ 1467465984,1467466015,NL 1467466016,1467466495,DE 1467466496,1467466751,NL -1467466752,1467472895,DE +1467466752,1467468543,DE +1467468544,1467468799,A1 +1467468800,1467472895,DE 1467472896,1467473919,NL 1467473920,1467482111,RU 1467482112,1467613183,BG @@ -19988,7 +20361,9 @@ 1475211264,1475213311,DE 1475213312,1475215359,FR 1475215360,1475223551,IT -1475223552,1475226495,SE +1475223552,1475226239,SE +1475226240,1475226367,NO +1475226368,1475226495,SE 1475226496,1475227647,NO 1475227648,1475231743,SE 1475231744,1475233791,NO @@ -20064,9 +20439,7 @@ 1475575808,1475592191,AT 1475592192,1475608575,GB 1475608576,1475624959,RU -1475624960,1475634431,JE -1475634432,1475634495,GB -1475634496,1475637303,JE +1475624960,1475637303,JE 1475637304,1475637311,GB 1475637312,1475637471,JE 1475637472,1475637479,GB @@ -20098,7 +20471,9 @@ 1475726080,1475726335,RU 1475726336,1475729663,GB 1475729664,1475729671,UA -1475729672,1475738111,GB +1475729672,1475731007,GB +1475731008,1475731071,UA +1475731072,1475738111,GB 1475738112,1475738879,RU 1475738880,1475739647,GB 1475739648,1475756031,BG @@ -20292,8 +20667,11 @@ 1485242368,1485246463,RU 1485246464,1485250559,UA 1485250560,1485254655,IR -1485254656,1485258751,RU -1485258752,1485266943,UA +1485254656,1485259007,RU +1485259008,1485262847,UA +1485262848,1485263615,RU +1485263616,1485263871,UA +1485263872,1485266943,RU 1485266944,1485271039,RO 1485271040,1485275135,UA 1485275136,1485283327,LV @@ -20378,8 +20756,11 @@ 1489644032,1489644287,EU 1489644288,1489644543,FR 1489644544,1489644799,IQ -1489644800,1489647615,EU -1489647616,1489648639,IT +1489644800,1489645055,IT +1489645056,1489645823,EU +1489645824,1489646079,IT +1489646080,1489648383,EU +1489648384,1489648639,GR 1489648640,1489649158,EU 1489649159,1489649159,US 1489649160,1489649663,EU @@ -20390,7 +20771,9 @@ 1489657856,1489659903,IT 1489659904,1489660159,EU 1489660160,1489660415,LY -1489660416,1489666047,EU +1489660416,1489662975,EU +1489662976,1489663487,IT +1489663488,1489666047,EU 1489666048,1489674239,GB 1489674240,1489676287,NL 1489676288,1489698815,GB @@ -20407,26 +20790,22 @@ 1490028544,1490029055,UA 1490029056,1490042879,NL 1490042880,1490053375,CZ -1490053376,1490054143,PL -1490054144,1490059263,CZ +1490053376,1490053631,PL +1490053632,1490059263,CZ 1490059264,1490075647,DE 1490075648,1490092031,GB 1490092032,1490108415,DE 1490108416,1490124799,MC 1490124800,1490141183,HU -1490141184,1490142719,US +1490141184,1490142719,CZ 1490142720,1490143231,HU -1490143232,1490143999,US +1490143232,1490143999,CZ 1490144000,1490144255,HU -1490144256,1490145279,US -1490145280,1490146559,CZ +1490144256,1490146559,CZ 1490146560,1490146815,HU -1490146816,1490147327,CZ -1490147328,1490148863,US +1490146816,1490148863,CZ 1490148864,1490149119,HU -1490149120,1490149375,US -1490149376,1490150399,HU -1490150400,1490151679,CZ +1490149120,1490151679,CZ 1490151680,1490151935,HU 1490151936,1490153983,CZ 1490153984,1490154239,HU @@ -20617,7 +20996,8 @@ 1495151616,1495153663,FR 1495153664,1495160239,EU 1495160240,1495160255,FR -1495160256,1495163551,EU +1495160256,1495160263,GB +1495160264,1495163551,EU 1495163552,1495163567,FR 1495163568,1495168767,EU 1495168768,1495169023,GB @@ -20629,7 +21009,6 @@ 1495203840,1495205887,DE 1495205888,1495207935,CZ 1495207936,1495209983,RU -1495209984,1495212031,KZ 1495212032,1495214079,RU 1495214080,1495216127,CZ 1495216128,1495220223,IT @@ -20656,8 +21035,8 @@ 1495265280,1495267327,US 1495267328,1495269375,SE 1495269376,1495283711,RO -1495283712,1495285759,MD -1495285760,1495304191,RO +1495283712,1495287807,MD +1495287808,1495304191,RO 1495304192,1495306239,MD 1495306240,1495306573,GB 1495306574,1495306574,RO @@ -20665,14 +21044,16 @@ 1495308288,1495313407,RO 1495313408,1495314431,MD 1495314432,1495326719,RO -1495326720,1495332863,MD -1495332864,1495333887,RO -1495333888,1495335935,MD +1495326720,1495335935,MD 1495335936,1495416831,RO 1495416832,1495418879,MD 1495418880,1495429119,RO 1495429120,1495431167,MD -1495431168,1495449599,RO +1495431168,1495442431,RO +1495442432,1495443455,MD +1495443456,1495446527,RO +1495446528,1495447551,MD +1495447552,1495449599,RO 1495449600,1495451647,MD 1495451648,1495452671,RO 1495452672,1495453695,MD @@ -20682,13 +21063,21 @@ 1495468032,1495470079,MD 1495470080,1495476223,RO 1495476224,1495478271,MD -1495478272,1495517183,RO +1495478272,1495487487,RO +1495487488,1495488511,MD +1495488512,1495492607,RO +1495492608,1495494655,MD +1495494656,1495508991,RO +1495508992,1495510015,MD +1495510016,1495517183,RO 1495517184,1495518207,MD 1495518208,1495571455,RO 1495571456,1495572479,MD 1495572480,1495608319,RO 1495608320,1495609343,MD -1495609344,1495670783,RO +1495609344,1495623679,RO +1495623680,1495623935,MD +1495623936,1495670783,RO 1495670784,1495671807,MD 1495671808,1495678975,RO 1495678976,1495679999,MD @@ -20696,7 +21085,9 @@ 1495682048,1495683071,MD 1495683072,1495747583,RO 1495747584,1495748607,MD -1495748608,1495749631,RO +1495748608,1495748863,RO +1495748864,1495749119,GB +1495749120,1495749631,RO 1495749632,1495750655,MD 1495750656,1495752703,RO 1495752704,1495755775,MD @@ -20704,9 +21095,17 @@ 1495756800,1495758847,MD 1495758848,1495759871,RO 1495759872,1495760127,MD -1495760128,1495790079,RO +1495760128,1495762943,RO +1495762944,1495764991,MD +1495764992,1495782655,RO +1495782656,1495782911,GB +1495782912,1495790079,RO 1495790080,1495790335,MD -1495790336,1495852031,RO +1495790336,1495793663,RO +1495793664,1495795711,MD +1495795712,1495845631,RO +1495845632,1495845887,GB +1495845888,1495852031,RO 1495852032,1495853055,MD 1495853056,1495875583,RO 1495875584,1495891967,MD @@ -20718,17 +21117,25 @@ 1495951360,1495952383,MD 1495952384,1495957503,RO 1495957504,1495958527,MD -1495958528,1495970815,RO +1495958528,1495966719,RO +1495966720,1495967743,MD +1495967744,1495970815,RO 1495970816,1495971839,MD 1495971840,1495982079,RO 1495982080,1495983103,MD -1495983104,1496018943,RO +1495983104,1495986175,RO +1495986176,1495988223,MD +1495988224,1496004607,RO +1496004608,1496005631,MD +1496005632,1496018943,RO 1496018944,1496020991,MD 1496020992,1496023039,RO 1496023040,1496024063,MD 1496024064,1496033279,RO 1496033280,1496034303,MD -1496034304,1496078335,RO +1496034304,1496053759,RO +1496053760,1496055807,MD +1496055808,1496078335,RO 1496078336,1496079359,MD 1496079360,1496084991,RO 1496084992,1496085247,MD @@ -20742,7 +21149,9 @@ 1496197120,1496197631,MD 1496197632,1496228863,RO 1496228864,1496229887,MD -1496229888,1496262911,RO +1496229888,1496238079,RO +1496238080,1496240127,MD +1496240128,1496262911,RO 1496262912,1496263167,US 1496263168,1496276735,RO 1496276736,1496276991,MD @@ -20833,7 +21242,11 @@ 1500479488,1500495871,RU 1500495872,1500512255,BA 1500512256,1500643327,RU -1500643328,1500774399,RO +1500643328,1500661247,PT +1500661248,1500661503,RO +1500661504,1500667647,PT +1500667648,1500667903,RO +1500667904,1500774399,PT 1500774400,1500905471,LT 1500905472,1501036543,IT 1501036544,1501154047,RO @@ -20984,9 +21397,7 @@ 1503898808,1503898815,PL 1503898816,1503898831,GB 1503898832,1503898839,RO -1503898840,1503898847,DE -1503898848,1503898855,MX -1503898856,1503898887,DE +1503898840,1503898887,DE 1503898888,1503898895,IT 1503898896,1503898927,DE 1503898928,1503898935,RO @@ -21077,7 +21488,19 @@ 1503904344,1503904351,BE 1503904352,1503904367,DE 1503904368,1503904375,CH -1503904376,1503920127,DE +1503904376,1503905551,DE +1503905552,1503905559,CH +1503905560,1503905567,ES +1503905568,1503905583,DE +1503905584,1503905591,YE +1503905592,1503905599,DE +1503905600,1503905607,BE +1503905608,1503905615,DE +1503905616,1503905623,FI +1503905624,1503905647,DE +1503905648,1503905655,IT +1503905656,1503905663,AT +1503905664,1503920127,DE 1503920128,1503985151,HR 1503985152,1503985407,DE 1503985408,1503985663,HR @@ -21176,8 +21599,23 @@ 1505755136,1506017279,GB 1506017280,1506082815,IR 1506082816,1506148351,GB -1506148352,1506213887,IR -1506213888,1506279423,DE +1506148352,1506218751,IR +1506218752,1506219007,DE +1506219008,1506219263,IR +1506219264,1506219519,DE +1506219520,1506219775,IR +1506219776,1506220031,DE +1506220032,1506261759,IR +1506261760,1506262783,DE +1506262784,1506265343,IR +1506265344,1506267135,DE +1506267136,1506270207,IR +1506270208,1506271231,DE +1506271232,1506274303,IR +1506274304,1506274559,DE +1506274560,1506274815,IR +1506274816,1506275071,DE +1506275072,1506279423,IR 1506279424,1506312191,NL 1506312192,1506316287,GB 1506316288,1506322431,PL @@ -21196,15 +21634,17 @@ 1506410496,1506422063,DE 1506422064,1506422079,GB 1506422080,1506443263,DE -1506443264,1506445087,GB -1506445088,1506445119,DE +1506443264,1506445103,GB +1506445104,1506445119,DE 1506445120,1506445135,GB 1506445136,1506445151,DE 1506445152,1506445167,GB 1506445168,1506445183,DE 1506445184,1506446823,GB 1506446824,1506446831,NL -1506446832,1506450047,GB +1506446832,1506448319,GB +1506448320,1506448383,IT +1506448384,1506450047,GB 1506450048,1506450111,CH 1506450112,1506450863,GB 1506450864,1506450879,CZ @@ -21218,7 +21658,9 @@ 1506459178,1506459178,EU 1506459179,1506460151,GB 1506460152,1506460159,FR -1506460160,1506463679,GB +1506460160,1506462719,GB +1506462720,1506462975,IT +1506462976,1506463679,GB 1506463680,1506463695,DE 1506463696,1506464895,GB 1506464896,1506464911,NL @@ -21255,7 +21697,6 @@ 1506705408,1506727935,GB 1506727936,1506728959,FR 1506728960,1506740223,GB -1506740224,1506742271,FI 1506742272,1506744319,SE 1506744320,1506746367,NL 1506746368,1506750463,RU @@ -21339,7 +21780,9 @@ 1508622336,1508638719,EE 1508638720,1508639999,SE 1508640000,1508640255,DK -1508640256,1508642559,SE +1508640256,1508642175,SE +1508642176,1508642303,DK +1508642304,1508642559,SE 1508642560,1508642815,DK 1508642816,1508650751,SE 1508650752,1508651007,DK @@ -21656,7 +22099,8 @@ 1514140672,1514142207,RE 1514142208,1514142463,FR 1514142464,1514143743,RE -1514143744,1515192639,FR +1514143744,1514176511,SK +1514176512,1515192639,FR 1515192640,1515192655,EU 1515192656,1515467007,FR 1515467008,1515467263,ES @@ -21677,22 +22121,19 @@ 1515489152,1515489167,ES 1515489168,1518338047,FR 1518338048,1518370815,DE -1518370816,1518403583,NL -1518403584,1518436351,SE -1518436352,1518439679,NO -1518439680,1518439935,SE -1518439936,1518441471,NO -1518441472,1518441727,SE -1518441728,1518444031,NO -1518444032,1518444287,SE -1518444288,1518444543,NO -1518444544,1518444799,SE -1518444800,1518445823,NO -1518445824,1518446335,SE -1518446336,1518448383,NO -1518448384,1518448895,SE -1518448896,1518452223,NO -1518452224,1518452735,SE +1518370816,1518403839,NL +1518403840,1518404095,SE +1518404096,1518404351,NL +1518404352,1518404863,SE +1518404864,1518405119,NL +1518405120,1518405375,SE +1518405376,1518406655,NL +1518406656,1518406911,SE +1518406912,1518407935,NL +1518407936,1518408191,SE +1518408192,1518409727,NL +1518409728,1518436351,SE +1518436352,1518452735,NO 1518452736,1518460927,AT 1518460928,1518470143,NL 1518470144,1518472191,SE @@ -21710,10 +22151,54 @@ 1518510080,1518516223,LV 1518516224,1518517247,SE 1518517248,1518518271,LV -1518518272,1518542847,SE +1518518272,1518540543,SE +1518540544,1518540799,LT +1518540800,1518542847,SE 1518542848,1518551039,LT 1518551040,1518565375,NL -1518565376,1518633215,SE +1518565376,1518567423,SE +1518567424,1518568703,LV +1518568704,1518568959,SE +1518568960,1518570239,LV +1518570240,1518570495,SE +1518570496,1518572543,LV +1518572544,1518572799,SE +1518572800,1518573311,LV +1518573312,1518573823,SE +1518573824,1518574335,LV +1518574336,1518574591,SE +1518574592,1518576127,LV +1518576128,1518576383,SE +1518576384,1518577407,LV +1518577408,1518577919,SE +1518577920,1518578687,LV +1518578688,1518578943,SE +1518578944,1518580479,LV +1518580480,1518580735,SE +1518580736,1518582271,LV +1518582272,1518582527,SE +1518582528,1518583039,LV +1518583040,1518583295,SE +1518583296,1518585343,LV +1518585344,1518585599,SE +1518585600,1518585855,LV +1518585856,1518586111,SE +1518586112,1518586623,LV +1518586624,1518586879,SE +1518586880,1518587647,LV +1518587648,1518587903,SE +1518587904,1518591743,LV +1518591744,1518591999,SE +1518592000,1518592255,LV +1518592256,1518592511,SE +1518592512,1518594047,LV +1518594048,1518594303,SE +1518594304,1518594815,LV +1518594816,1518595071,SE +1518595072,1518595327,LV +1518595328,1518595583,SE +1518595584,1518600191,LV +1518600192,1518633215,SE 1518633216,1518633471,NL 1518633472,1518635007,SE 1518635008,1518637055,NL @@ -21740,7 +22225,15 @@ 1518993408,1519190015,RU 1519190016,1519206399,SE 1519206400,1519208447,LV -1519208448,1519259647,SE +1519208448,1519214591,SE +1519214592,1519214847,LV +1519214848,1519215359,SE +1519215360,1519215615,LV +1519215616,1519215871,SE +1519215872,1519219455,LV +1519219456,1519219711,SE +1519219712,1519222783,LV +1519222784,1519259647,SE 1519259648,1519260671,NL 1519260672,1519263743,SE 1519263744,1519289343,NL @@ -21750,7 +22243,9 @@ 1519297024,1519297279,LT 1519297280,1519297535,SE 1519297536,1519297791,LT -1519297792,1519300607,SE +1519297792,1519298559,SE +1519298560,1519298815,LT +1519298816,1519300607,SE 1519300608,1519304703,LT 1519304704,1519313151,SE 1519313152,1519313407,LT @@ -21979,9 +22474,25 @@ 1534714416,1534714431,ES 1534714432,1534714751,FR 1534714752,1534714767,DE -1534714768,1534717663,FR +1534714768,1534715263,FR +1534715264,1534715267,IT +1534715268,1534715871,FR +1534715872,1534715875,ES +1534715876,1534715935,FR +1534715936,1534715939,NL +1534715940,1534716375,FR +1534716376,1534716379,ES +1534716380,1534717199,FR +1534717200,1534717215,GB +1534717216,1534717247,FR +1534717248,1534717251,ES +1534717252,1534717263,FR +1534717264,1534717267,ES +1534717268,1534717663,FR 1534717664,1534717679,GB -1534717680,1534718763,FR +1534717680,1534717923,FR +1534717924,1534717927,IT +1534717928,1534718763,FR 1534718764,1534718767,ES 1534718768,1534719747,FR 1534719748,1534719751,ES @@ -21989,9 +22500,12 @@ 1534719784,1534719787,ES 1534719788,1534720003,FR 1534720004,1534720007,ES -1534720008,1534720023,FR +1534720008,1534720011,IT +1534720012,1534720023,FR 1534720024,1534720027,PL -1534720028,1534720471,FR +1534720028,1534720179,FR +1534720180,1534720183,ES +1534720184,1534720471,FR 1534720472,1534720479,DE 1534720480,1534721619,FR 1534721620,1534721623,ES @@ -22017,7 +22531,8 @@ 1534985216,1535049727,ES 1535049728,1535115263,SK 1535115264,1535197183,AT -1535197184,1535246335,SE +1535197184,1535203071,EE +1535203072,1535246335,SE 1535246336,1535311871,AT 1535311872,1535344639,NO 1535344640,1535350783,LV @@ -22025,7 +22540,8 @@ 1535352832,1535361023,EE 1535361024,1535377407,NL 1535377408,1535442943,GR -1535442944,1535451135,FI +1535442944,1535450879,RU +1535450880,1535451135,FI 1535451136,1535459327,DK 1535459328,1535475711,AT 1535475712,1535508479,IR @@ -22104,8 +22620,7 @@ 1536114688,1536118783,GB 1536118784,1536122879,DE 1536122880,1536126975,AT -1536126976,1536130815,DK -1536130816,1536131071,EU +1536126976,1536131071,DK 1536131072,1536143359,RU 1536143360,1536147455,GB 1536147456,1536151551,IT @@ -22190,8 +22705,8 @@ 1538932736,1538940927,NO 1538940928,1538949119,RU 1538949120,1538957311,AT -1538957312,1538965119,DE -1538965120,1538965247,GB +1538957312,1538964991,DE +1538964992,1538965247,GB 1538965248,1538965503,DE 1538965504,1538973695,IR 1538973696,1538981887,JO @@ -22647,7 +23162,8 @@ 1539650560,1539651583,RU 1539651584,1539652607,UA 1539652608,1539653631,IL -1539653632,1539655679,RU +1539653632,1539654655,RU +1539654656,1539655679,UA 1539655680,1539656703,NL 1539656704,1539657727,RU 1539657728,1539658751,UA @@ -23154,7 +23670,8 @@ 1539865600,1539866623,UA 1539866624,1539867647,IT 1539867648,1539868671,RO -1539868672,1539869695,UA +1539868672,1539868927,UA +1539868928,1539869695,RU 1539869696,1539870719,ES 1539870720,1539871743,IL 1539872768,1539873791,SE @@ -23200,7 +23717,6 @@ 1539927040,1539928063,UA 1539928064,1539930111,RU 1539930112,1539931135,PL -1539931136,1539932159,UA 1539932160,1539933183,DE 1539933184,1539934207,ES 1539934208,1539935231,RS @@ -23658,8 +24174,7 @@ 1540361472,1540361727,DE 1540361728,1540361983,IT 1540361984,1540362239,EE -1540362240,1540362495,RU -1540362496,1540363007,DE +1540362240,1540363263,DE 1540363264,1540363519,RU 1540363776,1540364031,IS 1540364032,1540364287,RU @@ -24645,7 +25160,9 @@ 1540779008,1540780031,NL 1540780032,1540781055,UA 1540781056,1540783103,RU -1540783104,1540787199,UA +1540783104,1540784639,UA +1540784640,1540784895,RU +1540784896,1540787199,UA 1540787200,1540788223,KZ 1540788224,1540790271,RU 1540790272,1540791295,KW @@ -25062,7 +25579,7 @@ 1540995584,1540995839,SE 1540995840,1540996095,RO 1540996096,1540996351,DE -1540996352,1540996607,NL +1540996352,1540996607,SE 1540996608,1540996863,RU 1540996864,1540997119,NL 1540997120,1540997375,RU @@ -25091,7 +25608,6 @@ 1541004288,1541004543,RU 1541004544,1541004799,PL 1541004800,1541005055,SI -1541005056,1541005311,NL 1541005312,1541005567,PL 1541005568,1541006079,AT 1541006080,1541006335,RU @@ -25130,7 +25646,6 @@ 1541024768,1541026815,UA 1541026816,1541027839,LV 1541028864,1541029887,PL -1541029888,1541030911,UA 1541030912,1541031935,PL 1541031936,1541032959,UA 1541032960,1541033983,PL @@ -25293,7 +25808,7 @@ 1541163520,1541163775,DE 1541163776,1541164031,RO 1541164032,1541164287,RU -1541164288,1541164543,HR +1541164288,1541164543,CH 1541164544,1541164799,SI 1541164800,1541165055,IR 1541165056,1541165311,UA @@ -25971,7 +26486,6 @@ 1541468160,1541468671,ES 1541468672,1541469183,NL 1541469184,1541469695,SE -1541469696,1541470207,LV 1541470208,1541470719,NL 1541470720,1541471231,RS 1541471232,1541472255,UA @@ -26050,7 +26564,6 @@ 1541556224,1541556479,UA 1541556480,1541556735,RU 1541556736,1541557247,IT -1541557248,1541557503,RU 1541557504,1541557759,SI 1541557760,1541558015,RU 1541558016,1541558271,HU @@ -26228,7 +26741,7 @@ 1541662720,1541663743,CZ 1541663744,1541664767,RO 1541664768,1541666047,RU -1541666048,1541666815,GB +1541666048,1541666303,GB 1541666816,1541667839,NO 1541667840,1541668095,CH 1541668352,1541668607,UA @@ -26297,7 +26810,7 @@ 1541707520,1541707775,NL 1541707776,1541708799,DE 1541708800,1541709823,PL -1541709824,1541710335,RU +1541710080,1541710335,RU 1541710336,1541710847,IL 1541710848,1541711871,SK 1541711872,1541712127,FR @@ -26426,6 +26939,7 @@ 1541781248,1541781503,RO 1541781504,1541781759,TR 1541781760,1541782015,RU +1541782016,1541782271,RO 1541782272,1541782527,GB 1541782528,1541783551,RU 1541783552,1541783807,IE @@ -26533,10 +27047,9 @@ 1541834496,1541834751,RU 1541835776,1541836287,CH 1541836288,1541836543,AT -1541836544,1541836799,RU 1541836800,1541837055,CZ 1541837056,1541837311,IT -1541837312,1541837823,RU +1541837312,1541837567,RU 1541837824,1541838079,PL 1541838080,1541839871,RU 1541839872,1541840383,PL @@ -26735,7 +27248,6 @@ 1541954560,1541955583,RU 1541955584,1541956095,DE 1541956096,1541956351,RO -1541956352,1541956607,UA 1541956608,1541957119,LB 1541957120,1541957375,PL 1541957376,1541957631,UA @@ -26744,7 +27256,8 @@ 1541958144,1541958655,RS 1541958656,1541959679,RU 1541959680,1541959935,PL -1541959936,1541960703,RU +1541959936,1541960191,RU +1541960192,1541960703,NL 1541960704,1541961727,UA 1541961728,1541962751,RU 1541962752,1541963263,GB @@ -26773,8 +27286,7 @@ 1541977344,1541977599,GB 1541977600,1541977855,RO 1541977856,1541978111,PL -1541978112,1541978623,RO -1541978624,1541978879,MD +1541978112,1541978879,RO 1541978880,1541979135,FR 1541979136,1541979647,RU 1541979648,1541981183,PL @@ -26782,7 +27294,6 @@ 1541981952,1541982207,UA 1541982208,1541982719,RS 1541982720,1541984255,RU -1541984256,1541984511,UA 1541984512,1541984767,BG 1541984768,1541985279,RO 1541985280,1541986303,CZ @@ -26796,7 +27307,6 @@ 1541989888,1541990399,RU 1541990400,1541990911,AT 1541990912,1541991167,SI -1541991168,1541991423,RU 1541991424,1541991935,RS 1541991936,1541992191,UA 1541992192,1541992447,SI @@ -26807,7 +27317,6 @@ 1541994496,1541995519,PL 1541995520,1541996031,RU 1541996032,1541996287,RO -1541996288,1541996543,RU 1541996544,1541997567,RO 1541997568,1541997823,RU 1541997824,1541998079,GB @@ -26910,7 +27419,8 @@ 1542060288,1542060543,RO 1542060544,1542061055,PL 1542061056,1542062079,IT -1542062080,1542064127,UA +1542062080,1542063103,UA +1542063104,1542064127,RU 1542064128,1542064383,PL 1542064384,1542064639,FR 1542064640,1542065151,RU @@ -27015,7 +27525,6 @@ 1542124800,1542125567,PL 1542125568,1542126591,CZ 1542126592,1542127103,PL -1542127104,1542127359,GB 1542127360,1542127615,RU 1542127616,1542128127,PL 1542128128,1542128383,RU @@ -27170,8 +27679,7 @@ 1542218752,1542220031,RU 1542220032,1542220287,PL 1542220288,1542220799,DE -1542220800,1542222591,RU -1542222592,1542222847,PK +1542220800,1542222847,RU 1542222848,1542223103,SE 1542223104,1542223359,GB 1542223360,1542223871,UA @@ -27943,7 +28451,9 @@ 1546001408,1546002943,RU 1546002944,1546003199,UA 1546003200,1546003455,RU -1546003456,1546005247,CZ +1546003456,1546004479,CZ +1546004480,1546004735,UA +1546004736,1546005247,CZ 1546005248,1546006527,RU 1546006528,1546008575,UA 1546008576,1546010623,BY @@ -27965,11 +28475,12 @@ 1546104832,1546108927,IE 1546108928,1546113023,IM 1546113024,1546121215,RU -1546121216,1546121855,FR -1546121856,1546121856,IT -1546121857,1546121983,FR +1546121216,1546121727,FR +1546121728,1546121983,IT 1546121984,1546121987,ES -1546121988,1546122649,FR +1546121988,1546122463,FR +1546122464,1546122479,DZ +1546122480,1546122649,FR 1546122650,1546122650,PT 1546122651,1546125311,FR 1546125312,1546256383,GB @@ -28193,7 +28704,9 @@ 1548159488,1548159999,GB 1548160000,1548160255,NL 1548160256,1548160511,PL -1548160512,1548169215,NL +1548160512,1548162479,NL +1548162480,1548162495,FR +1548162496,1548169215,NL 1548169216,1548171263,DE 1548171264,1548172287,FR 1548172288,1548173311,GB @@ -28348,7 +28861,9 @@ 1556491205,1556491205,EU 1556491206,1557921791,DE 1557921792,1558052863,NO -1558052864,1558118399,FR +1558052864,1558054399,FR +1558054400,1558054655,DE +1558054656,1558118399,FR 1558118400,1558119423,DE 1558119424,1558122495,RU 1558122496,1558151167,AT @@ -28426,8 +28941,11 @@ 1560018944,1560051711,DE 1560051712,1560084479,RU 1560084480,1560117247,JO -1560117248,1560135679,CZ -1560135680,1560137727,RU +1560117248,1560133631,CZ +1560133632,1560135679,RU +1560135680,1560135807,UA +1560135808,1560135935,CZ +1560135936,1560137727,RU 1560137728,1560150015,CZ 1560150016,1560182783,NL 1560182784,1560215551,SE @@ -28653,9 +29171,13 @@ 1567708672,1567709183,MD 1567709184,1567710207,RO 1567710208,1567711231,MD -1567711232,1567715327,RO +1567711232,1567713279,RO +1567713280,1567714303,MD +1567714304,1567715327,RO 1567715328,1567717375,MD -1567717376,1567742975,RO +1567717376,1567727359,RO +1567727360,1567727615,GB +1567727616,1567742975,RO 1567742976,1567743487,MD 1567743488,1567749119,RO 1567749120,1567750143,MD @@ -28676,9 +29198,9 @@ 1567831040,1567838207,RO 1567838208,1567842303,A1 1567842304,1567852543,RO -1567852544,1567854591,MD -1567854592,1567875071,RO -1567875072,1567879167,MD +1567852544,1567856639,MD +1567856640,1567873023,RO +1567873024,1567879167,MD 1567879168,1567880191,RO 1567880192,1567881215,SE 1567881216,1567883519,RO @@ -28719,9 +29241,12 @@ 1567984640,1567987711,MD 1567987712,1567988735,RO 1567988736,1567992831,MD -1567992832,1567997951,RO +1567992832,1567993343,RO +1567993344,1567993599,GB +1567993600,1567997951,RO 1567997952,1568014335,NL -1568014336,1568026623,RO +1568014336,1568022527,DE +1568022528,1568026623,RO 1568026624,1568030719,MD 1568030720,1568059391,RO 1568059392,1568063487,MD @@ -28867,7 +29392,7 @@ 1570686976,1570693119,NL 1570693120,1570695167,RU 1570695168,1570696191,PL -1570696192,1570697215,BR +1570696192,1570697215,NL 1570697216,1570701311,RU 1570701312,1570717695,PL 1570717696,1570725887,HR @@ -28906,38 +29431,46 @@ 1571436288,1571436543,UA 1571436544,1571438591,RU 1571438592,1571440639,UA -1571440640,1571441407,CZ +1571440640,1571440895,RU +1571440896,1571441407,CZ 1571441408,1571441663,UA 1571441664,1571441919,RU -1571441920,1571442687,CZ +1571441920,1571442175,CZ +1571442176,1571442687,NL 1571442688,1571443199,UA -1571443200,1571443455,RU -1571443456,1571443711,UA -1571443712,1571445247,CZ +1571443200,1571443711,RU +1571443712,1571444991,CZ +1571444992,1571445247,UA 1571445248,1571446271,NL 1571446272,1571446783,CZ 1571446784,1571447039,GB 1571447040,1571447295,CZ 1571447296,1571447807,RU -1571447808,1571448831,CZ +1571447808,1571448063,CZ +1571448064,1571448319,RU +1571448320,1571448831,CZ 1571448832,1571449343,NL 1571449344,1571449855,CZ 1571449856,1571450879,RU -1571450880,1571451903,UA -1571451904,1571453951,CZ +1571450880,1571452927,UA +1571452928,1571453951,CZ 1571453952,1571455999,RU 1571456000,1571456511,UA -1571456512,1571457535,CZ +1571456512,1571456767,CZ +1571456768,1571457023,UA +1571457024,1571457535,CZ 1571457536,1571458047,RU 1571458048,1571459071,CZ 1571459072,1571463167,UA 1571463168,1571469311,CZ -1571469312,1571470335,RU -1571470336,1571471359,CZ +1571469312,1571469823,BY +1571469824,1571470847,CZ +1571470848,1571471103,RU +1571471104,1571471359,CZ 1571471360,1571475455,RU 1571475456,1571476479,CZ -1571476480,1571477503,RU -1571477504,1571487743,CZ +1571476480,1571478527,RU +1571478528,1571487743,CZ 1571487744,1571495935,SK 1571495936,1571504127,CZ 1571504128,1571508223,UA @@ -28953,8 +29486,7 @@ 1571529728,1571530239,RU 1571530240,1571531263,CZ 1571531264,1571531775,UA -1571531776,1571532799,RU -1571532800,1571534079,CZ +1571531776,1571534079,CZ 1571534080,1571534847,RU 1571534848,1571535103,LV 1571535104,1571535617,CZ @@ -28964,7 +29496,9 @@ 1571538944,1571540991,CZ 1571540992,1571541247,RU 1571541248,1571541503,UA -1571541504,1571543039,CZ +1571541504,1571542527,CZ +1571542528,1571542783,SK +1571542784,1571543039,CZ 1571543040,1571543551,NL 1571543552,1571543807,UA 1571543808,1571544063,CZ @@ -29187,7 +29721,6 @@ 1572610048,1572612095,UA 1572612096,1572614143,RU 1572614144,1572616191,ES -1572616192,1572618239,CH 1572618240,1572620287,NL 1572620288,1572622335,CH 1572622336,1572624383,RU @@ -29238,7 +29771,9 @@ 1572710144,1572710399,GG 1572710400,1572712447,DE 1572712448,1572714495,ES -1572714496,1572716543,NG +1572714496,1572714943,NG +1572714944,1572714959,IT +1572714960,1572716543,NG 1572716544,1572718591,SA 1572718592,1572720639,RU 1572720640,1572722687,IT @@ -29320,7 +29855,9 @@ 1578500096,1578565631,FI 1578565632,1578582015,FR 1578582016,1578584063,IT -1578584064,1578585087,FR +1578584064,1578584355,FR +1578584356,1578584356,IT +1578584357,1578585087,FR 1578585088,1578586111,PT 1578586112,1578588159,ES 1578588160,1578590207,PL @@ -29328,20 +29865,34 @@ 1578590788,1578590791,ES 1578590792,1578590851,FR 1578590852,1578590855,ES -1578590856,1578592175,FR +1578590856,1578590863,FR +1578590864,1578590879,BE +1578590880,1578591695,FR +1578591696,1578591699,ES +1578591700,1578592167,FR +1578592168,1578592171,IT +1578592172,1578592175,FR 1578592176,1578592183,CZ 1578592184,1578592191,PT 1578592192,1578592199,BE 1578592200,1578592207,CH -1578592208,1578593023,FR +1578592208,1578592295,FR +1578592296,1578592303,NL +1578592304,1578593023,FR 1578593024,1578593279,DE 1578593280,1578593439,FR 1578593440,1578593443,ES -1578593444,1578593955,FR +1578593444,1578593551,FR +1578593552,1578593559,NL +1578593560,1578593955,FR 1578593956,1578593959,ES -1578593960,1578595419,FR +1578593960,1578595367,FR +1578595368,1578595371,IT +1578595372,1578595419,FR 1578595420,1578595423,GB -1578595424,1578602495,FR +1578595424,1578595987,FR +1578595988,1578595991,ES +1578595992,1578602495,FR 1578602496,1578604543,NL 1578604544,1578606591,GB 1578606592,1578607725,DE @@ -29352,7 +29903,9 @@ 1578612908,1578612911,ES 1578612912,1578613735,FR 1578613736,1578613739,ES -1578613740,1578614271,FR +1578613740,1578613931,FR +1578613932,1578613935,NL +1578613936,1578614271,FR 1578614272,1578614527,ES 1578614528,1578631167,FR 1578631168,1578663935,RO @@ -29387,7 +29940,19 @@ 1580466176,1580597247,RO 1580597248,1580728319,TR 1580728320,1580990463,AE -1580990464,1581252607,RO +1580990464,1580999679,PT +1580999680,1580999935,RO +1580999936,1581001215,PT +1581001216,1581001471,RO +1581001472,1581118463,PT +1581118464,1581118719,RO +1581118720,1581126655,PT +1581126656,1581127167,RO +1581127168,1581132031,PT +1581132032,1581132287,RO +1581132288,1581208575,PT +1581208576,1581208831,RO +1581208832,1581252607,PT 1581252608,1581776895,GR 1581776896,1581793279,RU 1581793280,1581809663,PL @@ -29464,9 +30029,7 @@ 1583767552,1583771647,AT 1583771648,1583775743,RU 1583775744,1583779839,IT -1583779840,1583779847,GB -1583779848,1583779855,IT -1583779856,1583780263,GB +1583779840,1583780263,GB 1583780264,1583780271,IT 1583780272,1583780335,GB 1583780336,1583780343,IT @@ -29476,25 +30039,21 @@ 1583780768,1583780775,IT 1583780776,1583780791,GB 1583780792,1583780799,IT -1583780800,1583781031,GB -1583781032,1583781039,IT -1583781040,1583781359,GB +1583780800,1583781359,GB 1583781360,1583781367,IT 1583781368,1583781863,GB 1583781864,1583781871,IT -1583781872,1583782415,GB +1583781872,1583782223,GB +1583782224,1583782231,IT +1583782232,1583782415,GB 1583782416,1583782423,IT 1583782424,1583782431,GB 1583782432,1583782439,IT -1583782440,1583782615,GB -1583782616,1583782623,IT -1583782624,1583782703,GB +1583782440,1583782703,GB 1583782704,1583782711,IT 1583782712,1583782975,GB 1583782976,1583782983,IT -1583782984,1583783479,GB -1583783480,1583783487,IT -1583783488,1583783495,GB +1583782984,1583783495,GB 1583783496,1583783503,IT 1583783504,1583783935,GB 1583783936,1583788031,EU @@ -29524,8 +30083,8 @@ 1584398336,1584529407,CZ 1584529408,1584660479,DE 1584660480,1584857087,GB -1584857088,1584859135,DE -1584859136,1584922623,GB +1584857088,1584858879,DE +1584858880,1584922623,GB 1584922624,1585184767,TR 1585184768,1585190911,PL 1585190912,1585192959,ES @@ -29634,7 +30193,7 @@ 1585400320,1585400575,GB 1585400576,1585400831,FR 1585400832,1585401087,DE -1585401088,1585401343,US +1585401088,1585401343,EU 1585401344,1585401599,DE 1585401600,1585401855,GB 1585401856,1585403903,IT @@ -29783,7 +30342,6 @@ 1587449856,1587453951,UA 1587453952,1587470335,RU 1587470336,1587474431,PL -1587474432,1587478527,UA 1587478528,1587511295,RU 1587511296,1587544063,IL 1587544064,1588068351,IT @@ -29796,7 +30354,9 @@ 1588621312,1588625407,MD 1588625408,1588641791,RO 1588641792,1588643839,ES -1588643840,1588673535,RO +1588643840,1588653055,RO +1588653056,1588654079,MD +1588654080,1588673535,RO 1588673536,1588674559,MD 1588674560,1588723711,RO 1588723712,1588854783,UA @@ -29852,8 +30412,8 @@ 1590073344,1590075391,NL 1590075392,1590077439,BE 1590077440,1590079487,GB -1590079488,1590079743,GP -1590079744,1590081535,FR +1590079488,1590080511,GP +1590080512,1590081535,MQ 1590081536,1590083583,GB 1590083584,1590085631,RU 1590085632,1590087679,FR @@ -30098,7 +30658,9 @@ 1596890624,1596891135,CZ 1596891136,1596900351,RU 1596900352,1596907519,BY -1596907520,1596915711,RU +1596907520,1596909567,RU +1596909568,1596911615,KZ +1596911616,1596915711,RU 1596915712,1596925951,CZ 1596925952,1596932095,RU 1596932096,1596940543,CZ @@ -30108,13 +30670,15 @@ 1596941312,1596942335,RU 1596942336,1596945407,UA 1596945408,1596945919,CZ -1596945920,1596946431,NL +1596945920,1596946175,RU +1596946176,1596946431,NL 1596946432,1596947455,RU 1596947456,1596948479,UA 1596948480,1596950527,BY 1596950528,1596950783,UA 1596950784,1596951551,CZ -1596951552,1596952063,NL +1596951552,1596951807,RU +1596951808,1596952063,NL 1596952064,1596952575,UA 1596952576,1596952831,RU 1596952832,1596953599,CZ @@ -30129,7 +30693,8 @@ 1596956964,1596956964,RU 1596956965,1596957183,DE 1596957184,1596957695,UA -1596957696,1596958207,CZ +1596957696,1596957951,RU +1596957952,1596958207,CZ 1596958208,1596958463,RU 1596958464,1596958719,UA 1596958720,1596961023,RU @@ -30181,7 +30746,9 @@ 1599127552,1599143935,CZ 1599143936,1599160319,UA 1599160320,1599176703,IR -1599176704,1599190015,FR +1599176704,1599188991,FR +1599188992,1599189503,DE +1599189504,1599190015,FR 1599190016,1599190271,EU 1599190272,1599193087,FR 1599193088,1599209471,RU @@ -30364,7 +30931,8 @@ 1602781184,1602813951,FR 1602813952,1602846719,RU 1602846720,1602879487,GE -1602879488,1602879743,RE +1602879488,1602879488,MQ +1602879489,1602879743,RE 1602879744,1602882303,MQ 1602882304,1602882559,RE 1602882560,1602885631,MQ @@ -30440,7 +31008,9 @@ 1603133440,1603137535,RU 1603137536,1603141631,KW 1603141632,1603145727,ES -1603145728,1603149311,IL +1603145728,1603146239,IL +1603146240,1603146751,US +1603146752,1603149311,IL 1603149312,1603149567,NL 1603149568,1603149823,IL 1603149824,1603153919,RU @@ -30550,29 +31120,37 @@ 1605108568,1605108575,IT 1605108576,1605109223,GB 1605109224,1605109231,IT -1605109232,1605109319,GB -1605109320,1605109327,IT -1605109328,1605109431,GB +1605109232,1605109431,GB 1605109432,1605109439,IT 1605109440,1605109495,GB 1605109496,1605109503,IT -1605109504,1605110111,GB +1605109504,1605109599,GB +1605109600,1605109607,IT +1605109608,1605109639,GB +1605109640,1605109647,IT +1605109648,1605110111,GB 1605110112,1605110119,IT -1605110120,1605110263,GB +1605110120,1605110167,GB +1605110168,1605110175,IT +1605110176,1605110263,GB 1605110264,1605110271,IT -1605110272,1605110559,GB -1605110560,1605110567,IT -1605110568,1605111023,GB +1605110272,1605111023,GB 1605111024,1605111031,IT 1605111032,1605111199,GB 1605111200,1605111207,IT -1605111208,1605111919,GB +1605111208,1605111799,GB +1605111800,1605111807,IT +1605111808,1605111919,GB 1605111920,1605111927,IT 1605111928,1605111935,GB 1605111936,1605111943,IT -1605111944,1605112847,GB +1605111944,1605112647,GB +1605112648,1605112655,IT +1605112656,1605112847,GB 1605112848,1605112855,IT -1605112856,1605113087,GB +1605112856,1605112983,GB +1605112984,1605112991,IT +1605112992,1605113087,GB 1605113088,1605113095,IT 1605113096,1605113383,GB 1605113384,1605113391,IT @@ -30580,9 +31158,7 @@ 1605113408,1605113415,IT 1605113416,1605113503,GB 1605113504,1605113511,IT -1605113512,1605113839,GB -1605113840,1605113847,IT -1605113848,1605114199,GB +1605113512,1605114199,GB 1605114200,1605114207,IT 1605114208,1605114263,GB 1605114264,1605114271,IT @@ -30590,19 +31166,17 @@ 1605114296,1605114303,IT 1605114304,1605114327,GB 1605114328,1605114335,IT -1605114336,1605114535,GB -1605114536,1605114543,IT -1605114544,1605114871,GB +1605114336,1605114871,GB 1605114872,1605114879,IT -1605114880,1605114959,GB -1605114960,1605114967,IT -1605114968,1605115007,GB +1605114880,1605115007,GB 1605115008,1605115015,IT 1605115016,1605115599,GB 1605115600,1605115607,IT 1605115608,1605115863,GB 1605115864,1605115871,IT -1605115872,1605115903,GB +1605115872,1605115879,GB +1605115880,1605115887,IT +1605115888,1605115903,GB 1605115904,1605124095,RU 1605124096,1605125263,GB 1605125264,1605125267,DE @@ -30657,7 +31231,9 @@ 1605632000,1605664767,RS 1605664768,1605697535,MK 1605697536,1605734399,RU -1605734400,1605735423,GB +1605734400,1605734535,GB +1605734536,1605734536,RU +1605734537,1605735423,GB 1605735424,1605742591,RU 1605742592,1605744639,GB 1605744640,1605750783,RU @@ -30700,8 +31276,7 @@ 1607602176,1607606015,IT 1607606016,1607606271,FR 1607606272,1607608319,IT -1607608320,1607609343,ES -1607609344,1607610367,EU +1607608320,1607610367,EU 1607610368,1607612415,IE 1607612416,1607614463,EU 1607614464,1607615487,FR @@ -30714,18 +31289,17 @@ 1607622656,1607624703,ES 1607624704,1607624959,IT 1607624960,1607625727,EU -1607625728,1607625983,ES -1607625984,1607626239,EU -1607626240,1607626751,ES +1607625728,1607626751,ES 1607626752,1607627519,EU 1607627520,1607628543,IT 1607628544,1607628799,EU 1607628800,1607629567,IT 1607629568,1607634431,EU 1607634432,1607636479,IT -1607636480,1607644617,EU -1607644618,1607644618,IT -1607644619,1607647231,EU +1607636480,1607639039,EU +1607639040,1607640805,IT +1607640806,1607640806,CH +1607640807,1607647231,IT 1607647232,1607651327,DE 1607651328,1607655423,FR 1607655424,1607660287,IT @@ -30802,8 +31376,7 @@ 1607988224,1607989247,KG 1607989248,1607991295,RU 1607991296,1608122367,UA -1608122368,1608155135,GB -1608155136,1608253439,RO +1608122368,1608253439,RO 1608253440,1608384511,RU 1608384512,1608515583,DE 1608515584,1610612735,IT @@ -30855,9 +31428,7 @@ 1618841600,1618849791,US 1618849792,1618850303,CA 1618850304,1618850559,US -1618850560,1618852863,CA -1618852864,1618853631,US -1618853632,1618862079,CA +1618850560,1618862079,CA 1618862080,1618866175,US 1618866176,1618870271,CA 1618870272,1618984959,US @@ -30911,9 +31482,7 @@ 1673986048,1674051583,CA 1674051584,1674575871,US 1674575872,1677721599,CA -1677721600,1680534015,US -1680534016,1680534527,CN -1680534528,1680535551,US +1677721600,1680535551,US 1680535552,1680539647,CA 1680539648,1680564223,US 1680564224,1680572415,CA @@ -30984,7 +31553,8 @@ 1701003264,1701011455,MY 1701011456,1701019647,CN 1701019648,1701052415,GU -1701052416,1701117951,NZ +1701052416,1701101567,NZ +1701101568,1701117951,SG 1701117952,1701134335,NC 1701134336,1701142527,CN 1701142528,1701143551,HK @@ -31019,7 +31589,9 @@ 1703411712,1703673855,TW 1703673856,1703935999,JP 1703936000,1704984575,CN -1704984576,1707081727,AU +1704984576,1705498623,AU +1705498624,1705500671,GB +1705500672,1707081727,AU 1707081728,1707737087,CN 1707737088,1707802623,KR 1707802624,1707835391,JP @@ -31271,7 +31843,6 @@ 1728420864,1728421887,NZ 1728421888,1728422911,JP 1728422912,1728423935,AU -1728423936,1728424959,TW 1728424960,1728425983,AF 1728425984,1728427007,JP 1728427008,1728428031,MY @@ -31310,7 +31881,7 @@ 1728458752,1728459775,HK 1728459776,1728460799,ID 1728460800,1728462847,JP -1728462848,1728463871,NZ +1728462848,1728463871,US 1728463872,1728464895,JP 1728464896,1728465919,KR 1728465920,1728466943,CN @@ -31356,7 +31927,7 @@ 1728501248,1728501503,ID 1728501504,1728502783,AU 1728502784,1728503807,CN -1728503808,1728505855,JP +1728503808,1728504831,JP 1728505856,1728506879,NZ 1728506880,1728507903,MY 1728507904,1728508927,JP @@ -31522,7 +32093,6 @@ 1728668672,1728669695,SG 1728669696,1728670207,BD 1728670208,1728670463,NZ -1728670720,1728671743,JP 1728671744,1728672767,BD 1728672768,1728673791,TW 1728673792,1728674815,JP @@ -31530,7 +32100,6 @@ 1728675840,1728676863,KR 1728676864,1728677887,IN 1728677888,1728678911,BD -1728678912,1728679935,PG 1728679936,1728680959,ID 1728680960,1728681983,MY 1728681984,1728683007,CN @@ -31823,7 +32392,8 @@ 1728951808,1728952063,SG 1728952064,1728952319,IN 1728952832,1728953343,AU -1728953344,1728954367,HK +1728953344,1728954112,GB +1728954113,1728954367,HK 1728954368,1728955391,JP 1728955392,1728956415,CN 1728956416,1728957439,ID @@ -31851,12 +32421,14 @@ 1728977920,1728978943,MY 1728978944,1728979967,JP 1728979968,1728980991,MN -1728980992,1728982015,NZ +1728980992,1728982015,AU 1728982016,1728982527,ID 1728982528,1728982783,IN 1728982784,1728985087,AU -1728985088,1728987135,PH -1728987136,1728988159,AU +1728985088,1728986111,SG +1728986112,1728987135,PH +1728987136,1728987391,JP +1728987392,1728988159,AU 1728988160,1728988191,NZ 1728988192,1728988199,US 1728988200,1728989183,NZ @@ -31964,7 +32536,7 @@ 1729078272,1729079295,BD 1729079296,1729080319,AU 1729080320,1729081343,ID -1729081344,1729081599,NP +1729081344,1729081599,IN 1729081600,1729082111,AU 1729082112,1729082367,IN 1729082368,1729083391,HK @@ -32091,6 +32663,7 @@ 1729189888,1729190911,VN 1729190912,1729191935,HK 1729191936,1729195007,IN +1729195008,1729195519,MN 1729195520,1729196031,BD 1729196032,1729197055,GU 1729197056,1729198079,HK @@ -32149,9 +32722,8 @@ 1729247744,1729248255,NZ 1729248256,1729249279,JP 1729249280,1729253375,IN -1729253376,1729254399,TW 1729254400,1729255423,AU -1729255424,1729257471,MY +1729255424,1729256447,MY 1729257472,1729258495,ID 1729258496,1729259519,JP 1729259520,1729260543,IN @@ -32194,9 +32766,7 @@ 1729294848,1729295103,IN 1729295104,1729295359,PK 1729295360,1729296383,MY -1729296384,1729297407,JP 1729297408,1729298431,AU -1729298432,1729299455,JP 1729299456,1729300479,NZ 1729300480,1729300991,SG 1729300992,1729301503,NZ @@ -32209,7 +32779,6 @@ 1729306624,1729307647,PH 1729307904,1729308159,ID 1729308160,1729308415,HK -1729308416,1729308671,AU 1729308672,1729310719,CN 1729310720,1729311743,JP 1729311744,1729312767,IN @@ -32283,7 +32852,8 @@ 1729387008,1729387519,ID 1729387520,1729388543,SG 1729388544,1729389567,HK -1729389568,1729391103,IN +1729389568,1729389823,IN +1729390592,1729391103,IN 1729391104,1729391615,ID 1729391616,1729392639,JP 1729392640,1729393663,CN @@ -32401,7 +32971,9 @@ 1729536000,1729537023,HK 1729537024,1729537791,ID 1729537792,1729538047,JP -1729538048,1729539071,SG +1729538048,1729538559,ID +1729538560,1729538815,SG +1729538816,1729539071,ID 1729539072,1729540095,IN 1729540096,1729541119,AU 1729541120,1729542143,TH @@ -32432,9 +33004,10 @@ 1729566720,1729568255,IN 1729568256,1729568511,ID 1729568768,1729569791,ID +1729569792,1729570815,AF 1729570816,1729571839,AU 1729571840,1729572863,MY -1729573632,1729573887,MN +1729572864,1729573887,MN 1729573888,1729574911,NC 1729574912,1729575935,CN 1729575936,1729576959,BD @@ -32473,7 +33046,9 @@ 1729605632,1729606655,CN 1729606656,1729607679,ID 1729607680,1729609727,AU -1729609728,1729610751,HK +1729609728,1729609999,HK +1729610000,1729610003,JP +1729610004,1729610751,HK 1729610752,1729611775,JP 1729611776,1729612799,ID 1729613824,1729614847,SG @@ -32584,7 +33159,7 @@ 1729720320,1729721087,AU 1729721088,1729721343,IN 1729721344,1729722367,NZ -1729722368,1729726463,IN +1729723392,1729726463,IN 1729726464,1729727487,PK 1729727488,1729728511,KI 1729728512,1729729535,JP @@ -32736,9 +33311,12 @@ 1729876992,1729878015,JP 1729878016,1729879039,NZ 1729879040,1729879167,AU -1729879168,1729879679,JP +1729879168,1729879295,JP +1729879296,1729879423,KR +1729879424,1729879679,JP 1729879680,1729879807,AU -1729879808,1729880063,JP +1729879808,1729879935,JP +1729879936,1729880063,KR 1729880064,1729880831,AU 1729880832,1729881087,NZ 1729881088,1729881215,PH @@ -32938,7 +33516,9 @@ 1730074368,1730074623,SG 1730074624,1730075647,CN 1730075648,1730076671,ID -1730076672,1730080767,CN +1730077696,1730078719,CN +1730078720,1730079743,HK +1730079744,1730080767,CN 1730080768,1730081791,HK 1730081792,1730082815,ID 1730082816,1730083839,PW @@ -33010,8 +33590,8 @@ 1742737408,1742738431,SG 1742738432,1742738687,HK 1742738688,1742738943,AU -1742738944,1742739455,HK -1742739456,1742740479,IN +1742738944,1742739199,HK +1742739200,1742740479,IN 1742740480,1742741503,KH 1742741504,1742743551,IN 1742743552,1742745599,CN @@ -33127,7 +33707,8 @@ 1742860800,1742861055,ID 1742861056,1742861311,AU 1742861312,1742862335,NP -1742862336,1742863359,HK +1742862336,1742862847,IN +1742862848,1742863359,HK 1742863360,1742864383,JP 1742864384,1742866431,IN 1742866432,1742867199,AU @@ -33137,8 +33718,8 @@ 1742869504,1742870015,IN 1742870016,1742870527,VU 1742870528,1742872575,IN -1742872576,1742873599,NZ -1742873600,1742874623,PH +1742872576,1742873855,NZ +1742873856,1742874623,PH 1742874624,1742875647,CN 1742875648,1742876671,JP 1742876672,1742877695,ID @@ -33371,7 +33952,10 @@ 1743108864,1743109119,AU 1743109120,1743110143,HK 1743110144,1743111167,VN -1743111168,1743112191,HK +1743111168,1743111423,SG +1743111424,1743111679,MY +1743111680,1743111935,ID +1743111936,1743112191,HK 1743112192,1743113215,ID 1743113216,1743114239,SG 1743114240,1743115263,IN @@ -33437,7 +34021,432 @@ 1743179776,1743180799,JP 1743180800,1743181823,CN 1743181824,1743182847,HK -1743182848,1743183871,IN +1743182848,1743184895,IN +1743184896,1743185919,HK +1743185920,1743186943,SG +1743186944,1743187967,CN +1743187968,1743188991,HK +1743188992,1743190015,JP +1743190016,1743191039,SG +1743191040,1743192063,AF +1743192064,1743195135,IN +1743195136,1743196159,HK +1743196160,1743198207,CN +1743198208,1743198719,JP +1743198720,1743198975,AU +1743198976,1743199231,SG +1743199232,1743200255,HK +1743200256,1743201279,IN +1743201280,1743202303,PH +1743202304,1743204351,IN +1743204352,1743205375,TW +1743205376,1743206399,JP +1743206400,1743207423,HK +1743207424,1743208447,KH +1743208448,1743210495,CN +1743210496,1743211519,JP +1743211520,1743212543,IN +1743212544,1743213567,ID +1743213568,1743214591,HK +1743214592,1743215615,AU +1743215616,1743216639,MM +1743216640,1743217151,SG +1743217152,1743217663,JP +1743217664,1743218687,IN +1743218688,1743219711,HK +1743219712,1743221759,ID +1743221760,1743222783,IN +1743222784,1743223807,ID +1743223808,1743224831,IN +1743224832,1743225855,KR +1743225856,1743226367,IN +1743226368,1743226623,PH +1743226624,1743226879,BD +1743226880,1743227647,AF +1743227648,1743227903,IR +1743227904,1743228927,HK +1743228928,1743229951,CN +1743229952,1743230975,VN +1743230976,1743231999,HK +1743232000,1743232511,NZ +1743232512,1743233023,AU +1743233024,1743234047,BD +1743234048,1743235071,HK +1743235072,1743235583,AU +1743235584,1743236095,ID +1743236096,1743237119,US +1743237120,1743238143,BD +1743238144,1743240191,CN +1743240192,1743241215,SG +1743241216,1743242239,JP +1743242240,1743244287,ID +1743244288,1743245311,AU +1743245312,1743248383,IN +1743248384,1743248895,SG +1743248896,1743249407,IN +1743249408,1743250431,MY +1743250432,1743251455,BD +1743251456,1743252479,IN +1743252480,1743253503,JP +1743253504,1743254527,PH +1743254528,1743255551,CN +1743255552,1743256319,SG +1743256320,1743256575,MY +1743256576,1743258623,HK +1743258624,1743259647,CN +1743259648,1743260671,IN +1743260672,1743261695,JP +1743261696,1743262719,HK +1743262720,1743264767,IN +1743264768,1743265279,MY +1743265280,1743265535,ID +1743265536,1743265791,AU +1743265792,1743266303,ID +1743266304,1743267839,HK +1743267840,1743268863,TH +1743268864,1743269887,SG +1743269888,1743270911,MY +1743270912,1743273983,VN +1743273984,1743275007,ID +1743275008,1743276031,HK +1743276032,1743277055,JP +1743277056,1743278079,PH +1743278080,1743279103,LA +1743279104,1743281151,HK +1743281152,1743283199,AU +1743283200,1743284223,BD +1743284224,1743285247,JP +1743285248,1743286271,NZ +1743286272,1743287295,IN +1743287296,1743288319,AU +1743288320,1743289343,VN +1743289344,1743291391,IN +1743291392,1743292415,AU +1743292416,1743293439,IN +1743293440,1743293951,AU +1743293952,1743294463,PG +1743294464,1743295487,CN +1743295488,1743296511,IN +1743296512,1743297535,NP +1743297536,1743298303,NZ +1743298304,1743299583,AU +1743299584,1743300607,KH +1743300608,1743301631,AU +1743301632,1743303679,IN +1743303680,1743304703,NZ +1743304704,1743305727,IN +1743305728,1743306751,JP +1743306752,1743307775,KH +1743307776,1743308799,AU +1743308800,1743309823,JP +1743309824,1743310335,NZ +1743310336,1743311871,AU +1743311872,1743312895,CN +1743312896,1743313663,AU +1743313664,1743313919,MY +1743313920,1743314943,HK +1743314944,1743315199,IN +1743315200,1743315455,PK +1743315456,1743315967,NZ +1743315968,1743316991,NP +1743316992,1743319039,IN +1743319040,1743319295,ID +1743319296,1743319551,IN +1743319552,1743320063,ID +1743320064,1743321087,IN +1743321088,1743322111,JP +1743322112,1743323135,AU +1743323136,1743324159,MY +1743324160,1743325183,CN +1743325184,1743326207,PK +1743326208,1743327231,SG +1743327232,1743328255,AU +1743328256,1743329279,NZ +1743329280,1743330303,IN +1743330304,1743331327,AU +1743331328,1743333375,PH +1743333376,1743334399,JP +1743334400,1743335423,CN +1743335424,1743336447,VN +1743336448,1743337471,CN +1743337472,1743338495,NP +1743338496,1743339519,NZ +1743339520,1743340543,IN +1743340544,1743341567,TW +1743341568,1743341823,HK +1743341824,1743342079,IN +1743342080,1743342591,AU +1743342592,1743343615,IN +1743343616,1743344639,TH +1743344640,1743345663,IN +1743345664,1743346687,ID +1743346688,1743347711,IN +1743347712,1743348735,HK +1743348736,1743348991,ID +1743348992,1743349247,IN +1743349248,1743349759,ID +1743349760,1743350783,CN +1743350784,1743351807,ID +1743351808,1743354111,IN +1743354112,1743354367,BD +1743354368,1743355903,IN +1743355904,1743356927,CN +1743356928,1743357951,NZ +1743357952,1743358975,CN +1743358976,1743359487,AF +1743359488,1743361023,ID +1743361024,1743362047,AU +1743362048,1743364095,ID +1743364096,1743365119,IN +1743365120,1743366143,HK +1743366144,1743367167,IN +1743367168,1743368191,SG +1743368192,1743369215,TH +1743369216,1743369727,MY +1743369728,1743369983,NP +1743369984,1743370239,AF +1743370240,1743371263,HK +1743371264,1743372287,MO +1743372288,1743373311,TH +1743373312,1743375359,JP +1743375360,1743376383,MM +1743376384,1743377407,AU +1743377408,1743378431,JP +1743378432,1743379455,IN +1743379456,1743380479,NZ +1743380480,1743381503,AU +1743381504,1743382527,CN +1743382528,1743383551,HK +1743383552,1743384575,AU +1743384576,1743385087,SG +1743385088,1743385343,AU +1743385344,1743386623,IN +1743386624,1743387647,HK +1743387648,1743388671,JP +1743388672,1743389695,CN +1743389696,1743390719,KR +1743390720,1743391743,JP +1743391744,1743391999,PK +1743392000,1743392767,AU +1743392768,1743393791,HK +1743393792,1743394815,CN +1743394816,1743395839,BD +1743395840,1743396863,JP +1743396864,1743397887,HK +1743397888,1743398911,VN +1743398912,1743399935,TW +1743399936,1743400959,JP +1743400960,1743401983,PG +1743401984,1743403007,HK +1743403008,1743404031,CN +1743404032,1743405055,AU +1743405056,1743407103,IN +1743407104,1743408127,JP +1743408128,1743410175,TW +1743410176,1743411199,SG +1743411200,1743412223,VN +1743412224,1743412479,AU +1743412480,1743412991,IN +1743412992,1743413247,AU +1743413248,1743414271,HK +1743414272,1743415295,MY +1743415296,1743416319,SG +1743416320,1743417855,AU +1743417856,1743418879,IN +1743418880,1743419391,AU +1743419392,1743420415,ID +1743420416,1743422463,CN +1743422464,1743423487,NZ +1743423488,1743424511,IN +1743424512,1743425535,HK +1743425536,1743426559,PK +1743426560,1743426815,SG +1743426816,1743430399,IN +1743430400,1743430655,AU +1743430656,1743431679,JP +1743431680,1743432703,SG +1743432704,1743433727,CN +1743433728,1743434751,JP +1743434752,1743435775,CN +1743435776,1743437823,IN +1743437824,1743438335,BD +1743438336,1743438591,AU +1743438592,1743438847,ID +1743438848,1743439871,JP +1743439872,1743440895,BD +1743440896,1743441919,TW +1743443968,1743444991,ID +1743444992,1743446015,HK +1743446016,1743448063,TW +1743448064,1743449087,AU +1743449088,1743451135,IN +1743451136,1743452159,HK +1743452160,1743453183,AU +1743453184,1743454207,ID +1743454208,1743455231,IN +1743455232,1743456255,HK +1743456256,1743457279,IN +1743457280,1743458303,JP +1743458304,1743459327,CN +1743459328,1743459583,AU +1743459584,1743459839,ID +1743459840,1743460095,AU +1743460096,1743460351,IN +1743460352,1743461375,KR +1743461376,1743462399,MY +1743462400,1743463423,ID +1743463424,1743464447,AU +1743464448,1743465471,JP +1743465472,1743466495,HK +1743466496,1743467519,CN +1743467520,1743468543,AU +1743468544,1743470591,CN +1743470592,1743470847,IN +1743470848,1743471103,AU +1743471104,1743471615,ID +1743471616,1743472639,IN +1743472640,1743473663,KH +1743473664,1743474687,JP +1743474688,1743476735,CN +1743476736,1743477759,TW +1743477760,1743479807,AU +1743479808,1743480831,HK +1743480832,1743481855,IN +1743481856,1743482111,AU +1743482112,1743482367,ID +1743482368,1743482879,WF +1743482880,1743483903,JP +1743483904,1743484927,AU +1743484928,1743485951,IN +1743485952,1743486975,JP +1743486976,1743493119,CN +1743493120,1743493631,ID +1743493632,1743493887,AU +1743493888,1743495167,IN +1743495168,1743497215,JP +1743497216,1743499263,HK +1743499264,1743500287,AF +1743500288,1743501311,JP +1743501312,1743502335,CN +1743502336,1743503359,AU +1743503360,1743504383,CN +1743504384,1743505407,NP +1743505408,1743506431,CN +1743506432,1743506943,SG +1743506944,1743507455,IN +1743507456,1743509503,VN +1743509504,1743510527,HK +1743510528,1743552511,CN +1743585280,1743589375,CN +1743589376,1743590399,AU +1743590400,1743591423,KR +1743591424,1743593471,CN +1743593472,1743594495,ID +1743594496,1743595519,BD +1743595520,1743596543,NZ +1743596544,1743598591,IN +1743598592,1743599103,KH +1743599104,1743599615,HK +1743599616,1743600639,IN +1743600640,1743602687,VN +1743602688,1743603711,CN +1743603712,1743605759,HK +1743605760,1743606015,SG +1743606016,1743606527,AU +1743606528,1743606783,AF +1743606784,1743607807,PK +1743607808,1743608831,CN +1743608832,1743609855,AU +1743609856,1743610879,VN +1743610880,1743611903,MO +1743611904,1743613951,AU +1743613952,1743615999,IN +1743616000,1743617023,JP +1743617024,1743618047,MO +1743618048,1743619071,HK +1743619072,1743619583,SG +1743619584,1743619839,ID +1743619840,1743620095,IN +1743620096,1743621119,JP +1743621120,1743621631,ID +1743621632,1743622143,SG +1743622144,1743624191,VN +1743624192,1743625215,CN +1743625216,1743626239,IN +1743626240,1743627263,AU +1743627264,1743628287,NZ +1743628288,1743628799,SG +1743628800,1743629055,IN +1743629056,1743629311,AU +1743629312,1743630335,IN +1743630336,1743652863,CN +1743652864,1743654911,IN +1743654912,1743666175,CN +1743666176,1743666431,NZ +1743666432,1743666687,IN +1743666688,1743666943,AU +1743666944,1743667199,BD +1743667200,1743668223,KH +1743668224,1743672319,VN +1743672320,1743673343,NZ +1743673344,1743676415,CN +1743676416,1743679487,IN +1743679488,1743680511,JP +1743680512,1743681535,TL +1743681536,1743682559,AU +1743682560,1743683583,MY +1743683584,1743683839,JP +1743683840,1743684607,HK +1743684608,1743685631,CN +1743685632,1743686655,ID +1743686656,1743688703,CN +1743688704,1743689727,MY +1743689728,1743690751,IN +1743690752,1743691263,AS +1743691264,1743691775,IN +1743691776,1743699967,CN +1743699968,1743700479,IN +1743700480,1743700735,NZ +1743700736,1743700991,AU +1743700992,1743702015,CN +1743702016,1743703039,ID +1743703040,1743704063,CN +1743704064,1743706111,VN +1743706112,1743708159,IN +1743708160,1743709183,HK +1743709184,1743711231,IN +1743711232,1743712255,JP +1743712256,1743713279,IN +1743713280,1743714303,JP +1743714304,1743715327,KR +1743715328,1743717375,CN +1743717376,1743718399,BD +1743718400,1743719423,NZ +1743719424,1743720447,HK +1743720448,1743721471,JP +1743721472,1743722495,SG +1743722496,1743723519,AU +1743723520,1743724543,HK +1743724544,1743725567,VN +1743725568,1743726591,IN +1743726592,1743728639,CN +1743728640,1743729151,AU +1743729152,1743729407,IN +1743729408,1743729663,AU +1743729664,1743730687,KH +1743730688,1743731711,IN +1743731712,1743732735,TW +1743732736,1743733759,HK +1743733760,1743734783,CN +1743734784,1743735807,HK +1743735808,1743736319,AU +1743736320,1743736575,IN +1743736576,1743736831,AU +1743736832,1743738879,IN +1743738880,1743740927,JP +1743740928,1743741951,CN +1743741952,1743742975,HK +1743742976,1743743487,NZ 1743781888,1743783935,JP 1743783936,1743784959,IN 1743784960,1743785983,JP @@ -33463,7 +34472,7 @@ 1743806464,1743809535,IN 1743809536,1743810559,ID 1743810560,1743811583,KH -1743811584,1743813631,JP +1743811584,1743812607,JP 1743813632,1743814655,CN 1743814656,1743815679,SG 1743815680,1743815935,AU @@ -33687,8 +34696,8 @@ 1744056576,1744056831,MY 1744056832,1744057087,NZ 1744057088,1744057343,ID -1744057344,1744058367,HK -1744058368,1744066559,CN +1744057344,1744059391,HK +1744059392,1744066559,CN 1744066560,1744067583,HK 1744067584,1744068607,JP 1744068608,1744069631,ID @@ -33823,9 +34832,7 @@ 1744202240,1744202495,IN 1744202496,1744202751,ID 1744202752,1744203775,PK -1744203776,1744204287,MY -1744204288,1744204415,HK -1744204416,1744204799,MY +1744203776,1744204799,HK 1744204800,1744205823,ID 1744205824,1744207871,CN 1744207872,1744208127,AU @@ -33951,11 +34958,9 @@ 1744323584,1744324607,JP 1744324608,1744325631,IN 1744325632,1744326655,HK -1744326656,1744328703,IN -1744328704,1744329727,JP -1744329728,1744330751,IN -1744330752,1744331519,AU -1744331520,1744331775,SG +1744326656,1744330751,IN +1744330752,1744331263,AU +1744331264,1744331775,SG 1744331776,1744332799,CN 1744332800,1744333823,KR 1744333824,1744334847,HK @@ -33984,7 +34989,6 @@ 1744359424,1744360447,IN 1744360448,1744361471,CN 1744361472,1744362495,ID -1744362496,1744363519,JP 1744363520,1744365567,CN 1744365568,1744366591,IN 1744366592,1744367615,BD @@ -34004,7 +35008,9 @@ 1744378880,1744379903,KR 1744379904,1744380927,HK 1744380928,1744383999,IN -1744384000,1744385023,AU +1744384000,1744384039,AU +1744384040,1744384047,GU +1744384048,1744385023,AU 1744385024,1744386047,CN 1744386048,1744386303,BD 1744386304,1744386559,AU @@ -34024,13 +35030,11 @@ 1744402432,1744403455,IN 1744403456,1744404479,AU 1744404480,1744405503,CN -1744405504,1744406527,HK 1744406528,1744407551,CN 1744407552,1744408575,AU 1744408576,1744409599,CN 1744409600,1744410623,AU 1744410624,1744411647,PK -1744411648,1744412671,JP 1744412672,1744413695,SG 1744413696,1744417791,CN 1744417792,1744418815,IN @@ -34168,7 +35172,8 @@ 1744555008,1744556031,CN 1744556032,1744562175,IN 1744562176,1744563199,BD -1744563200,1744565247,CN +1744563200,1744564223,HK +1744564224,1744565247,CN 1744565248,1744566271,HK 1744566272,1744567295,IN 1744567296,1744568319,JP @@ -34194,6 +35199,7 @@ 1744584704,1744585727,CN 1744585728,1744586751,TW 1744586752,1744588799,HK +1744588800,1744589823,PK 1744589824,1744590079,BT 1744590080,1744590335,ID 1744590336,1744590591,IN @@ -34424,7 +35430,173 @@ 1744828928,1744829183,SG 1744829184,1744829439,AU 1744829440,1744830463,HK -1744830464,1753219071,US +1744830464,1747191807,US +1747191808,1747193855,CA +1747193856,1747215359,US +1747215360,1747216383,CA +1747216384,1747219455,US +1747219456,1747220479,CA +1747220480,1747227647,US +1747227648,1747228671,CA +1747228672,1747256319,US +1747256320,1747256575,IE +1747256576,1747256831,AU +1747256832,1747257087,AE +1747257088,1747257343,IN +1747257344,1747260415,US +1747260416,1747261439,CA +1747261440,1747270655,US +1747270656,1747272703,CA +1747272704,1747273727,US +1747273728,1747274751,CA +1747274752,1747275775,US +1747275776,1747276799,CA +1747276800,1747283967,US +1747283968,1747284991,CA +1747284992,1747304447,US +1747304448,1747308543,CA +1747308544,1747316735,US +1747316736,1747317759,CA +1747317760,1753251839,US +1753251840,1753252095,MN +1753252096,1753252351,SY +1753252352,1753252607,BY +1753252608,1753252863,PK +1753252864,1753253119,SD +1753253120,1753253375,LK +1753253376,1753253631,ID +1753253632,1753253887,LB +1753253888,1753254143,OM +1753254144,1753254399,MT +1753254400,1753254655,MK +1753254656,1753254911,MY +1753254912,1753255167,AL +1753255168,1753255423,NP +1753255424,1753255679,DZ +1753255680,1753255935,KZ +1753255936,1753260031,CA +1753260032,1753280511,US +1753280512,1753284607,CA +1753284608,1753309183,US +1753309184,1753317375,CA +1753317376,1753341951,US +1753341952,1753346047,CA +1753346048,1753483263,US +1753483264,1753483519,IE +1753483520,1753486335,US +1753486336,1753486591,IN +1753486592,1754136575,US +1754136576,1754169343,CA +1754169344,1754206719,US +1754206720,1754206975,GW +1754206976,1754207231,RW +1754207232,1754207487,GA +1754207488,1754207743,KI +1754207744,1754207999,MM +1754208000,1754208255,VU +1754208256,1754208511,NA +1754208512,1754208767,DJ +1754208768,1754209023,BF +1754209024,1754209279,BW +1754209280,1754209535,PW +1754209536,1754209791,BR +1754209792,1754210047,AR +1754210048,1754210303,BJ +1754210304,1754251519,US +1754251520,1754251775,LY +1754251776,1754252543,US +1754252544,1754252799,MZ +1754252800,1754253055,US +1754253056,1754253311,GN +1754253312,1754253567,US +1754253568,1754253823,ML +1754253824,1754254079,US +1754254080,1754254335,SO +1754254336,1754254591,CD +1754254592,1754254847,US +1754254848,1754255103,VE +1754255104,1754255359,US +1754255360,1754255615,EC +1754255616,1754255871,US +1754255872,1754256127,PY +1754256128,1754256383,US +1754256384,1754256639,BO +1754256640,1754256895,US +1754256896,1754257151,UY +1754257152,1754257407,US +1754257408,1754257663,TZ +1754257664,1754257919,US +1754257920,1754258175,TD +1754258176,1754258431,US +1754258432,1754258687,MG +1754258688,1754258943,US +1754258944,1754259199,TN +1754259200,1754792959,US +1754792960,1754793983,CA +1754793984,1754799103,US +1754799104,1754800127,CA +1754800128,1754822655,US +1754822656,1754823679,CA +1754823680,1754830847,US +1754830848,1754831871,CA +1754831872,1754832895,US +1754832896,1754836991,CA +1754836992,1754845183,US +1754845184,1754846207,CA +1754846208,1754849279,US +1754849280,1754850303,CA +1754850304,1754852351,US +1754852352,1754853375,JM +1754853376,1754863615,US +1754863616,1754864639,CA +1754864640,1754869759,US +1754869760,1754870783,CA +1754872832,1754890239,US +1754890240,1754892287,BB +1754923008,1755062271,US +1755062272,1755066367,CA +1755066368,1755070463,US +1755070464,1755074559,CA +1755074560,1755103487,US +1755103488,1755103743,MH +1755103744,1755103999,US +1755104000,1755104255,ZM +1755104256,1755104511,US +1755104512,1755104767,HT +1755104768,1755105023,US +1755105024,1755105279,BB +1755105280,1755106047,US +1755106048,1755106303,SR +1755106304,1755106559,US +1755106560,1755106815,BZ +1755106816,1755107071,US +1755107072,1755107327,MW +1755107328,1755107583,US +1755107584,1755107839,DM +1755107840,1755108095,US +1755108096,1755108351,NE +1755108352,1755108607,US +1755108608,1755108863,AG +1755108864,1755109119,US +1755109120,1755109375,TL +1755109376,1755109631,US +1755109632,1755109887,HN +1755109888,1755110143,US +1755110144,1755110399,SB +1755110400,1755110655,US +1755110656,1755110911,JO +1755110912,1755111167,US +1755111168,1755111423,SD +1755111424,1755119615,US +1755119616,1755283455,CA +1755283456,1755324415,US +1755324416,1755328511,CA +1755340800,1755348991,US +1755357184,1755365375,US +1755381760,1755512831,US +1755512832,1755545599,CA +1755578368,1755709439,US +1762656256,1763704831,MU 1763704832,1764753407,EG 1764753408,1765801983,KE 1765801984,1766850559,MA @@ -34453,7 +35625,7 @@ 1777049600,1777053695,ZA 1777053696,1777057791,BF 1777057792,1777061887,NG -1777061888,1777063935,SD +1777061888,1777063935,SS 1777063936,1777065983,MZ 1777065984,1777070079,GQ 1777070080,1777074175,BW @@ -34498,7 +35670,9 @@ 1795559424,1795559679,AR 1795559680,1795560447,US 1795560448,1795560959,CA -1795560960,1795561471,US +1795560960,1795561247,US +1795561248,1795561343,CA +1795561344,1795561471,US 1795561472,1795562239,CA 1795562240,1795563263,US 1795563264,1795563519,CA @@ -34545,8 +35719,8 @@ 1805733888,1805737983,US 1805737984,1805742079,CA 1805742080,1805752575,US -1805752576,1805752831,CA -1805752832,1805754111,US +1805752576,1805753087,CA +1805753088,1805754111,US 1805754112,1805754367,CA 1805754368,1806174207,US 1806174208,1806174463,BR @@ -34564,8 +35738,22 @@ 1807057664,1807057919,GB 1807057920,1807597567,US 1807597568,1807646719,CA -1807646720,1807695871,US -1807745024,1815822335,US +1807646720,1807655679,US +1807655680,1807655935,IE +1807655936,1807656191,LR +1807656192,1807656447,CZ +1807656448,1807656703,NL +1807656704,1807657983,US +1807657984,1807658239,SG +1807658240,1807658495,GB +1807658496,1807658751,BS +1807658752,1807695871,US +1807695872,1807699967,VI +1807699968,1807707311,US +1807707312,1807707312,JP +1807707313,1807732735,US +1807732736,1807736831,GP +1807736832,1815822335,US 1815822336,1815826431,CA 1815826432,1815871487,US 1815871488,1815879679,CA @@ -34600,15 +35788,23 @@ 1815967232,1815967487,CA 1815967488,1815968255,US 1815968256,1815968511,FR -1815968512,1815969279,US +1815968512,1815968639,US +1815968640,1815968767,FR +1815968768,1815969279,US 1815969280,1815969791,JP 1815969792,1815987199,US 1815987200,1815987711,GB 1815987712,1815988223,NL 1815988224,1815988735,JP -1815988736,1815991295,US +1815988736,1815990271,US +1815990272,1815990783,FR +1815990784,1815991295,DE 1815991296,1815991807,AU -1815991808,1815995135,US +1815991808,1815993599,US +1815993600,1815993855,GB +1815993856,1815994111,US +1815994112,1815994367,JP +1815994368,1815995135,US 1815995136,1815995391,AU 1815995392,1815995903,US 1815995904,1815996159,GB @@ -35052,13 +36248,13 @@ 1835917856,1835917863,IT 1835917864,1835917919,GB 1835917920,1835917935,IT -1835917936,1835918031,GB -1835918032,1835918039,IT -1835918040,1835918439,GB +1835917936,1835918439,GB 1835918440,1835918447,IT 1835918448,1835918519,GB 1835918520,1835918527,IT -1835918528,1835918711,GB +1835918528,1835918599,GB +1835918600,1835918607,IT +1835918608,1835918711,GB 1835918712,1835918719,IT 1835918720,1835918735,GB 1835918736,1835918743,IT @@ -35068,21 +36264,15 @@ 1835918848,1835918855,IT 1835918856,1835919095,GB 1835919096,1835919103,IT -1835919104,1835919151,GB +1835919104,1835919127,GB +1835919128,1835919135,IT +1835919136,1835919151,GB 1835919152,1835919159,IT -1835919160,1835919303,GB -1835919304,1835919311,IT -1835919312,1835919751,GB +1835919160,1835919751,GB 1835919752,1835919759,IT 1835919760,1835920479,GB 1835920480,1835920487,IT -1835920488,1835920559,GB -1835920560,1835920567,IT -1835920568,1835920727,GB -1835920728,1835920735,IT -1835920736,1835920943,GB -1835920944,1835920951,IT -1835920952,1835921047,GB +1835920488,1835921047,GB 1835921048,1835921055,IT 1835921056,1835921119,GB 1835921120,1835921127,IT @@ -35090,17 +36280,21 @@ 1835921344,1835921351,IT 1835921352,1835921463,GB 1835921464,1835921471,IT -1835921472,1835922415,GB +1835921472,1835921711,GB +1835921712,1835921719,IT +1835921720,1835922415,GB 1835922416,1835922423,IT 1835922424,1835922455,GB 1835922456,1835922463,IT 1835922464,1835922559,GB 1835922560,1835922567,IT -1835922568,1835922815,GB -1835922816,1835922823,IT -1835922824,1835923351,GB +1835922568,1835922647,GB +1835922648,1835922655,IT +1835922656,1835923351,GB 1835923352,1835923359,IT -1835923360,1835923863,GB +1835923360,1835923487,GB +1835923488,1835923495,IT +1835923496,1835923863,GB 1835923864,1835923871,IT 1835923872,1835924375,GB 1835924376,1835924383,IT @@ -35131,7 +36325,9 @@ 1836598272,1836605439,FR 1836605440,1836612607,LU 1836612608,1836613631,DE -1836613632,1836630015,RU +1836613632,1836626943,RU +1836626944,1836627967,NL +1836627968,1836630015,RU 1836630016,1836646399,BG 1836646400,1836679167,RS 1836679168,1836686335,BG @@ -35255,7 +36451,7 @@ 1841590272,1841594367,PL 1841594368,1841598463,RU 1841598464,1841602559,PL -1841602560,1841610751,UA +1841606656,1841610751,UA 1841610752,1841618943,RU 1841618944,1841627135,PL 1841627136,1841629183,NO @@ -35678,9 +36874,13 @@ 1847730176,1847732223,PK 1847734272,1847735295,NZ 1847735296,1847736319,AU -1847736320,1847738367,HK +1847736320,1847738367,JP 1847738368,1847754751,KR -1847754752,1847780351,TH +1847754752,1847757823,TH +1847757824,1847758847,CN +1847758848,1847770111,TH +1847770112,1847771135,SG +1847771136,1847780351,TH 1847780352,1847780607,CN 1847780608,1847783423,TH 1847783424,1847787519,US @@ -35731,7 +36931,8 @@ 1850400768,1850408959,JP 1850408960,1850490879,CN 1850490880,1850507263,KR -1850507264,1850510335,AU +1850507776,1850508031,AU +1850509312,1850510335,AU 1850510336,1850511359,KR 1850511360,1850513407,ID 1850513408,1850514431,TH @@ -35775,8 +36976,7 @@ 1855979520,1856241663,JP 1856241664,1856307199,TH 1856307200,1856315391,KR -1856315392,1856319487,HK -1856319488,1856323583,CN +1856315392,1856323583,CN 1856323584,1856339967,KR 1856339968,1856372735,JP 1856372736,1856503807,CN @@ -35812,13 +37012,15 @@ 1860736000,1860737023,AU 1860737024,1860739071,JP 1860739072,1860743167,PH -1860743168,1860743333,AU +1860743168,1860743333,AP 1860743334,1860743334,HK -1860743335,1860743462,AU +1860743335,1860743462,AP 1860743463,1860743464,JP -1860743465,1860744191,AU +1860743465,1860743935,AP +1860743936,1860744191,AU 1860744192,1860745215,IN 1860745216,1860746239,AU +1860746240,1860747263,PK 1860747264,1860759551,JP 1860759552,1860761599,AU 1860761600,1860763647,IN @@ -35878,7 +37080,8 @@ 1868300288,1868333055,IN 1868333056,1868341247,PK 1868341248,1868345343,ID -1868345344,1868346367,AU +1868345344,1868346111,GU +1868346112,1868346367,AU 1868346368,1868347391,TH 1868347392,1868348415,AU 1868348416,1868349439,KR @@ -35939,7 +37142,6 @@ 1876769792,1876770815,JP 1876770816,1876787199,SG 1876787200,1876885503,CN -1876885504,1876893695,PH 1876893696,1876901887,TH 1876901888,1876918271,SG 1876918272,1876934655,LK @@ -35972,7 +37174,8 @@ 1883770880,1883783167,KR 1883783168,1883799551,VN 1883799552,1883832319,KR -1883832320,1884028927,CN +1883832320,1883833855,HK +1883833856,1884028927,CN 1884028928,1884159999,KR 1884160000,1884164095,VN 1884164096,1884168191,TW @@ -36003,8 +37206,8 @@ 1886978048,1886986239,KR 1886986240,1886990335,TW 1886990336,1886994431,IN -1886994432,1887008767,TW -1887008768,1887010815,HK +1886994432,1887005695,TW +1887005696,1887010815,HK 1887010816,1887019007,TH 1887019008,1887027199,HK 1887027200,1887043583,KR @@ -36015,7 +37218,9 @@ 1887961088,1887993855,JP 1887993856,1888026623,KR 1888026624,1888030719,BD -1888030720,1888034815,HK +1888030720,1888030975,HK +1888030976,1888031231,GB +1888031232,1888034815,HK 1888034816,1888038911,JP 1888038912,1888040959,CN 1888040960,1888041471,JP @@ -36094,8 +37299,11 @@ 1897213952,1897218047,JP 1897218048,1897222143,IN 1897222144,1897226239,TW -1897226240,1897234431,NC -1897234432,1897242623,MY +1897226240,1897231103,NC +1897231104,1897234431,VU +1897234432,1897238783,AP +1897238784,1897239039,MY +1897239040,1897242623,AP 1897242624,1897250815,TW 1897250816,1897259007,HK 1897259008,1897260031,NZ @@ -36120,8 +37328,7 @@ 1897779200,1897781247,AU 1897781248,1897783295,JP 1897783296,1897784319,SG -1897784320,1897784575,HK -1897784576,1897784831,SG +1897784320,1897784831,HK 1897784832,1897785343,KR 1897785344,1897787391,SG 1897787392,1897789439,AU @@ -36203,9 +37410,11 @@ 1909161984,1909194751,PK 1909194752,1909456895,CN 1909456896,1909473279,JP -1909473280,1909479939,HK +1909473280,1909474303,A2 +1909474304,1909475327,PH +1909475328,1909479939,A2 1909479940,1909479940,US -1909479941,1909481471,HK +1909479941,1909481471,A2 1909481472,1909587967,CN 1909587968,1909719039,MY 1909719040,1909735423,CN @@ -36246,7 +37455,7 @@ 1914601472,1914634239,KR 1914634240,1914642431,BD 1914642432,1914650623,KR -1914650624,1914652671,MN +1914652160,1914652415,MN 1914652672,1914654719,AU 1914654720,1914658815,JP 1914658816,1914660863,AU @@ -36254,7 +37463,8 @@ 1914662912,1914667007,KR 1914667008,1914683391,IN 1914683392,1914687487,AU -1914687488,1914689535,NZ +1914687488,1914688511,US +1914688512,1914689535,NZ 1914689536,1914691583,JP 1914691584,1914695679,IN 1914695680,1914697727,ID @@ -36291,10 +37501,12 @@ 1919909888,1919918079,AU 1919918080,1919926271,CN 1919926272,1919942655,KR -1919942656,1920006847,CN -1920006848,1920006911,HK -1920006912,1920069631,CN -1920069632,1920073727,HK +1919942656,1919999999,CN +1920000000,1920008191,HK +1920008192,1920057343,CN +1920057344,1920058111,HK +1920058112,1920072703,CN +1920072704,1920073727,HK 1920073728,1920466943,CN 1920466944,1920991231,ID 1920991232,1921056767,TH @@ -36312,14 +37524,15 @@ 1921253376,1921318911,CN 1921318912,1921384447,MY 1921384448,1921388543,NZ -1921388544,1921392639,PG 1921392640,1921400831,JP 1921400832,1921404927,ID 1921404928,1921405823,HK 1921405824,1921405855,MM 1921405856,1921405919,HK 1921405920,1921405951,MM -1921405952,1921406975,HK +1921405952,1921406463,HK +1921406464,1921406719,GB +1921406720,1921406975,HK 1921406976,1921409023,BD 1921409024,1921425407,JP 1921425408,1921431551,NZ @@ -36337,7 +37550,9 @@ 1921861632,1921863679,SG 1921865728,1921867775,ID 1921867776,1921871871,AU -1921871872,1921875967,US +1921871872,1921872895,US +1921872896,1921873663,NZ +1921873664,1921875967,US 1921875968,1921892351,CN 1921892352,1921896447,AU 1921896448,1921898495,SG @@ -36374,7 +37589,6 @@ 1931354112,1931362303,AU 1931362304,1931378687,TW 1931378688,1931427839,JP -1931427840,1931428351,PH 1931431936,1931433983,JP 1931433984,1931436031,AU 1931436032,1931444223,KR @@ -36445,10 +37659,12 @@ 1937516544,1937518591,IN 1937518592,1937522687,JP 1937522688,1937530879,ID -1937530880,1937532927,US -1937532928,1937535999,IN +1937530880,1937534463,IN +1937534464,1937534975,GB +1937534976,1937535999,IN 1937536000,1937536511,GB -1937536512,1937539071,IN +1937536512,1937537023,US +1937537024,1937539071,IN 1937539072,1937637375,JP 1937637376,1937670143,HK 1937670144,1937672191,NZ @@ -36481,8 +37697,7 @@ 1940258816,1940275199,AU 1940275200,1940283391,CN 1940283392,1940291583,ID -1940291584,1940295679,HK -1940295680,1940324351,JP +1940291584,1940324351,JP 1940324352,1940357119,PK 1940357120,1940389887,JP 1940389888,1940914175,CN @@ -36522,7 +37737,8 @@ 1946163200,1946165247,CN 1946165248,1946173439,PK 1946173440,1946173695,PG -1946173696,1946176511,SG +1946173696,1946175487,SG +1946175488,1946176511,SY 1946176512,1946176767,PH 1946176768,1946178047,SG 1946178048,1946178303,HK @@ -36549,12 +37765,13 @@ 1949440000,1949442047,ID 1949442048,1949446143,TW 1949446144,1949448191,JP -1949448192,1949448703,HK +1949448192,1949448447,AU +1949448448,1949448703,HK 1949448704,1949448959,AU 1949448960,1949449215,IN 1949449216,1949449471,SG 1949449472,1949449727,JP -1949449728,1949450239,HK +1949449728,1949450239,AU 1949450240,1949466623,IN 1949466624,1949499391,PH 1949499392,1949564927,SG @@ -36570,7 +37787,12 @@ 1950089216,1950351359,CN 1950351360,1950482431,JP 1950482432,1950515199,CN -1950515200,1950523391,IN +1950515200,1950517247,IN +1950517248,1950518271,US +1950518272,1950519295,IN +1950519296,1950520319,US +1950520320,1950521343,PH +1950521344,1950523391,IN 1950523392,1950527487,AU 1950527488,1950531583,JP 1950531584,1950533631,NP @@ -36651,15 +37873,14 @@ 1958830080,1958838271,JP 1958838272,1958842367,IN 1958842368,1958844415,NZ -1958845440,1958845951,MY -1958845952,1958846463,HK +1958845440,1958845695,MY +1958845696,1958846463,HK 1958846464,1958847487,IN 1958848512,1958850559,BD 1958850560,1958852607,CN 1958852608,1958853631,AU 1958853632,1958854655,ID -1958854656,1958858751,AU -1958858752,1958860799,NZ +1958854656,1958860799,AU 1958860800,1958862847,BD 1958862848,1958871039,JP 1958871040,1959067647,CN @@ -36708,9 +37929,17 @@ 1960187904,1960189951,IN 1960189952,1960202239,CN 1960202240,1960206335,JP -1960206336,1960212582,SG +1960206336,1960210431,SG +1960210432,1960210943,TH +1960210944,1960211455,SG +1960211456,1960211903,AU +1960211904,1960212479,SG +1960212480,1960212582,IN 1960212583,1960212583,AP -1960212584,1960214527,SG +1960212584,1960212735,IN +1960212736,1960214015,SG +1960214016,1960214271,IN +1960214272,1960214527,SG 1960214528,1960574975,CN 1960574976,1960837119,JP 1960837120,1961885695,CN @@ -36725,7 +37954,9 @@ 1962663936,1962672127,HK 1962672128,1962803199,CN 1962803200,1962827775,JP -1962827776,1962835967,ID +1962827776,1962829823,ID +1962829824,1962831871,JP +1962831872,1962835967,ID 1962835968,1962868735,CN 1962868736,1962885119,AU 1962885120,1962901503,KR @@ -36736,7 +37967,11 @@ 1964113920,1964118015,HK 1964118016,1964120063,ID 1964120064,1964122111,JP -1964122112,1964130303,SG +1964122112,1964122367,SG +1964122368,1964122879,JP +1964122880,1964126207,SG +1964126208,1964126463,HK +1964126464,1964130303,SG 1964130304,1964134399,HK 1964134400,1964136447,NZ 1964136448,1964138495,JP @@ -36807,7 +38042,7 @@ 1966800896,1967783935,CN 1967783936,1967800319,JP 1967800320,1967808511,CN -1967808512,1967812607,AT +1967808512,1967812607,AU 1967812608,1967816703,ID 1967816704,1969225727,CN 1969225728,1969487871,IN @@ -36930,7 +38165,7 @@ 1986498560,1986502655,HK 1986510848,1986519039,KR 1986519040,1986523135,PK -1986523136,1986525183,HK +1986523136,1986525183,CN 1986525184,1986527231,BN 1986527232,1986723839,JP 1986723840,1986740223,AU @@ -36972,9 +38207,7 @@ 1991442432,1991499775,BD 1991499776,1991507967,NC 1991507968,1991835647,CN -1991835648,1991852031,SG -1991852032,1991868415,CN -1991868416,1991901183,SG +1991835648,1991901183,SG 1991901184,1992097791,CN 1992097792,1992163327,SG 1992163328,1992818687,CN @@ -36995,7 +38228,7 @@ 1995702272,1996627967,CN 1996627968,1996630015,PH 1996630016,1996634111,ID -1996634112,1996636159,NP +1996634112,1996636159,AU 1996636160,1996644351,ID 1996644352,1996652543,BT 1996652544,1997078527,CN @@ -37042,9 +38275,13 @@ 1997723648,1997725695,JP 1997725696,1998061567,CN 1998061568,1998258175,JP -1998258176,1998271231,SG +1998258176,1998266367,SG +1998266368,1998268415,JP +1998268416,1998271231,SG 1998271232,1998271487,AU -1998271488,1998274559,SG +1998271488,1998271815,SG +1998271816,1998271823,JP +1998271824,1998274559,SG 1998274560,1998454783,CN 1998454784,1998456831,AU 1998456832,1998458879,JP @@ -37129,7 +38366,746 @@ 2001559552,2001567743,KR 2001567744,2001600511,TW 2001600512,2001797119,CN -2001797120,2001862655,SG +2001797120,2001798047,SG +2001798048,2001798079,US +2001798080,2001798087,SG +2001798088,2001798095,US +2001798096,2001798787,SG +2001798788,2001798791,AU +2001798792,2001799687,SG +2001799688,2001799695,US +2001799696,2001799711,SG +2001799712,2001799743,US +2001799744,2001799807,SG +2001799808,2001799935,US +2001799936,2001799967,SG +2001799968,2001799971,US +2001799972,2001800391,SG +2001800392,2001800399,US +2001800400,2001800927,SG +2001800928,2001800935,US +2001800936,2001801023,SG +2001801024,2001801039,US +2001801040,2001801055,SG +2001801056,2001801087,US +2001801088,2001801135,SG +2001801136,2001801151,US +2001801152,2001801339,SG +2001801340,2001801343,US +2001801344,2001801615,SG +2001801616,2001801623,NL +2001801624,2001801663,SG +2001801664,2001801703,US +2001801704,2001801711,SG +2001801712,2001801727,US +2001801728,2001801775,SG +2001801776,2001801807,US +2001801808,2001801919,SG +2001801920,2001801935,US +2001801936,2001801983,SG +2001801984,2001801999,US +2001802000,2001802191,SG +2001802192,2001802199,US +2001802200,2001802879,SG +2001802880,2001803007,US +2001803008,2001803215,SG +2001803216,2001803223,US +2001803224,2001803647,SG +2001803648,2001803679,US +2001803680,2001803735,SG +2001803736,2001803743,US +2001803744,2001803839,SG +2001803840,2001803871,US +2001803872,2001803903,SG +2001803904,2001803911,US +2001803912,2001803919,SG +2001803920,2001803935,US +2001803936,2001804015,SG +2001804016,2001804023,US +2001804024,2001805943,SG +2001805944,2001805951,US +2001805952,2001809383,SG +2001809384,2001809391,US +2001809392,2001810495,SG +2001810496,2001810527,MY +2001810528,2001810559,SG +2001810560,2001810623,MY +2001810624,2001812127,SG +2001812128,2001812159,SA +2001812160,2001812255,SG +2001812256,2001812263,US +2001812264,2001812671,SG +2001812672,2001812675,GB +2001812676,2001813655,SG +2001813656,2001813663,AU +2001813664,2001813783,SG +2001813784,2001813791,IN +2001813792,2001814431,SG +2001814432,2001814439,US +2001814440,2001814575,SG +2001814576,2001814583,US +2001814584,2001815191,SG +2001815192,2001815199,US +2001815200,2001817079,SG +2001817080,2001817087,US +2001817088,2001818639,SG +2001818640,2001818647,US +2001818648,2001818847,SG +2001818848,2001818851,AU +2001818852,2001819495,SG +2001819496,2001819503,US +2001819504,2001819887,SG +2001819888,2001819895,IE +2001819896,2001819999,SG +2001820000,2001820031,IE +2001820032,2001820719,SG +2001820720,2001820727,CA +2001820728,2001820991,SG +2001820992,2001820999,US +2001821000,2001821191,SG +2001821192,2001821199,US +2001821200,2001821335,SG +2001821336,2001821343,US +2001821344,2001821367,SG +2001821368,2001821375,US +2001821376,2001821423,SG +2001821424,2001821431,US +2001821432,2001821439,SG +2001821440,2001821447,US +2001821448,2001821623,SG +2001821624,2001821631,US +2001821632,2001823007,SG +2001823008,2001823015,US +2001823016,2001823447,SG +2001823448,2001823455,US +2001823456,2001824175,SG +2001824176,2001824183,US +2001824184,2001824287,SG +2001824288,2001824295,US +2001824296,2001824479,SG +2001824480,2001824487,US +2001824488,2001824495,SG +2001824496,2001824503,KR +2001824504,2001825183,SG +2001825184,2001825215,US +2001825216,2001825647,SG +2001825648,2001825655,US +2001825656,2001829891,SG +2001829892,2001829903,US +2001829904,2001830091,SG +2001830092,2001830095,US +2001830096,2001830175,SG +2001830176,2001830191,US +2001830192,2001830207,SG +2001830208,2001830223,US +2001830224,2001830335,SG +2001830336,2001830351,US +2001830352,2001830479,SG +2001830480,2001830495,US +2001830496,2001830567,SG +2001830568,2001830575,US +2001830576,2001830673,SG +2001830674,2001830674,HK +2001830675,2001830719,SG +2001830720,2001830783,US +2001830784,2001830927,SG +2001830928,2001830935,US +2001830936,2001830943,NL +2001830944,2001830975,SG +2001830976,2001830983,US +2001830984,2001831007,SG +2001831008,2001831015,US +2001831016,2001831027,SG +2001831028,2001831031,US +2001831032,2001831163,SG +2001831164,2001831167,US +2001831168,2001831287,SG +2001831288,2001831295,US +2001831296,2001831331,SG +2001831332,2001831335,US +2001831336,2001831683,SG +2001831684,2001831687,US +2001831688,2001831691,SG +2001831692,2001831703,US +2001831704,2001831915,SG +2001831916,2001831919,US +2001831920,2001831943,SG +2001831944,2001831951,US +2001831952,2001831963,SG +2001831964,2001831967,US +2001831968,2001831992,SG +2001831993,2001831993,US +2001831994,2001832135,SG +2001832136,2001832139,US +2001832140,2001832147,SG +2001832148,2001832151,US +2001832152,2001832315,SG +2001832316,2001832319,US +2001832320,2001832443,SG +2001832444,2001832447,US +2001832448,2001832615,SG +2001832616,2001832623,AZ +2001832624,2001832751,SG +2001832752,2001832759,IE +2001832760,2001832879,SG +2001832880,2001832887,US +2001832888,2001832903,SG +2001832904,2001832911,US +2001832912,2001832951,SG +2001832952,2001832955,US +2001832956,2001833007,SG +2001833008,2001833015,HK +2001833016,2001833071,SG +2001833072,2001833079,US +2001833080,2001833099,SG +2001833100,2001833103,US +2001833104,2001833255,SG +2001833256,2001833263,US +2001833264,2001833419,SG +2001833420,2001833421,US +2001833422,2001833439,SG +2001833440,2001833447,US +2001833448,2001833487,SG +2001833488,2001833495,US +2001833496,2001833655,SG +2001833656,2001833663,GB +2001833664,2001833679,SG +2001833680,2001833687,GB +2001833688,2001833727,SG +2001833728,2001833791,US +2001833792,2001834096,SG +2001834097,2001834097,US +2001834098,2001834239,SG +2001834240,2001834495,HK +2001834496,2001834751,SG +2001834752,2001834815,US +2001834816,2001834935,SG +2001834936,2001834943,JP +2001834944,2001834947,US +2001834948,2001835035,SG +2001835036,2001835039,US +2001835040,2001835103,SG +2001835104,2001835135,US +2001835136,2001835147,SG +2001835148,2001835151,US +2001835152,2001835231,SG +2001835232,2001835239,US +2001835240,2001835247,SG +2001835248,2001835263,US +2001835264,2001835515,SG +2001835516,2001835519,US +2001835520,2001835587,SG +2001835588,2001835591,US +2001835592,2001835711,SG +2001835712,2001835719,US +2001835720,2001835793,SG +2001835794,2001835794,US +2001835795,2001835795,SG +2001835796,2001835799,US +2001835800,2001835959,SG +2001835960,2001835983,US +2001835984,2001836107,SG +2001836108,2001836111,US +2001836112,2001836267,SG +2001836268,2001836271,US +2001836272,2001836291,SG +2001836292,2001836295,US +2001836296,2001836419,SG +2001836420,2001836423,US +2001836424,2001836427,SG +2001836428,2001836431,US +2001836432,2001836435,SG +2001836436,2001836439,US +2001836440,2001836451,SG +2001836452,2001836455,US +2001836456,2001836471,SG +2001836472,2001836487,US +2001836488,2001836506,SG +2001836507,2001836507,US +2001836508,2001836543,SG +2001836544,2001838079,US +2001838080,2001838627,SG +2001838628,2001838631,US +2001838632,2001838633,SG +2001838634,2001838634,HK +2001838635,2001838755,SG +2001838756,2001838759,US +2001838760,2001838763,SG +2001838764,2001838767,US +2001838768,2001838847,SG +2001838848,2001839103,HK +2001839104,2001839111,SG +2001839112,2001839115,US +2001839116,2001839535,SG +2001839536,2001839543,US +2001839544,2001839595,SG +2001839596,2001839599,SA +2001839600,2001839739,SG +2001839740,2001839743,US +2001839744,2001839775,SG +2001839776,2001839783,US +2001839784,2001839803,SG +2001839804,2001839807,US +2001839808,2001840057,SG +2001840058,2001840059,SA +2001840060,2001840071,SG +2001840072,2001840079,US +2001840080,2001840175,SG +2001840176,2001840183,US +2001840184,2001840767,SG +2001840768,2001840799,US +2001840800,2001841159,SG +2001841160,2001841167,US +2001841168,2001841175,SG +2001841176,2001841176,US +2001841177,2001841177,SA +2001841178,2001841179,SG +2001841180,2001841247,US +2001841248,2001841279,SA +2001841280,2001841311,SG +2001841312,2001841319,US +2001841320,2001841343,SG +2001841344,2001841407,US +2001841408,2001841639,SG +2001841640,2001841647,US +2001841648,2001842047,SG +2001842048,2001842111,US +2001842112,2001842175,SG +2001842176,2001842271,US +2001842272,2001842319,SG +2001842320,2001842327,US +2001842328,2001842343,SG +2001842344,2001842351,US +2001842352,2001842687,SG +2001842688,2001842751,US +2001842752,2001842783,SG +2001842784,2001842815,US +2001842816,2001843249,SG +2001843250,2001843251,US +2001843252,2001843471,SG +2001843472,2001843475,US +2001843476,2001843839,SG +2001843840,2001843967,US +2001843968,2001844127,SG +2001844128,2001845247,US +2001845248,2001845335,SG +2001845336,2001845343,US +2001845344,2001845359,SG +2001845360,2001845375,US +2001845376,2001845391,SG +2001845392,2001845503,US +2001845504,2001845695,SG +2001845696,2001845703,US +2001845704,2001845799,SG +2001845800,2001845807,US +2001845808,2001846015,SG +2001846016,2001846311,US +2001846312,2001846335,SG +2001846336,2001846359,US +2001846360,2001846479,SG +2001846480,2001846495,US +2001846496,2001846503,SG +2001846504,2001846511,US +2001846512,2001846519,SG +2001846520,2001846523,US +2001846524,2001846531,SG +2001846532,2001846543,US +2001846544,2001846559,SG +2001846560,2001846567,US +2001846568,2001846571,SG +2001846572,2001846607,US +2001846608,2001846615,SG +2001846616,2001846727,US +2001846728,2001846735,SG +2001846736,2001846755,US +2001846756,2001846847,SG +2001846848,2001846911,US +2001846912,2001846927,SG +2001846928,2001846943,US +2001846944,2001846959,SG +2001846960,2001846975,IN +2001846976,2001847071,SG +2001847072,2001847103,US +2001847104,2001847167,SG +2001847168,2001847416,US +2001847417,2001847417,SG +2001847418,2001847429,US +2001847430,2001847439,SG +2001847440,2001847455,US +2001847456,2001847463,SG +2001847464,2001847479,US +2001847480,2001847487,SG +2001847488,2001847491,US +2001847492,2001847493,SG +2001847494,2001847495,US +2001847496,2001847519,SG +2001847520,2001847535,US +2001847536,2001847537,SG +2001847538,2001847559,US +2001847560,2001847567,SG +2001847568,2001847575,US +2001847576,2001847591,SG +2001847592,2001847599,US +2001847600,2001847623,SG +2001847624,2001847647,US +2001847648,2001847663,SG +2001847664,2001847671,US +2001847672,2001847679,SG +2001847680,2001847703,US +2001847704,2001847711,SG +2001847712,2001847727,US +2001847728,2001847743,SG +2001847744,2001847747,US +2001847748,2001847755,SG +2001847756,2001847771,US +2001847772,2001847783,SG +2001847784,2001847791,US +2001847792,2001847799,SG +2001847800,2001847839,US +2001847840,2001847855,SG +2001847856,2001847871,US +2001847872,2001847875,SG +2001847876,2001847879,US +2001847880,2001847895,SG +2001847896,2001847903,US +2001847904,2001847935,SG +2001847936,2001847951,US +2001847952,2001847955,SG +2001847956,2001847959,US +2001847960,2001847963,SG +2001847964,2001847967,US +2001847968,2001847975,SG +2001847976,2001847979,US +2001847980,2001847981,SG +2001847982,2001847991,US +2001847992,2001848007,SG +2001848008,2001848015,US +2001848016,2001848047,SG +2001848048,2001848055,US +2001848056,2001848071,SG +2001848072,2001848079,IN +2001848080,2001848103,SG +2001848104,2001848111,US +2001848112,2001848135,SG +2001848136,2001848143,US +2001848144,2001848151,SG +2001848152,2001848167,US +2001848168,2001848189,SG +2001848190,2001848199,US +2001848200,2001848207,SG +2001848208,2001848231,US +2001848232,2001848247,SG +2001848248,2001848253,US +2001848254,2001848254,SG +2001848255,2001848255,MY +2001848256,2001848279,SG +2001848280,2001848287,US +2001848288,2001848303,SG +2001848304,2001848327,US +2001848328,2001848335,SG +2001848336,2001848367,US +2001848368,2001848383,SG +2001848384,2001848407,US +2001848408,2001848415,SG +2001848416,2001848447,US +2001848448,2001848479,SG +2001848480,2001848575,US +2001848576,2001848623,SG +2001848624,2001848679,US +2001848680,2001848687,SG +2001848688,2001848767,US +2001848768,2001848863,SG +2001848864,2001848879,US +2001848880,2001848895,SG +2001848896,2001848943,US +2001848944,2001848951,SG +2001848952,2001848975,US +2001848976,2001848991,SG +2001848992,2001849015,US +2001849016,2001849023,SG +2001849024,2001849167,US +2001849168,2001849183,SG +2001849184,2001849247,US +2001849248,2001849255,SG +2001849256,2001849271,US +2001849272,2001849279,SG +2001849280,2001850391,US +2001850392,2001850399,SG +2001850400,2001850415,US +2001850416,2001850423,SG +2001850424,2001850435,US +2001850436,2001850439,SG +2001850440,2001850515,US +2001850516,2001850517,SG +2001850518,2001850519,US +2001850520,2001850543,SG +2001850544,2001850551,US +2001850552,2001850591,SG +2001850592,2001850599,US +2001850600,2001850607,SG +2001850608,2001850624,US +2001850625,2001850625,SG +2001850626,2001850655,US +2001850656,2001850663,SG +2001850664,2001850667,US +2001850668,2001850679,SG +2001850680,2001850727,US +2001850728,2001850735,SG +2001850736,2001850791,US +2001850792,2001850795,SG +2001850796,2001850823,US +2001850824,2001850847,SG +2001850848,2001850863,US +2001850864,2001850867,SG +2001850868,2001850871,US +2001850872,2001850911,SG +2001850912,2001850935,US +2001850936,2001851023,SG +2001851024,2001851083,US +2001851084,2001851087,SG +2001851088,2001851095,US +2001851096,2001851099,SG +2001851100,2001851159,US +2001851160,2001851167,SG +2001851168,2001851175,US +2001851176,2001851231,SG +2001851232,2001851239,US +2001851240,2001851247,SG +2001851248,2001851255,US +2001851256,2001851271,SG +2001851272,2001851287,US +2001851288,2001851295,SG +2001851296,2001851303,US +2001851304,2001851311,SG +2001851312,2001851407,US +2001851408,2001851423,SG +2001851424,2001851479,US +2001851480,2001851487,SG +2001851488,2001851503,US +2001851504,2001851527,SG +2001851528,2001851535,US +2001851536,2001851551,SG +2001851552,2001851591,US +2001851592,2001851599,SG +2001851600,2001851631,US +2001851632,2001851647,SG +2001851648,2001851655,US +2001851656,2001851663,SG +2001851664,2001851711,US +2001851712,2001851727,SG +2001851728,2001851743,US +2001851744,2001851759,SG +2001851760,2001851767,US +2001851768,2001851771,SG +2001851772,2001851775,US +2001851776,2001851783,SG +2001851784,2001851807,US +2001851808,2001851815,SG +2001851816,2001851823,US +2001851824,2001851831,MY +2001851832,2001851883,US +2001851884,2001851903,SG +2001851904,2001851905,US +2001851906,2001851927,SG +2001851928,2001851935,US +2001851936,2001851967,SG +2001851968,2001851975,US +2001851976,2001851991,SG +2001851992,2001851999,US +2001852000,2001852007,SG +2001852008,2001852015,US +2001852016,2001852031,SG +2001852032,2001852055,US +2001852056,2001852065,SG +2001852066,2001852067,PH +2001852068,2001852103,US +2001852104,2001852111,SG +2001852112,2001852127,US +2001852128,2001852135,SG +2001852136,2001852167,US +2001852168,2001852175,SG +2001852176,2001852183,US +2001852184,2001852207,SG +2001852208,2001852215,US +2001852216,2001852257,SG +2001852258,2001852259,US +2001852260,2001852263,SG +2001852264,2001852271,US +2001852272,2001852279,SG +2001852280,2001852351,US +2001852352,2001852357,SG +2001852358,2001852359,US +2001852360,2001852367,SG +2001852368,2001852399,US +2001852400,2001852403,SG +2001852404,2001853015,US +2001853016,2001853039,SG +2001853040,2001853055,US +2001853056,2001853063,SG +2001853064,2001853071,US +2001853072,2001853079,SG +2001853080,2001853083,US +2001853084,2001853087,SG +2001853088,2001853239,US +2001853240,2001853255,SG +2001853256,2001853257,US +2001853258,2001853258,MY +2001853259,2001853263,SG +2001853264,2001853271,US +2001853272,2001853295,SG +2001853296,2001853303,US +2001853304,2001853335,SG +2001853336,2001853375,US +2001853376,2001853379,SG +2001853380,2001853381,US +2001853382,2001853383,SG +2001853384,2001853399,US +2001853400,2001853423,SG +2001853424,2001853439,US +2001853440,2001853463,SG +2001853464,2001853471,US +2001853472,2001853479,SG +2001853480,2001853487,SA +2001853488,2001853503,SG +2001853504,2001853543,US +2001853544,2001853559,SG +2001853560,2001853575,US +2001853576,2001853639,SG +2001853640,2001853663,US +2001853664,2001853671,SG +2001853672,2001853676,US +2001853677,2001853679,SG +2001853680,2001853687,US +2001853688,2001853703,SG +2001853704,2001853727,US +2001853728,2001853743,SG +2001853744,2001853759,US +2001853760,2001853803,SG +2001853804,2001853823,US +2001853824,2001853831,SG +2001853832,2001853855,US +2001853856,2001853863,SG +2001853864,2001853895,US +2001853896,2001853907,SG +2001853908,2001853911,US +2001853912,2001853943,SG +2001853944,2001853947,US +2001853948,2001853951,SG +2001853952,2001854463,US +2001854464,2001854475,SG +2001854476,2001854479,US +2001854480,2001854531,SG +2001854532,2001854535,US +2001854536,2001854547,SG +2001854548,2001854551,US +2001854552,2001854611,SG +2001854612,2001854615,US +2001854616,2001854703,SG +2001854704,2001854707,US +2001854708,2001854759,SG +2001854760,2001854763,US +2001854764,2001854767,SG +2001854768,2001854775,AR +2001854776,2001854783,SG +2001854784,2001854787,US +2001854788,2001854802,SG +2001854803,2001854803,US +2001854804,2001854863,SG +2001854864,2001854867,US +2001854868,2001855075,SG +2001855076,2001855079,US +2001855080,2001855083,SG +2001855084,2001855087,US +2001855088,2001855159,SG +2001855160,2001855167,US +2001855168,2001855183,SG +2001855184,2001855187,US +2001855188,2001855195,SG +2001855196,2001855199,US +2001855200,2001855223,SG +2001855224,2001855231,IN +2001855232,2001855247,SG +2001855248,2001855251,US +2001855252,2001855415,SG +2001855416,2001855417,US +2001855418,2001855419,SG +2001855420,2001855423,US +2001855424,2001855455,SG +2001855456,2001855459,US +2001855460,2001855655,SG +2001855656,2001855663,US +2001855664,2001855831,SG +2001855832,2001855839,US +2001855840,2001856055,SG +2001856056,2001856059,US +2001856060,2001856295,SG +2001856296,2001856303,US +2001856304,2001856355,SG +2001856356,2001856363,US +2001856364,2001856599,SG +2001856600,2001856603,US +2001856604,2001856639,SG +2001856640,2001856703,US +2001856704,2001856815,SG +2001856816,2001856823,US +2001856824,2001856835,SG +2001856836,2001856847,US +2001856848,2001857283,SG +2001857284,2001857287,US +2001857288,2001857383,SG +2001857384,2001857391,US +2001857392,2001857399,SG +2001857400,2001857407,US +2001857408,2001857428,SG +2001857429,2001857429,US +2001857430,2001857430,NL +2001857431,2001857975,SG +2001857976,2001857983,US +2001857984,2001858007,SG +2001858008,2001858011,US +2001858012,2001858111,SG +2001858112,2001858143,US +2001858144,2001859007,SG +2001859008,2001859015,NL +2001859016,2001859039,SG +2001859040,2001859071,US +2001859072,2001859791,SG +2001859792,2001859799,US +2001859800,2001859807,SG +2001859808,2001859811,US +2001859812,2001859899,SG +2001859900,2001859903,US +2001859904,2001860119,SG +2001860120,2001860127,US +2001860128,2001860227,SG +2001860228,2001860231,US +2001860232,2001860335,SG +2001860336,2001860343,US +2001860344,2001860439,SG +2001860440,2001860443,US +2001860444,2001860527,SG +2001860528,2001860531,US +2001860532,2001860603,SG +2001860604,2001860607,US +2001860608,2001860791,SG +2001860792,2001860795,US +2001860796,2001860855,SG +2001860856,2001860863,US +2001860864,2001860903,SG +2001860904,2001860907,US +2001860908,2001860959,SG +2001860960,2001860963,US +2001860964,2001861087,SG +2001861088,2001861095,US +2001861096,2001861207,SG +2001861208,2001861215,US +2001861216,2001861399,SG +2001861400,2001861415,US +2001861416,2001861439,SG +2001861440,2001861447,AU +2001861448,2001862015,SG +2001862016,2001862047,US +2001862048,2001862655,SG 2001862656,2001864703,AU 2001864704,2001870847,JP 2001870848,2001879039,KR @@ -37227,12 +39203,15 @@ 2015185920,2015199231,PH 2015199232,2015203327,KR 2015203328,2015204095,JP -2015204096,2015205375,US +2015204096,2015204351,US +2015204352,2015205375,JP 2015205376,2015207423,ID 2015207424,2015215615,JP 2015215616,2015216383,IN 2015216384,2015216639,AU -2015216640,2015219711,IN +2015216640,2015217663,IN +2015217664,2015219456,GU +2015219457,2015219711,IN 2015219712,2015219967,US 2015219968,2015220223,PH 2015220224,2015220479,IN @@ -37289,13 +39268,14 @@ 2022180864,2022182911,JP 2022184960,2022187007,KH 2022187008,2022191103,HK -2022191104,2022195199,NZ +2022191104,2022194175,NZ +2022194176,2022194687,AU +2022194688,2022195199,NZ 2022195200,2022211583,KR 2022211584,2022227967,CN 2022227968,2022244351,JP 2022244352,2022277119,CN 2022277120,2022309887,JP -2022309888,2022313983,PH 2022313984,2022318079,NZ 2022318080,2022319135,AU 2022319136,2022319151,SG @@ -37450,18 +39430,17 @@ 2046836736,2046885887,CN 2046885888,2046951423,JP 2046951424,2047082495,PH -2047082496,2047442943,CN -2047442944,2047492095,HK +2047082496,2047410175,CN +2047410176,2047492095,HK 2047492096,2047496191,KR -2047496192,2047508479,HK -2047508480,2047526911,CN -2047526912,2047531007,HK -2047531008,2047574015,CN +2047496192,2047506431,HK +2047506432,2047508479,US +2047508480,2047517695,CN +2047517696,2047518719,HK +2047518720,2047574015,CN 2047574016,2047606783,SG -2047606784,2047770623,CN -2047770624,2047787007,HK -2047787008,2047868415,CN -2047868416,2047868927,SG +2047606784,2047803391,CN +2047803392,2047868927,SG 2047868928,2048917503,JP 2048917504,2049966079,KR 2049966080,2050047999,CN @@ -37472,8 +39451,7 @@ 2050084864,2050088959,PH 2050088960,2050091007,ID 2050091008,2050097151,JP -2050097152,2050099199,SG -2050099200,2050101247,IN +2050097152,2050101247,SG 2050101248,2050113535,JP 2050113536,2050129663,SG 2050129664,2050129919,JP @@ -37510,8 +39488,10 @@ 2053534720,2053537791,IN 2053537792,2053636095,JP 2053636096,2054160383,AU -2054160384,2054373375,CN -2054373376,2054377471,HK +2054160384,2054189567,CN +2054189568,2054190591,HK +2054190592,2054376447,CN +2054376448,2054377471,HK 2054377472,2054422527,CN 2054422528,2054619135,TW 2054619136,2054684671,CN @@ -37554,7 +39534,9 @@ 2056806400,2056814591,KR 2056814592,2056816863,JP 2056816864,2056816895,MY -2056816896,2056817663,JP +2056816896,2056817335,JP +2056817336,2056817343,HK +2056817344,2056817663,JP 2056817664,2056817919,AU 2056817920,2056818431,JP 2056818432,2056818687,SG @@ -37562,7 +39544,9 @@ 2056818944,2056818993,MY 2056818994,2056818994,AP 2056818995,2056819199,MY -2056819200,2056830975,JP +2056819200,2056823849,JP +2056823850,2056823850,SG +2056823851,2056830975,JP 2056830976,2056847359,CN 2056847360,2056912895,KR 2056912896,2057043967,TH @@ -37614,23 +39598,24 @@ 2063085568,2063089663,CN 2063089664,2063097855,JP 2063097856,2063106047,MM -2063106048,2063106559,JP +2063106048,2063106559,SG 2063106560,2063106815,AU -2063106816,2063107071,JP +2063106816,2063107071,SG 2063107072,2063107327,AP -2063107328,2063107623,JP +2063107328,2063107623,SG 2063107624,2063107631,AU -2063107632,2063111167,JP -2063111168,2063112191,AU -2063112192,2063113727,JP -2063113728,2063113983,AU -2063113984,2063114495,JP -2063114496,2063114751,IN -2063114752,2063115007,JP -2063115008,2063115263,IN +2063107632,2063108095,SG +2063108096,2063110143,HK +2063110144,2063111167,JP +2063111168,2063114239,AU +2063114240,2063115263,IN 2063115264,2063117311,JP 2063117312,2063117567,NZ -2063117568,2063118335,JP +2063117568,2063117823,JP +2063117824,2063117839,PH +2063117840,2063117951,JP +2063117952,2063118079,PH +2063118080,2063118335,JP 2063118336,2063118591,IN 2063118592,2063119871,JP 2063119872,2063120383,IN @@ -37640,10 +39625,10 @@ 2063122432,2063138815,SG 2063138816,2063335423,JP 2063335424,2063341567,AU -2063341568,2063343615,SG -2063343616,2063351807,AP +2063341568,2063351807,AP 2063351808,2063368191,KR -2063368192,2063372287,JP +2063368192,2063370239,AP +2063370240,2063372287,JP 2063372288,2063374335,AP 2063374336,2063376383,NZ 2063376384,2063380479,TW @@ -37703,9 +39688,12 @@ 2070183936,2070192127,AU 2070192128,2070200319,KR 2070200320,2070208511,JP -2070208512,2070210047,SG -2070210048,2070210303,AU -2070210304,2070216703,SG +2070208512,2070209279,MY +2070209280,2070209535,SG +2070209536,2070210559,AU +2070210560,2070210815,SG +2070210816,2070211071,AU +2070211072,2070216703,SG 2070216704,2070282239,CN 2070282240,2070347775,AU 2070347776,2070380543,CN @@ -37820,8 +39808,7 @@ 2080768000,2080776191,TW 2080776192,2080777215,HK 2080777216,2080778239,GB -2080778240,2080779263,US -2080779264,2080780287,SG +2080778240,2080780287,US 2080780288,2080781311,ID 2080781312,2080784383,SG 2080784384,2080800767,CN @@ -37867,6 +39854,7 @@ 2084569088,2084732927,CN 2084732928,2084741119,SG 2084741120,2084743167,ID +2084743168,2084745215,JP 2084745216,2084749311,KR 2084749312,2084753407,JP 2084753408,2084757503,KR @@ -37888,8 +39876,10 @@ 2087460864,2087462911,JP 2087462912,2087464959,CN 2087464960,2087467007,KH -2087467008,2087469055,JP -2087469056,2087477247,HK +2087467008,2087471103,JP +2087471104,2087472127,SG +2087472128,2087476223,HK +2087476224,2087477247,TW 2087477248,2087478271,AU 2087478272,2087485439,HK 2087485440,2087501823,TW @@ -37937,8 +39927,7 @@ 2090680320,2090696703,NZ 2090696704,2090729471,TH 2090729472,2090733567,VN -2090733568,2090736639,AU -2090736640,2090737663,IN +2090733568,2090737663,AU 2090737664,2090745855,PH 2090745856,2090762239,MN 2090762240,2090778623,ID @@ -37996,7 +39985,8 @@ 2096668672,2096676863,KH 2096676864,2096693247,HK 2096693248,2096889855,CN -2096889856,2096955391,AU +2096889856,2096902143,BE +2096902144,2096955391,AU 2096955392,2097020927,IN 2097020928,2097037311,CN 2097037312,2097053695,AU @@ -38088,12 +40078,14 @@ 2113688576,2113693599,JP 2113693600,2113693615,HK 2113693616,2113716223,JP -2113716224,2113732607,SG +2113716224,2113724927,SG +2113724928,2113725183,IN +2113725184,2113728511,SG +2113728512,2113732607,JP 2113732608,2113761279,AU 2113761280,2113765375,VN 2113765376,2113798143,HK 2113798144,2113811455,AU -2113811456,2113812479,HK 2113812480,2113813503,JP 2113813504,2113830911,AU 2113830912,2113863679,CN @@ -38149,7 +40141,8 @@ 2151784448,2151792639,IR 2151792640,2151794687,CH 2151794688,2151796735,IT -2151796736,2151798783,NL +2151796736,2151797759,DE +2151797760,2151798783,NL 2151798784,2151799807,DE 2151799808,2151800831,NL 2151800832,2151809023,PT @@ -38170,7 +40163,12 @@ 2153385728,2153385791,PL 2153385792,2153385855,PT 2153385856,2153385919,TR -2153385920,2153406463,US +2153385920,2153385983,US +2153385984,2153387007,GB +2153387008,2153387263,CH +2153387264,2153387775,US +2153387776,2153388031,CH +2153388032,2153406463,US 2153406464,2153407487,JP 2153407488,2153407743,HK 2153407744,2153407999,US @@ -38210,9 +40208,16 @@ 2155825152,2155827199,AE 2155827200,2155831295,PL 2155831296,2155833343,RU -2155833344,2155834623,SE +2155833344,2155833855,SE +2155833856,2155834084,NL +2155834085,2155834111,SE +2155834112,2155834367,NL +2155834368,2155834464,SE +2155834465,2155834512,NL +2155834513,2155834532,SE +2155834533,2155834623,NL 2155834624,2155834879,LU -2155834880,2155835391,SE +2155834880,2155835391,NL 2155835392,2155839487,RO 2155839488,2155843583,FR 2155843584,2155845631,RU @@ -38220,7 +40225,7 @@ 2155847680,2155849727,ES 2155849728,2155851775,TR 2155853824,2155855871,SE -2155855872,2155872255,RO +2155855872,2155872255,SA 2155872256,2156003327,US 2156003328,2156134399,AT 2156134400,2156265471,US @@ -38608,30 +40613,25 @@ 2193686528,2193688575,FR 2193688576,2193692671,CZ 2193692672,2193694719,FR -2193694720,2193695743,US -2193695744,2193696767,RU -2193696768,2193697791,US -2193697792,2193698815,RU -2193698816,2193701887,US -2193701888,2193704959,RU +2193694720,2193704959,RU 2193704960,2193707007,IT 2193707008,2193707407,GB 2193707408,2193707415,IT -2193707416,2193707751,GB +2193707416,2193707559,GB +2193707560,2193707567,IT +2193707568,2193707615,GB +2193707616,2193707623,IT +2193707624,2193707751,GB 2193707752,2193707759,IT 2193707760,2193707831,GB 2193707832,2193707839,IT -2193707840,2193707975,GB -2193707976,2193707983,IT -2193707984,2193708295,GB -2193708296,2193708303,IT -2193708304,2193708327,GB -2193708328,2193708335,IT -2193708336,2193708495,GB -2193708496,2193708503,IT -2193708504,2193708511,GB +2193707840,2193708511,GB 2193708512,2193708519,IT -2193708520,2193711103,GB +2193708520,2193708735,GB +2193708736,2193708743,IT +2193708744,2193709087,GB +2193709088,2193709095,IT +2193709096,2193711103,GB 2193711104,2193713151,DE 2193713152,2193715199,ES 2193715200,2193717247,DE @@ -38648,8 +40648,9 @@ 2194604032,2194669567,US 2194669568,2194735103,IS 2194735104,2194800639,GB -2194800640,2194866175,US -2194931712,2195069436,US +2194800640,2194888509,US +2194888510,2194888510,IE +2194888511,2195069436,US 2195069437,2195069437,AP 2195069438,2195073023,US 2195073024,2195073279,EU @@ -38674,7 +40675,9 @@ 2197553152,2197749759,US 2197749760,2197751807,IQ 2197751808,2197753855,RU -2197753856,2197757951,GB +2197753856,2197754879,GB +2197754880,2197755135,DK +2197755136,2197757951,GB 2197757952,2197766143,RU 2197766144,2197768191,PS 2197768192,2197770239,DE @@ -38684,7 +40687,9 @@ 2197776384,2197778431,DE 2197778432,2197780479,IT 2197780480,2197782527,DE -2197782528,2197782783,RU +2197782528,2197782685,RU +2197782686,2197782686,UA +2197782687,2197782783,RU 2197782784,2197783039,UA 2197783040,2197786623,RU 2197786624,2197788671,IT @@ -38694,8 +40699,46 @@ 2197794816,2197796863,SA 2197796864,2197798911,DE 2197798912,2197815295,IR +2197815296,2197816319,BO +2197816320,2197828607,BR +2197828608,2197829631,AR +2197829632,2197833727,BR +2197833728,2197834751,CR +2197834752,2197841919,BR +2197841920,2197842943,AR +2197842944,2197843967,CL +2197843968,2197847039,BR +2197847040,2197848063,MX +2197848064,2197849087,AR +2197849088,2197850111,BR +2197850112,2197851135,CO +2197851136,2197858303,BR +2197858304,2197859327,CO +2197859328,2197860351,CL +2197860352,2197865471,BR +2197865472,2197866495,AR +2197867520,2197869567,BR +2197869568,2197870591,UY +2197870592,2197874687,BR +2197874688,2197875711,AR +2197875712,2197876735,MX +2197876736,2197880831,BR 2197880832,2197946367,IT -2197946368,2204172287,US +2197946368,2202533887,US +2202533888,2202534911,AR +2202534912,2202540031,BR +2202540032,2202541055,PY +2202541056,2202542079,AR +2202542080,2202550271,BR +2202552320,2202553343,AR +2202554368,2202559487,BR +2202562560,2202563583,CW +2202565632,2202566655,BR +2202567680,2202568703,AR +2202569728,2202570751,BR +2202573824,2202574847,AR +2202574848,2202578943,BR +2202599424,2204172287,US 2204172288,2204237823,SE 2204237824,2204303359,US 2204303360,2204368895,DE @@ -38798,12 +40841,12 @@ 2212757504,2212761599,FI 2212761600,2212762623,GB 2212762624,2212764927,FI -2212764928,2212765183,BG +2212764928,2212765183,GB 2212765184,2212766719,FI 2212766720,2212767743,GB 2212767744,2212796415,FI -2212796416,2212797951,NL -2212797952,2212804095,FI +2212796416,2212798463,NL +2212798464,2212804095,FI 2212804096,2212804351,NL 2212804352,2212807679,FI 2212807680,2212808703,US @@ -38845,6 +40888,7 @@ 2224685056,2224750591,US 2224750592,2224816127,FI 2224816128,2224881663,CA +2224881664,2224947199,PE 2224947200,2225340415,US 2225340416,2225733631,FR 2225733632,2225799167,US @@ -38857,6 +40901,7 @@ 2226454528,2226520063,NZ 2226520064,2226585599,JP 2226585600,2226651135,US +2226651136,2226716671,PE 2226716672,2226782207,GB 2226782208,2226847743,ZA 2226847744,2226913279,DE @@ -38867,6 +40912,7 @@ 2227052610,2227052610,CH 2227052611,2227052799,EU 2227052800,2227109887,US +2227109888,2227175423,PE 2227175424,2227372031,US 2227372032,2227437567,DE 2227437568,2227503103,SE @@ -38897,6 +40943,8 @@ 2230714368,2230779903,CA 2230779904,2230910975,MX 2230910976,2231042047,US +2231042048,2231099391,PE +2231099392,2231107583,BO 2231107584,2231173119,DE 2231173120,2231238655,US 2231238656,2231304191,MX @@ -38979,7 +41027,12 @@ 2254045184,2254077951,GE 2254077952,2254079999,BA 2254080000,2254082047,FR -2254082048,2254084095,NO +2254082048,2254082559,NO +2254082560,2254082815,NL +2254082816,2254083071,NO +2254083072,2254083327,US +2254083328,2254083583,DK +2254083584,2254084095,NO 2254084096,2254094335,RU 2254094336,2254098431,GB 2254098432,2254100479,RU @@ -39025,228 +41078,328 @@ 2258305024,2258370559,DE 2258370560,2258436095,US 2258436096,2258567167,FR -2258567168,2258568191,US +2258567168,2258568191,TW 2258568192,2258568447,HK -2258568448,2258582783,US +2258568448,2258571647,TW +2258571648,2258571711,US +2258571712,2258571719,TW +2258571720,2258571735,US +2258571736,2258571743,TW +2258571744,2258571751,US +2258571752,2258571763,TW +2258571764,2258571767,US +2258571768,2258579463,TW +2258579464,2258579467,US +2258579468,2258579967,TW +2258579968,2258580031,US +2258580032,2258582783,TW 2258582784,2258582791,GB -2258582792,2258583551,US -2258583552,2258591743,GB -2258591744,2258591935,AU +2258582792,2258583551,TW +2258583552,2258583575,GB +2258583576,2258583583,TW +2258583584,2258583775,GB +2258583776,2258583807,TW +2258583808,2258583935,GB +2258583936,2258583967,TW +2258583968,2258584007,GB +2258584008,2258584351,TW +2258584352,2258584383,GB +2258584384,2258584574,TW +2258584575,2258584575,GB +2258584576,2258591575,TW +2258591576,2258591579,GB +2258591580,2258591631,TW +2258591632,2258591639,GB +2258591640,2258591935,TW 2258591936,2258591967,HK -2258591968,2258592271,AU +2258591968,2258592271,TW 2258592272,2258592279,JP -2258592280,2258592287,AU +2258592280,2258592287,TW 2258592288,2258592291,JP -2258592292,2258592439,AU +2258592292,2258592439,TW 2258592440,2258592447,JP -2258592448,2258592791,AU +2258592448,2258592479,TW +2258592480,2258592495,AU +2258592496,2258592511,TW +2258592512,2258592767,AU +2258592768,2258592791,TW 2258592792,2258592803,HK -2258592804,2258593279,AU +2258592804,2258593279,TW 2258593280,2258593535,HK -2258593536,2258594047,AU +2258593536,2258594047,TW 2258594048,2258594111,HK -2258594112,2258594303,AU +2258594112,2258594303,TW 2258594304,2258594319,HK -2258594320,2258594559,PG +2258594320,2258594559,TW 2258594560,2258594607,HK 2258594608,2258594613,AP 2258594614,2258594614,HK 2258594615,2258594623,AP 2258594624,2258594751,HK 2258594752,2258594815,AP -2258594816,2258595103,AU -2258595104,2258595167,TW -2258595168,2258595231,AU -2258595232,2258595263,TW -2258595264,2258595295,AU -2258595296,2258595327,TW -2258595328,2258595383,AU +2258594816,2258595167,TW +2258595168,2258595199,AU +2258595200,2258595383,TW 2258595384,2258595391,KR -2258595392,2258595887,AU +2258595392,2258595519,TW +2258595520,2258595551,AU +2258595552,2258595887,TW 2258595888,2258595895,NZ -2258595896,2258595967,AU -2258595968,2258595983,TW -2258595984,2258596095,AU +2258595896,2258595983,TW +2258595984,2258595991,AU +2258595992,2258596031,TW +2258596032,2258596063,AU +2258596064,2258596095,TW 2258596096,2258596103,HK -2258596104,2258596159,AU +2258596104,2258596159,TW 2258596160,2258596255,HK -2258596256,2258596351,AU +2258596256,2258596351,TW 2258596352,2258596383,AP 2258596384,2258596415,HK 2258596416,2258596447,AP 2258596448,2258596511,HK 2258596512,2258596703,AP 2258596704,2258596863,HK -2258596864,2258596887,AU +2258596864,2258596887,TW 2258596888,2258596903,HK -2258596904,2258596991,AU +2258596904,2258596991,TW 2258596992,2258597023,HK -2258597024,2258597071,AU -2258597072,2258597079,TW -2258597080,2258597115,AU +2258597024,2258597115,TW 2258597116,2258597215,HK -2258597216,2258597263,PG +2258597216,2258597263,TW 2258597264,2258597293,HK 2258597294,2258597294,PG 2258597295,2258597303,HK -2258597304,2258597311,PG +2258597304,2258597311,TW 2258597312,2258597367,HK -2258597368,2258597371,PG +2258597368,2258597371,TW 2258597372,2258597535,HK -2258597536,2258597567,AU +2258597536,2258597567,TW 2258597568,2258597583,HK -2258597584,2258597599,AU +2258597584,2258597599,TW 2258597600,2258597631,HK 2258597632,2258597759,AU 2258597760,2258597887,HK -2258597888,2258597903,AU +2258597888,2258597895,AU +2258597896,2258597903,TW 2258597904,2258597919,JP 2258597920,2258597927,AU 2258597928,2258597935,JP -2258597936,2258598079,AU -2258598080,2258598087,TW -2258598088,2258598095,AU -2258598096,2258598111,TW +2258597936,2258597951,AU +2258597952,2258597975,TW +2258597976,2258597983,AU +2258597984,2258597999,TW +2258598000,2258598007,AU +2258598008,2258598111,TW 2258598112,2258598143,JP -2258598144,2258598495,AU +2258598144,2258598351,TW +2258598352,2258598367,AU +2258598368,2258598399,TW +2258598400,2258598439,AU +2258598440,2258598447,TW +2258598448,2258598479,AU +2258598480,2258598495,TW 2258598496,2258598511,NZ -2258598512,2258598519,AU +2258598512,2258598519,TW 2258598520,2258598527,JP -2258598528,2258598623,AU -2258598624,2258598655,TW -2258598656,2258599183,AU +2258598528,2258598567,TW +2258598568,2258598623,AU +2258598624,2258598667,TW +2258598668,2258598671,AU +2258598672,2258598991,TW +2258598992,2258598999,AU +2258599000,2258599011,TW +2258599012,2258599019,AU +2258599020,2258599183,TW 2258599184,2258599187,JP -2258599188,2258599675,AU +2258599188,2258599499,TW +2258599500,2258599503,AU +2258599504,2258599587,TW +2258599588,2258599591,AU +2258599592,2258599675,TW 2258599676,2258599679,JP -2258599680,2258600263,AU +2258599680,2258599743,TW +2258599744,2258599747,AU +2258599748,2258600263,TW 2258600264,2258600267,HK -2258600268,2258600515,AU +2258600268,2258600515,TW 2258600516,2258600519,IN -2258600520,2258600523,AU +2258600520,2258600523,TW 2258600524,2258600527,IN -2258600528,2258600959,AU +2258600528,2258600735,TW +2258600736,2258600739,AU +2258600740,2258600807,TW +2258600808,2258600811,AU +2258600812,2258600959,TW 2258600960,2258601087,SG -2258601088,2258601167,AU +2258601088,2258601119,AU +2258601120,2258601151,TW +2258601152,2258601167,AU 2258601168,2258601175,NZ -2258601176,2258601215,AU +2258601176,2258601199,AU +2258601200,2258601207,TW +2258601208,2258601215,AU 2258601216,2258601343,TW -2258601344,2258601471,AU +2258601344,2258601359,AU +2258601360,2258601367,TW +2258601368,2258601375,AU +2258601376,2258601407,TW +2258601408,2258601423,AU +2258601424,2258601471,TW 2258601472,2258601983,JP -2258601984,2258602303,AU +2258601984,2258602303,TW 2258602304,2258602327,HK -2258602328,2258602335,AU +2258602328,2258602335,TW 2258602336,2258602367,HK -2258602368,2258602399,AU +2258602368,2258602399,TW 2258602400,2258602447,HK -2258602448,2258602479,AU +2258602448,2258602479,TW 2258602480,2258602495,HK -2258602496,2258602815,AU +2258602496,2258602815,TW 2258602816,2258602879,HK -2258602880,2258603007,AU +2258602880,2258603007,TW 2258603008,2258603071,HK -2258603072,2258603087,PG +2258603072,2258603087,TW 2258603088,2258603089,HK 2258603090,2258603090,PG 2258603091,2258603103,HK -2258603104,2258603135,PG +2258603104,2258603135,TW 2258603136,2258603139,HK -2258603140,2258603199,PG +2258603140,2258603199,TW 2258603200,2258603207,HK -2258603208,2258603263,PG -2258603264,2258603775,AU +2258603208,2258603263,TW +2258603264,2258603279,AU +2258603280,2258603287,TW +2258603288,2258603295,AU +2258603296,2258603775,TW 2258603776,2258603839,HK -2258603840,2258603903,AU +2258603840,2258603903,TW 2258603904,2258603943,HK -2258603944,2258603951,AU +2258603944,2258603951,TW 2258603952,2258603967,HK -2258603968,2258604031,AU +2258603968,2258604031,TW 2258604032,2258604287,HK -2258604288,2258604671,AU +2258604288,2258604671,TW 2258604672,2258604735,SG 2258604736,2258604799,AU 2258604800,2258604831,AP 2258604832,2258605039,HK 2258605040,2258605047,AP 2258605048,2258605055,HK -2258605056,2258605311,AU +2258605056,2258605311,TW 2258605312,2258605439,SG -2258605440,2258606143,AU +2258605440,2258605823,TW +2258605824,2258605951,AU +2258605952,2258605999,TW +2258606000,2258606015,AU +2258606016,2258606047,TW +2258606048,2258606079,AU +2258606080,2258606143,TW 2258606144,2258606147,HK -2258606148,2258606151,AU +2258606148,2258606151,TW 2258606152,2258606191,HK -2258606192,2258606199,AU +2258606192,2258606199,TW 2258606200,2258606367,HK -2258606368,2258606415,AU +2258606368,2258606415,TW 2258606416,2258606423,HK -2258606424,2258606463,AU +2258606424,2258606463,TW 2258606464,2258606471,HK -2258606472,2258606487,AU +2258606472,2258606487,TW 2258606488,2258606535,HK -2258606536,2258606963,AU +2258606536,2258606719,TW +2258606720,2258606751,AU +2258606752,2258606847,TW +2258606848,2258606879,AU +2258606880,2258606963,TW 2258606964,2258606967,NZ -2258606968,2258607091,AU +2258606968,2258606971,AU +2258606972,2258607007,TW +2258607008,2258607039,AU +2258607040,2258607087,TW +2258607088,2258607091,AU 2258607092,2258607095,NZ -2258607096,2258607351,AU +2258607096,2258607103,AU +2258607104,2258607263,TW +2258607264,2258607279,AU +2258607280,2258607351,TW 2258607352,2258607359,NZ -2258607360,2258607819,AU +2258607360,2258607519,AU +2258607520,2258607543,TW +2258607544,2258607551,AU +2258607552,2258607819,TW 2258607820,2258607823,HK -2258607824,2258607871,AU +2258607824,2258607871,TW 2258607872,2258607879,HK -2258607880,2258607903,AU +2258607880,2258607903,TW 2258607904,2258607999,HK -2258608000,2258608063,AU -2258608064,2258608183,HK -2258608184,2258608187,TW -2258608188,2258608255,HK +2258608000,2258608063,TW +2258608064,2258608127,HK +2258608128,2258608255,TW 2258608256,2258608259,JP -2258608260,2258608279,HK +2258608260,2258608279,TW 2258608280,2258608283,JP -2258608284,2258608639,HK -2258608640,2258608655,AU +2258608284,2258608639,TW +2258608640,2258608647,AU +2258608648,2258608655,TW 2258608656,2258608663,JP -2258608664,2258608671,AU +2258608664,2258608671,TW 2258608672,2258608687,JP -2258608688,2258609663,AU -2258609664,2258609919,HK +2258608688,2258608863,AU +2258608864,2258608879,TW +2258608880,2258608895,AU +2258608896,2258609087,TW +2258609088,2258609119,AU +2258609120,2258609151,TW +2258609152,2258609407,AU +2258609408,2258609423,TW +2258609424,2258609471,AU +2258609472,2258609567,TW +2258609568,2258609575,AU +2258609576,2258609919,TW 2258609920,2258609967,AU -2258609968,2258610175,HK -2258610176,2258610431,IN +2258609968,2258610179,TW +2258610180,2258610183,IN +2258610184,2258610239,TW +2258610240,2258610303,IN +2258610304,2258610431,TW 2258610432,2258610687,AU -2258610688,2258610703,HK -2258610704,2258610719,TW -2258610720,2258610751,HK -2258610752,2258610755,TW -2258610756,2258610759,HK -2258610760,2258610783,TW -2258610784,2258611071,HK +2258610688,2258611071,TW 2258611072,2258611103,JP -2258611104,2258611119,HK +2258611104,2258611119,TW 2258611120,2258611167,JP -2258611168,2258611215,HK +2258611168,2258611215,TW 2258611216,2258611223,NZ -2258611224,2258611567,HK +2258611224,2258611567,TW 2258611568,2258611583,AU -2258611584,2258612223,HK +2258611584,2258612223,TW 2258612224,2258612303,AU -2258612304,2258612351,HK +2258612304,2258612351,TW 2258612352,2258612367,AU -2258612368,2258612383,HK +2258612368,2258612383,TW 2258612384,2258612743,AU -2258612744,2258613503,HK +2258612744,2258613503,TW 2258613504,2258613567,AU -2258613568,2258614783,HK +2258613568,2258614783,TW 2258614784,2258614815,IN -2258614816,2258615039,HK +2258614816,2258615039,TW 2258615040,2258615055,IN -2258615056,2258615295,HK -2258615296,2258615807,AU -2258615808,2258616191,HK +2258615056,2258615347,TW +2258615348,2258615355,AU +2258615356,2258615391,TW +2258615392,2258615395,AU +2258615396,2258616191,TW 2258616192,2258616203,AU -2258616204,2258616207,HK +2258616204,2258616207,TW 2258616208,2258616303,AU -2258616304,2258616311,HK +2258616304,2258616311,TW 2258616312,2258616319,AU -2258616320,2258632703,HK +2258616320,2258620447,TW +2258620448,2258620455,HK +2258620456,2258620463,TW +2258620464,2258620467,HK +2258620468,2258620471,TW +2258620472,2258620475,HK +2258620476,2258632703,TW 2258632704,2258698239,JP 2258698240,2259222527,US 2259222528,2259288063,DE @@ -39340,7 +41493,9 @@ 2281029632,2281029887,FR 2281029888,2281037823,US 2281037824,2281038079,FR -2281038080,2282226019,US +2281038080,2281701375,US +2281701376,2281705471,CH +2281705472,2282226019,US 2282226020,2282226020,AP 2282226021,2282226175,US 2282226176,2282226243,AU @@ -39478,7 +41633,8 @@ 2309160960,2309226495,FI 2309226496,2309357567,US 2309357568,2309423103,AU -2309423104,2309750783,US +2309423104,2309685247,US +2309685248,2309750783,ZA 2309750784,2309816319,AU 2309816320,2309881855,US 2309881856,2309947391,NL @@ -39493,7 +41649,9 @@ 2311061504,2311127039,US 2311127040,2311192575,DE 2311192576,2311258111,FR -2311258112,2311323647,GB +2311258112,2311315455,GB +2311315456,2311319551,MY +2311319552,2311323647,GB 2311323648,2311847935,US 2311847936,2311913471,IT 2311913472,2311979007,GB @@ -39576,8 +41734,7 @@ 2319974400,2320039935,US 2320039936,2320105471,CA 2320105472,2320171007,US -2320171008,2320203775,NZ -2320203776,2320236543,SG +2320171008,2320236543,SG 2320236544,2320302079,US 2320302080,2320367615,AU 2320367616,2320433151,US @@ -39642,7 +41799,8 @@ 2330132480,2330198015,SE 2330198016,2330263551,CH 2330263552,2330267647,US -2330329088,2330394623,US +2330267648,2330271743,CA +2330271744,2330394623,US 2330394624,2330460159,FR 2330460160,2330525695,AT 2330525696,2330591231,SE @@ -39795,8 +41953,10 @@ 2344609280,2344615935,EU 2344615936,2344878079,ID 2344878080,2346188799,CN -2346188800,2346450943,AU -2346450944,2346582015,CN +2346188800,2346254335,AU +2346254336,2346319871,CN +2346319872,2346385407,AU +2346385408,2346582015,CN 2346582016,2346647551,GB 2346647552,2346713087,TW 2346713088,2346778623,CN @@ -39816,7 +41976,7 @@ 2354053120,2354118655,CA 2354184192,2354249727,US 2354249728,2354315263,AU -2354315264,2354380799,DE +2354315264,2354380799,US 2354380800,2354446335,NL 2354446336,2354511871,SE 2354511872,2354839551,US @@ -39921,9 +42081,7 @@ 2366032896,2366033151,GB 2366033152,2366111743,DE 2366111744,2366144511,MT -2366144512,2366146559,RU -2366146560,2366148607,FI -2366148608,2366149375,RU +2366144512,2366149375,RU 2366149376,2366149407,DE 2366149408,2366149423,PL 2366149424,2366149439,SK @@ -39961,7 +42119,6 @@ 2371747840,2371878911,GB 2371878912,2371944447,BE 2371944448,2372009983,GB -2372009984,2372075519,CH 2372075520,2372206591,DE 2372206592,2372214783,UA 2372214784,2372218879,DE @@ -39978,7 +42135,8 @@ 2372232192,2372238729,EU 2372238730,2372238730,US 2372238731,2372239359,EU -2372239360,2372240895,NL +2372239360,2372240383,SK +2372240384,2372240895,NL 2372240896,2372241151,AE 2372241152,2372241407,NL 2372241408,2372264447,RU @@ -40001,7 +42159,9 @@ 2372505600,2372507647,NL 2372507648,2372509695,IT 2372509696,2372510207,A2 -2372510208,2372510463,AO +2372510208,2372510335,AO +2372510336,2372510336,ES +2372510337,2372510463,AO 2372510464,2372511743,A2 2372511744,2372513791,SI 2372513792,2372534271,GB @@ -40166,9 +42326,7 @@ 2382348288,2382364671,SI 2382364672,2382368767,US 2382368768,2382372863,CA -2382372864,2382382847,US -2382382848,2382383103,LU -2382383104,2382383209,US +2382372864,2382383209,US 2382383210,2382383210,AE 2382383211,2382401535,US 2382401536,2382405631,CA @@ -40184,7 +42342,13 @@ 2382657792,2382658559,CN 2382658560,2382658815,CA 2382658816,2382659071,CN -2382659072,2382678527,US +2382659072,2382676479,US +2382676480,2382676991,CA +2382676992,2382677503,US +2382677504,2382677987,CA +2382677988,2382677991,US +2382677992,2382678015,CA +2382678016,2382678527,US 2382678528,2382679039,CA 2382679040,2382680063,US 2382680064,2382684159,CA @@ -40195,9 +42359,7 @@ 2385903616,2385915903,US 2385915904,2385919999,CA 2385920000,2385969151,US -2385969152,2386067455,CA -2386067456,2386083839,US -2386083840,2386624511,CA +2385969152,2386624511,CA 2386624512,2386690047,US 2386690048,2386988287,CA 2386988288,2386988543,CH @@ -40239,8 +42401,8 @@ 2395804160,2395804415,GB 2395804416,2395814911,CA 2395814912,2395815167,US -2395815168,2395841279,CA -2395841280,2395841535,GB +2395815168,2395841023,CA +2395841024,2395841535,GB 2395841536,2395854079,CA 2395854080,2395854335,US 2395854336,2397700095,CA @@ -40294,7 +42456,8 @@ 2407661568,2407727103,AT 2407727104,2408054783,US 2408054784,2408120319,JP -2408185856,2409627647,US +2408185856,2409562111,US +2409562112,2409627647,GB 2409627648,2409693183,ZA 2409693184,2409758719,AT 2409758720,2409824255,US @@ -40304,7 +42467,6 @@ 2410151936,2410217471,US 2410217472,2410283007,BE 2410283008,2410348543,US -2410348544,2410414079,JP 2410414080,2410545151,US 2410545152,2410610687,AU 2410610688,2410676223,US @@ -40312,7 +42474,9 @@ 2410938368,2411003903,CH 2411003904,2411462655,US 2411462656,2411593727,AU -2411593728,2411986943,US +2411593728,2411749375,US +2411749376,2411753471,MY +2411753472,2411986943,US 2411986944,2412052479,FR 2412052480,2412576767,US 2412576768,2412642303,AT @@ -40395,7 +42559,9 @@ 2420178944,2420244479,AT 2420244480,2420310015,NZ 2420310016,2420899839,US -2420899840,2420965375,DE +2420899840,2420932299,DE +2420932300,2420932300,NL +2420932301,2420965375,DE 2420965376,2421096447,US 2421161984,2421293055,US 2421293056,2421358591,GB @@ -40436,7 +42602,8 @@ 2425487360,2426667007,US 2426667008,2426732543,NO 2426732544,2426798079,FR -2426798080,2427207679,US +2426798080,2427224063,US +2427224064,2427256831,CA 2427256832,2427322367,GB 2427322368,2427453439,US 2427453440,2427536895,NO @@ -40595,7 +42762,7 @@ 2452881408,2452946943,DE 2452946944,2453143551,US 2453143552,2453209087,JP -2453209088,2453340159,US +2453209088,2453274623,US 2453340160,2453405695,NO 2453405696,2453471231,DE 2453471232,2453536767,US @@ -40620,7 +42787,7 @@ 2453864448,2453929983,CH 2453929984,2454061055,US 2454061056,2454126591,GB -2454159360,2454192127,US +2454126592,2454192127,US 2454192128,2454257663,NO 2454257664,2454388735,US 2454388736,2454454271,SE @@ -40652,10 +42819,18 @@ 2454978560,2455175167,US 2455175168,2455240703,GB 2455240704,2455244799,US -2455244800,2455245311,AU -2455245312,2455245823,US +2455244800,2455245567,AU +2455245568,2455245823,US 2455245824,2455246847,AU -2455246848,2455371775,US +2455246848,2455247871,IN +2455247872,2455248895,US +2455248896,2455257087,TH +2455257088,2455261183,PH +2455261184,2455262207,US +2455262208,2455263231,KR +2455263232,2455273471,US +2455273472,2455275519,AU +2455275520,2455371775,US 2455371776,2455437311,GB 2455437312,2455830527,US 2455830528,2455896063,GB @@ -40688,7 +42863,8 @@ 2457360896,2457361151,RU 2457361152,2457361407,CZ 2457361408,2457365503,RU -2457365504,2457366527,CZ +2457365504,2457366271,CZ +2457366272,2457366527,RU 2457366528,2457367551,GB 2457367552,2457372671,CZ 2457372672,2457376767,RU @@ -40762,8 +42938,8 @@ 2462121984,2462187519,PT 2462187520,2462253055,GB 2462253056,2462326783,AU -2462384128,2462580735,US -2462580736,2462646271,GB +2462384128,2462449663,US +2462449664,2462646271,GB 2462646272,2463236095,US 2463236096,2463301631,AT 2463301632,2463367167,FI @@ -41019,6 +43195,8 @@ 2488860672,2489647103,US 2489647104,2489712639,DO 2489712640,2489745407,PE +2489745408,2489778175,HT +2489778176,2489843711,DO 2489843712,2489995519,US 2489995520,2489995544,SG 2489995545,2489995545,AP @@ -41149,13 +43327,17 @@ 2500199424,2500199679,IE 2500199680,2500201535,US 2500201536,2500201543,GB -2500201544,2500219135,US +2500201544,2500202879,US +2500202880,2500203007,ES +2500203008,2500219135,US 2500219136,2500219391,DE 2500219392,2500225551,US 2500225552,2500225559,ES 2500225560,2500228607,US 2500228608,2500228863,FR -2500228864,2500235775,US +2500228864,2500230041,US +2500230042,2500230042,GB +2500230043,2500235775,US 2500235776,2500236543,GB 2500236544,2500236837,US 2500236838,2500236838,ES @@ -41203,7 +43385,9 @@ 2500551680,2500551935,FR 2500551936,2500553759,US 2500553760,2500553767,GB -2500553768,2500555263,US +2500553768,2500554379,US +2500554380,2500554487,DE +2500554488,2500555263,US 2500555264,2500555519,FR 2500555520,2500558847,US 2500558848,2500559103,FR @@ -41217,7 +43401,9 @@ 2500616192,2500616703,IT 2500616704,2500636735,US 2500636736,2500636799,GB -2500636800,2500644863,US +2500636800,2500638719,US +2500638720,2500639743,GB +2500639744,2500644863,US 2500644864,2500645119,FR 2500645120,2500646911,US 2500646912,2500647935,ES @@ -41235,7 +43421,6 @@ 2503671808,2503737343,NL 2503737344,2503868415,US 2503868416,2503876607,RU -2503876608,2503880703,ES 2503880704,2503882751,RU 2503882752,2503884799,DE 2503884800,2503901183,SI @@ -41253,8 +43438,10 @@ 2504482816,2504491007,US 2504491008,2504499199,IT 2504499200,2504916991,US -2504916992,2504949759,IL -2504949760,2506293247,US +2504916992,2504982527,IL +2504982528,2505793535,US +2505793536,2505801727,ES +2505801728,2506293247,US 2506293248,2506358783,CA 2506358784,2506360831,US 2506360832,2506361087,ES @@ -41282,7 +43469,9 @@ 2508107776,2508109823,FI 2508109824,2508111871,DE 2508111872,2508128255,RU -2508128256,2508455935,US +2508128256,2508259327,US +2508259328,2508324863,MY +2508324864,2508455935,US 2508455936,2508521471,IT 2508521472,2508587007,CH 2508587008,2508652543,BE @@ -41400,6 +43589,42 @@ 2523201536,2523267071,AU 2523267072,2523529215,US 2523529216,2523594751,NO +2523594752,2523595775,HK +2523595776,2523596799,KH +2523596800,2523597823,IN +2523597824,2523598847,TH +2523598848,2523601919,IN +2523601920,2523602943,TH +2523602944,2523603967,NZ +2523603968,2523604991,AU +2523604992,2523606015,IN +2523606016,2523607039,HK +2523607040,2523609087,BD +2523609088,2523612159,TW +2523612160,2523613183,KR +2523613184,2523614207,AU +2523614208,2523615231,MY +2523615232,2523617279,KR +2523617280,2523621375,IN +2523621376,2523621887,ID +2523621888,2523622399,IN +2523622400,2523623423,ID +2523623424,2523626495,IN +2523626496,2523628543,SG +2523628544,2523631615,ID +2523631616,2523632639,IN +2523632640,2523633663,ID +2523633664,2523634687,SG +2523634688,2523635711,MY +2523635712,2523636735,NZ +2523636736,2523638783,IN +2523638784,2523639807,NZ +2523639808,2523645951,IN +2523645952,2523646975,HK +2523646976,2523647999,NP +2523648000,2523657215,IN +2523657216,2523659263,ID +2523659264,2523660287,IN 2523660288,2524119039,US 2524119040,2524184575,CN 2524184576,2524315647,TW @@ -41410,6 +43635,48 @@ 2524963312,2524963327,EU 2524963328,2524971007,US 2524971008,2525036543,ES +2525036544,2525037567,IN +2525037568,2525038591,PK +2525038592,2525039615,HK +2525039616,2525040639,AU +2525040640,2525041151,BD +2525041152,2525041407,ID +2525041408,2525041663,IN +2525041664,2525042687,KH +2525042688,2525044735,IN +2525044736,2525045759,HK +2525045760,2525046783,TW +2525046784,2525047807,HK +2525047808,2525050879,IN +2525050880,2525051903,ID +2525051904,2525053951,IN +2525053952,2525054975,MY +2525054976,2525055999,TW +2525056000,2525058047,HK +2525058048,2525059071,AU +2525059072,2525060095,IN +2525060096,2525061119,AU +2525061120,2525062143,TW +2525062144,2525071359,IN +2525071360,2525072383,HK +2525072384,2525073407,MN +2525073408,2525075455,IN +2525075456,2525076479,CN +2525076480,2525077503,IN +2525077504,2525078527,ID +2525078528,2525083647,IN +2525083648,2525084671,MY +2525084672,2525085695,ID +2525085696,2525086719,CN +2525086720,2525089791,IN +2525089792,2525090815,HK +2525090816,2525091839,IN +2525091840,2525092863,CN +2525092864,2525093887,BD +2525093888,2525094911,KR +2525094912,2525095935,TW +2525095936,2525101055,IN +2525101056,2525102079,CN 2525102080,2525233151,US 2525233152,2525298687,SE 2525298688,2525626367,US @@ -41460,6 +43727,40 @@ 2532114432,2532179967,GB 2532179968,2532376575,US 2532376576,2532442111,ES +2532442112,2532445183,CN +2532445184,2532449279,IN +2532449280,2532450303,CN +2532450304,2532451327,AU +2532451328,2532452351,HK +2532452352,2532453375,NZ +2532453376,2532457471,CN +2532457472,2532461567,IN +2532461568,2532463615,CN +2532463616,2532465663,IN +2532465664,2532467711,CN +2532467712,2532468735,TW +2532468736,2532469759,BD +2532469760,2532470783,ID +2532470784,2532473855,CN +2532473856,2532474879,HK +2532474880,2532475903,NZ +2532475904,2532476927,KR +2532476928,2532477951,AU +2532477952,2532478975,IN +2532478976,2532479999,KR +2532480000,2532481023,IN +2532481024,2532486143,CN +2532486144,2532488191,IN +2532488192,2532489215,MY +2532489216,2532492287,CN +2532492288,2532495359,IN +2532495360,2532496383,HK +2532496384,2532497407,CN +2532497408,2532499455,HK +2532499456,2532500479,CN +2532500480,2532501503,HK +2532501504,2532506623,CN +2532506624,2532507647,IN 2532507648,2532573183,US 2532573184,2532638719,ES 2532638720,2533031935,US @@ -41467,7 +43768,8 @@ 2533097472,2533228543,US 2533228544,2533294079,PL 2533294080,2533359615,CN -2533359616,2533375999,UA +2533359616,2533373951,UA +2533373952,2533375999,BG 2533376000,2533392383,HU 2533392384,2533425151,RO 2533425152,2539978751,IT @@ -41490,7 +43792,6 @@ 2542338048,2543583231,US 2543583232,2543648767,SE 2543648768,2543714303,NO -2543714304,2543779839,JP 2543779840,2544154840,US 2544154841,2544154842,CA 2544154843,2544500735,US @@ -41517,8 +43818,7 @@ 2546039040,2547187711,US 2547187712,2547318783,GB 2547318784,2547515391,US -2547531776,2547539967,UA -2547539968,2547542015,SE +2547515392,2547523583,GB 2547553024,2547553279,RU 2548039680,2548563967,GB 2548563968,2548826111,IR @@ -41584,7 +43884,7 @@ 2549702656,2549704703,UA 2549704704,2549706751,CZ 2549706752,2549710847,NO -2549710848,2549743615,CZ +2549710848,2549743615,BY 2549743616,2549809151,TR 2549809152,2549874687,BG 2549874688,2549876735,GB @@ -41651,7 +43951,9 @@ 2556742080,2556742327,US 2556742328,2556742335,GB 2556742336,2556755967,US -2556755968,2556821503,HK +2556755968,2556780031,HK +2556780032,2556780799,SG +2556780800,2556821503,HK 2556821504,2556887039,SG 2556887040,2557018111,HK 2557018112,2557083647,GB @@ -41683,12 +43985,24 @@ 2560628736,2560644607,US 2560644608,2560644863,CA 2560644864,2561015807,US +2561015808,2561146879,DO 2561146880,2561409023,AR -2561671168,2564947967,US +2561409024,2561671167,CL +2561671168,2563244031,US +2563244032,2563637247,CO +2563637248,2563768319,CU +2563768320,2564947967,US 2564947968,2565013503,SG 2565013504,2565210111,US 2565210112,2565275647,CL -2565865472,2566914047,BR +2565275648,2565279743,HN +2565279744,2565281791,AR +2565281792,2565283839,CO +2565283840,2565287935,NI +2565287936,2565292031,AR +2565292032,2565308415,CL +2565308416,2565341183,CR +2565341184,2566914047,BR 2566914048,2566979583,CN 2566979584,2567045119,FI 2567045120,2567110655,US @@ -41757,26 +44071,33 @@ 2584412160,2584477695,CA 2584477696,2584608767,US 2584608768,2584739839,CH -2584739840,2585001983,US +2584739840,2584805375,MU +2584805376,2585001983,US 2585001984,2585067519,CA 2585067520,2585788415,US 2585788416,2585853951,GB 2585853952,2585985023,JP 2585985024,2586480639,US 2586480640,2586484735,IL -2586484736,2586510335,US +2586484736,2586486783,GB +2586486784,2586510335,US 2586510336,2586511359,ES 2586511360,2586566655,US 2586566656,2586566687,FR 2586566688,2586610175,US 2586610176,2586610431,ES -2586610432,2586611711,US +2586610432,2586610687,US +2586610688,2586611711,ES 2586611712,2586611967,GB 2586611968,2586619903,US 2586619904,2586620415,FR 2586620416,2586622463,US 2586622464,2586622975,ES -2586622976,2586733567,US +2586622976,2586640895,US +2586640896,2586641407,FR +2586641408,2586650687,US +2586650688,2586650703,DE +2586650704,2586733567,US 2586733568,2586733823,LT 2586733824,2586804223,US 2586804224,2586804479,ES @@ -41802,7 +44123,9 @@ 2587067648,2587067903,GB 2587067904,2587068415,US 2587068416,2587068479,GB -2587068480,2587131903,US +2587068480,2587071759,US +2587071760,2587071775,GB +2587071776,2587131903,US 2587131904,2587132159,FR 2587132160,2587197439,US 2587197440,2587197695,ES @@ -41812,17 +44135,23 @@ 2587249418,2587249418,FR 2587249419,2587394047,US 2587394048,2587394559,ES -2587394560,2587398143,US -2587398144,2587399167,ES +2587394560,2587396095,US +2587396096,2587399167,ES 2587399168,2587443199,US 2587443200,2587447295,CH 2587447296,2587476760,US 2587476761,2587476761,LB -2587476762,2587492351,US +2587476762,2587479119,US +2587479120,2587479120,LB +2587479121,2587481969,US +2587481970,2587481970,LB +2587481971,2587492351,US 2587492352,2587493375,ES 2587493376,2587508735,US 2587508736,2587525119,GB -2587525120,2587926527,US +2587525120,2587542527,US +2587542528,2587543551,ES +2587543552,2587926527,US 2587926528,2587930623,BG 2587930624,2587951103,US 2587951104,2587952127,ZA @@ -41832,7 +44161,8 @@ 2587955200,2587959295,KE 2587959296,2587961343,SN 2587961344,2587962367,ZA -2587962368,2587964415,SD +2587962368,2587963391,SS +2587963392,2587964415,SD 2587964416,2587965439,ZA 2587965440,2587966463,KE 2587966464,2587967487,BF @@ -41899,30 +44229,58 @@ 2588442624,2588459007,CM 2588459008,2588467199,UG 2588467200,2588471295,TN -2588471296,2588475391,MU -2588475392,2588476415,ZA +2588471296,2588476415,ZA 2588477440,2588478463,NG 2588478464,2588479487,UG 2588479488,2588480511,ZA 2588480512,2588481535,CD +2588481536,2588482559,SO 2588482560,2588483583,LY +2588483584,2588484607,ZA 2588484608,2588485631,BW 2588485632,2588486655,BI -2588487680,2588488703,SC +2588486656,2588487679,SO +2588487680,2588487711,SC +2588487712,2588487743,FR +2588487744,2588487807,BF +2588487808,2588487839,NE +2588487840,2588487871,SC +2588487872,2588487935,MW +2588487936,2588488703,SC 2588488704,2588489727,LY -2588493824,2588494847,ZA +2588489728,2588490751,GQ +2588490752,2588491775,GW +2588491776,2588492799,TZ +2588492800,2588494847,ZA +2588494848,2588495871,SO +2588495872,2588496895,ZW +2588496896,2588497919,BW +2588497920,2588498943,SD +2588498944,2588499967,DZ +2588499968,2588500991,ZA 2588500992,2588502015,CI +2588502016,2588503039,BI 2588503040,2588504063,LY 2588504064,2588505087,TD 2588505088,2588506111,CG +2588506112,2588507135,ZA 2588507136,2588508159,SO 2588508160,2588510207,LY +2588510208,2588512255,ZA +2588522496,2588526591,ZA 2588526592,2588528639,CM 2588528640,2588530687,ZA 2588532736,2588540927,ZA 2588672000,2588934143,KE 2588934144,2589982719,SC 2589982720,2590507007,SD +2590507008,2591031295,TN +2591031296,2591096831,GA +2591293440,2591326207,GA +2591522816,2591526911,LR +2591531008,2591539199,ZA +2591539200,2591547391,GA +2591547392,2591555583,ZA 2591571968,2591588351,NG 2591588352,2591604735,MG 2591604736,2591612927,MU @@ -41932,9 +44290,14 @@ 2591948800,2591981567,MG 2591981568,2591997951,CM 2591997952,2592006143,ZA -2592006144,2592014335,TZ -2592018432,2592022527,TZ -2592026624,2592028671,MU +2592006144,2592022527,TZ +2592022528,2592026623,BJ +2592026624,2592026879,US +2592026880,2592027391,MU +2592027392,2592027647,GB +2592027648,2592028159,MU +2592028160,2592028415,CA +2592028416,2592028671,MU 2592028672,2592028799,NG 2592028800,2592028927,KE 2592028928,2592029183,MU @@ -41945,7 +44308,9 @@ 2592030336,2592030463,CM 2592030464,2592030591,UG 2592030592,2592030719,MU +2592030720,2592034815,LY 2592034816,2592038911,NE +2592038912,2592043007,DZ 2592043008,2592047103,ZA 2592047104,2592079871,AO 2600534016,2600665087,US @@ -41990,10 +44355,11 @@ 2606448652,2606467071,US 2606467072,2606467327,AP 2606467328,2606563327,US -2606628864,2606645247,US +2606628864,2606646783,US 2606646784,2606647039,EU +2606647040,2606648831,US 2606648832,2606649087,IE -2606694400,2607349759,US +2606649088,2607349759,US 2607349760,2607415295,CH 2607415296,2608728063,US 2608728064,2608728319,AP @@ -42069,7 +44435,109 @@ 2616917760,2616918015,FR 2616983552,2617049087,US 2617049088,2617114623,IT -2617114624,2617180159,US +2617114624,2617123839,US +2617123840,2617124095,DE +2617124096,2617131007,US +2617131008,2617139199,CA +2617139200,2617139455,PE +2617139456,2617139711,SZ +2617139712,2617139967,JM +2617139968,2617140223,PA +2617140224,2617140479,CO +2617140480,2617140735,SC +2617140736,2617140991,CA +2617140992,2617141247,LC +2617141248,2617141503,SV +2617141504,2617141759,GT +2617141760,2617142015,ZW +2617142016,2617142271,KR +2617142272,2617142527,US +2617142528,2617142783,LU +2617142784,2617143039,PH +2617143040,2617143295,UG +2617143296,2617143551,US +2617143552,2617143807,TT +2617143808,2617144063,US +2617144064,2617144319,ZA +2617144320,2617144575,MU +2617144576,2617144831,FJ +2617144832,2617145087,US +2617145088,2617145343,MX +2617145344,2617145599,NI +2617145600,2617145855,UA +2617145856,2617146111,US +2617146112,2617146367,CI +2617146368,2617146623,US +2617146624,2617146879,GY +2617146880,2617147135,DE +2617147136,2617147391,AO +2617147392,2617148415,US +2617151488,2617155583,CA +2617155584,2617163775,US +2617163776,2617164031,SK +2617164032,2617164287,MC +2617164288,2617164543,AZ +2617164544,2617164799,FI +2617164800,2617165055,CZ +2617165056,2617165311,UZ +2617165312,2617165567,BT +2617165568,2617165823,CN +2617165824,2617166079,ME +2617166080,2617166335,YE +2617166336,2617166591,KH +2617166592,2617166847,TJ +2617166848,2617167103,KG +2617167104,2617167359,IS +2617167360,2617167615,DK +2617167616,2617167871,IL +2617167872,2617168127,PL +2617168128,2617168383,LA +2617168384,2617168639,GH +2617168640,2617168895,BD +2617168896,2617169151,LI +2617169152,2617169407,ET +2617169408,2617169663,SM +2617169664,2617169919,BH +2617169920,2617170175,CY +2617170176,2617170431,NZ +2617170432,2617170687,PS +2617170688,2617170943,GI +2617170944,2617171199,RS +2617171200,2617171455,HK +2617171456,2617171711,HR +2617171712,2617171967,SN +2617171968,2617172223,MV +2617172224,2617172479,AF +2617172480,2617172735,JP +2617172736,2617172991,CM +2617172992,2617173247,US +2617173248,2617173503,JP +2617173504,2617173759,TM +2617173760,2617174015,GE +2617174016,2617174271,TR +2617174272,2617174527,TW +2617174528,2617174783,KW +2617174784,2617175039,EE +2617175040,2617175295,CN +2617175296,2617175551,MA +2617175552,2617175807,BA +2617175808,2617176063,IQ +2617176064,2617176319,NO +2617176320,2617176575,AU +2617176576,2617176831,TH +2617176832,2617177087,VN +2617177088,2617177343,AM +2617177344,2617177599,RU +2617177600,2617177855,IN +2617177856,2617178111,BE +2617178112,2617178367,IM +2617178368,2617178623,BN +2617178624,2617178879,AD +2617178880,2617179135,LT +2617179136,2617179391,MD +2617179392,2617179647,SI +2617179648,2617179903,KE +2617179904,2617180159,NG 2617245696,2617769983,US 2617769984,2617835519,ZA 2617835520,2617901055,US @@ -42087,7 +44555,7 @@ 2618884096,2618949631,CH 2618949632,2619080703,US 2619080704,2619146239,FR -2619146240,2619211775,US +2619146240,2619277311,US 2619277312,2619342847,BN 2619342848,2619473919,US 2619473920,2619539455,CA @@ -42188,8 +44656,7 @@ 2642280448,2642411519,US 2642411520,2642477055,AU 2642477056,2642542591,FI -2642542592,2642608127,US -2642673664,2642935807,US +2642542592,2642935807,US 2642935808,2643001343,FR 2643001344,2643066879,US 2643066880,2643132415,IT @@ -42391,7 +44858,7 @@ 2665086976,2665152511,GB 2665152512,2665218047,US 2665218048,2665283583,CH -2665283584,2665381887,US +2665283584,2665414655,US 2665414656,2665480191,GB 2665480192,2665545727,US 2665545728,2665611263,DE @@ -42453,7 +44920,29 @@ 2667642880,2667970559,US 2667970560,2668036095,CA 2668036096,2668101631,SE -2668101632,2668167167,CH +2668101632,2668101663,NL +2668101664,2668101671,US +2668101672,2668101791,NL +2668101792,2668101823,US +2668101824,2668101855,NL +2668101856,2668101863,US +2668101864,2668101887,NL +2668101888,2668101919,US +2668101920,2668102063,NL +2668102064,2668102071,US +2668102072,2668102647,NL +2668102648,2668102655,US +2668102656,2668102991,NL +2668102992,2668102999,US +2668103000,2668103743,NL +2668103744,2668103775,KE +2668103776,2668104127,NL +2668104128,2668104135,GB +2668104136,2668104191,NL +2668104192,2668104207,KE +2668104208,2668104247,NL +2668104248,2668104255,US +2668104256,2668167167,NL 2668167168,2668363775,US 2668363776,2668429311,CH 2668429312,2668494847,AU @@ -42473,7 +44962,9 @@ 2668916736,2668918783,TR 2668918784,2668920831,ES 2668920832,2668953599,IT -2668953600,2669019135,US +2668953600,2668989951,US +2668989952,2668990463,NZ +2668990464,2669019135,US 2669019136,2669084671,CH 2669084672,2669150207,ES 2669150208,2669215743,US @@ -42521,8 +45012,10 @@ 2673737728,2673803263,US 2673803264,2673868799,FR 2673868800,2674130943,US -2674130944,2674180095,GB -2674180096,2674192383,US +2674130944,2674163711,GB +2674163712,2674171903,CA +2674171904,2674175999,GB +2674176000,2674192383,US 2674192384,2674196479,CH 2674196480,2674249727,GB 2674249728,2674251775,US @@ -42541,7 +45034,7 @@ 2675113984,2675245055,US 2675245056,2675310591,NZ 2675310592,2675572735,US -2675572736,2675638271,CH +2675572736,2675638271,NL 2675638272,2675965951,US 2675965952,2676031487,CA 2676031488,2676097023,US @@ -42561,15 +45054,28 @@ 2677538816,2677604351,FI 2677604352,2677622783,US 2677622784,2677623039,IE -2677623040,2677639679,US +2677623040,2677635071,US +2677635072,2677636095,CN +2677636096,2677639679,US 2677639680,2677639935,CA 2677639936,2677642239,US 2677642240,2677642495,ES -2677642496,2677644347,US +2677642496,2677642751,US +2677642752,2677643007,SE +2677643008,2677644347,US 2677644348,2677644348,EU -2677644349,2677650431,US +2677644349,2677648383,US +2677648384,2677649407,JP +2677649408,2677650431,US 2677650432,2677650943,RO -2677650944,2677669887,US +2677650944,2677651455,US +2677651456,2677652479,SG +2677652480,2677658367,US +2677658368,2677658623,AU +2677658624,2677659903,US +2677659904,2677660159,IN +2677660160,2677660415,KR +2677660416,2677669887,US 2677669888,2677735423,DE 2677735424,2677800959,US 2677800960,2677866495,CH @@ -42616,7 +45122,8 @@ 2679242752,2679308287,US 2679308288,2679373823,CH 2679373824,2679406591,GB -2679406592,2679431167,US +2679406592,2679422975,BR +2679422976,2679431167,US 2679431168,2679439359,FR 2679439360,2679523327,US 2679523328,2679525375,GB @@ -42641,12 +45148,16 @@ 2681405440,2681470975,JP 2681470976,2681536511,US 2681536512,2681602047,IT -2681602048,2681733119,US +2681602048,2681700863,US +2681700864,2681701119,HK +2681701120,2681733119,US 2681733120,2681798655,NO 2681798656,2681864191,FR 2681864192,2681929727,US 2681929728,2681995263,GB -2681995264,2682015231,US +2681995264,2682014207,US +2682014208,2682014719,GB +2682014720,2682015231,US 2682015232,2682015487,IN 2682015488,2682123263,US 2682123264,2682123519,AU @@ -42655,7 +45166,6 @@ 2682322944,2682388479,US 2682388480,2682454015,CN 2682454016,2682519551,US -2682519552,2682585087,JP 2682585088,2682716159,US 2682716160,2682781695,CA 2682781696,2682847231,CH @@ -42713,7 +45223,9 @@ 2684191988,2684191999,US 2684192000,2684192103,NL 2684192104,2684192107,US -2684192108,2684192387,NL +2684192108,2684192303,NL +2684192304,2684192311,US +2684192312,2684192387,NL 2684192388,2684192391,US 2684192392,2684192459,NL 2684192460,2684192463,US @@ -42737,7 +45249,9 @@ 2684193276,2684193279,US 2684193280,2684193447,NL 2684193448,2684193455,AZ -2684193456,2684193735,NL +2684193456,2684193583,NL +2684193584,2684193591,IE +2684193592,2684193735,NL 2684193736,2684193743,US 2684193744,2684193887,NL 2684193888,2684193911,US @@ -42853,7 +45367,7 @@ 2684878848,2684944383,SE 2684944384,2685009919,GB 2685009920,2685075455,US -2685075456,2686386175,JP +2685075456,2686320639,JP 2686386176,2686844927,US 2686844928,2686910463,GB 2686910464,2686975999,US @@ -42941,7 +45455,8 @@ 2692546560,2694840319,US 2696151040,2696216575,IT 2696216576,2696282111,ZA -2696413184,2697789439,JP +2696413184,2696478719,ZA +2696478720,2697789439,JP 2697789440,2697854975,US 2697854976,2697889791,AU 2697889792,2697891839,US @@ -42967,6 +45482,7 @@ 2699624448,2699689983,JP 2699755520,2700935167,JP 2700935168,2701066239,US +2701066240,2701131775,ZA 2701131776,2701139967,HN 2701139968,2701148159,NI 2701148160,2701149183,AR @@ -43001,6 +45517,8 @@ 2702508032,2702573567,US 2702573568,2702581759,AR 2702581760,2702585855,VE +2702585856,2702587903,CW +2702587904,2702589951,BR 2702589952,2702606335,GF 2702606336,2702639103,BO 2702639104,2702704639,GB @@ -43116,7 +45634,7 @@ 2714042368,2714238975,US 2714238976,2714304511,TH 2714304512,2714370047,US -2714370048,2714435583,CH +2714370048,2714435583,NL 2714435584,2714697727,US 2714697728,2714763263,CN 2714763264,2715025407,US @@ -43195,7 +45713,9 @@ 2731566080,2731567103,CA 2731567104,2731573247,US 2731573248,2731606015,CA -2731606016,2731673599,US +2731606016,2731667455,US +2731667456,2731671551,HK +2731671552,2731673599,US 2731673600,2731674623,CA 2731674624,2731679743,US 2731679744,2731680767,CA @@ -43218,7 +45738,9 @@ 2731765760,2731767807,CA 2731767808,2731771903,US 2731771904,2731772927,KY -2731772928,2731784191,US +2731772928,2731782655,US +2731782656,2731783167,GB +2731783168,2731784191,US 2731784192,2731785215,CA 2731785216,2731786239,US 2731786240,2731788287,CA @@ -43240,7 +45762,9 @@ 2731828224,2731829247,CA 2731829248,2731831295,US 2731831296,2731832319,CA -2731832320,2731843583,US +2731832320,2731836927,US +2731836928,2731837183,IS +2731837184,2731843583,US 2731843584,2731845631,PR 2731845632,2731853823,US 2731853824,2731855871,CA @@ -43265,7 +45789,9 @@ 2732105728,2732107775,JM 2732107776,2732111871,US 2732111872,2732113919,CA -2732113920,2732189695,US +2732113920,2732136447,US +2732136448,2732138495,CA +2732138496,2732189695,US 2732189696,2732192767,CA 2732192768,2732201983,US 2732201984,2732203007,VG @@ -43367,8 +45893,7 @@ 2733958144,2733959167,CA 2733959168,2733963263,US 2733963264,2733964287,CA -2733964288,2733977599,US -2733978624,2733979647,US +2733964288,2733979647,US 2733979648,2733980671,CA 2733980672,2733984767,US 2733984768,2733985791,VC @@ -43440,7 +45965,11 @@ 2734296064,2734297087,CA 2734297088,2734304255,US 2734304256,2734305279,CA -2734305280,2734335999,US +2734305280,2734330367,US +2734330368,2734330431,IT +2734330432,2734330623,US +2734330624,2734330879,IT +2734330880,2734335999,US 2734336000,2734338047,CA 2734338048,2734341119,US 2734341120,2734344191,CA @@ -43462,7 +45991,9 @@ 2734407680,2734409727,CA 2734409728,2734435327,US 2734435328,2734436351,CA -2734436352,2734447615,US +2734436352,2734439167,US +2734439168,2734439423,GB +2734439424,2734447615,US 2734447616,2734448639,CA 2734448640,2734452735,US 2734452736,2734454783,CA @@ -43493,13 +46024,31 @@ 2734542848,2734544895,CA 2734544896,2734553087,US 2734553088,2734555135,CA -2734555136,2734565375,US +2734555136,2734557183,CN +2734557184,2734565375,US 2734565376,2734566399,CA -2734566400,2734588927,US +2734566400,2734577151,US +2734577152,2734577167,LU +2734577168,2734588927,US 2734588928,2734589951,CA -2734589952,2734598143,US +2734589952,2734599167,US 2734599168,2734600191,CA -2734602240,2734603263,US +2734600192,2734633983,US +2734633984,2734635007,CA +2734635008,2734649343,US +2734649344,2734650367,CA +2734650368,2734657535,US +2734657536,2734658559,VG +2734658560,2734659583,CA +2734659584,2734665727,US +2734665728,2734666751,CA +2734666752,2734672895,US +2734672896,2734675967,CA +2734675968,2734678015,BM +2734678016,2734679039,US +2734679040,2734680063,CA +2734680064,2734684159,US +2734684160,2734686207,CA 2734686208,2734751743,CN 2734751744,2734817279,GB 2734817280,2734882815,US @@ -43516,7 +46065,88 @@ 2736848896,2736914431,US 2736914432,2736979967,NO 2736979968,2737438719,US -2737438720,2738749439,JP +2737438720,2737767423,JP +2737767424,2737768447,CN +2737768448,2737769471,AU +2737769472,2737770495,IN +2737770496,2737771263,AU +2737771264,2737771519,JP +2737771520,2737772031,AU +2737772544,2737774591,JP +2737774592,2737776639,BD +2737776640,2737777663,AU +2737777664,2737778175,HK +2737778432,2737785855,AU +2737785856,2737788927,BD +2737788928,2737789951,MY +2737789952,2737793023,AU +2737793024,2737794047,NZ +2737794048,2737795071,AU +2737795072,2737796095,NZ +2737796096,2737799167,AU +2737799168,2737800191,NZ +2737800192,2737802239,AU +2737802240,2737803263,IN +2737803264,2737804287,BD +2737804288,2737805311,NP +2737805312,2737806335,IN +2737806336,2737807359,BD +2737807360,2737808383,AF +2737808384,2737809407,NZ +2737809408,2737810431,AU +2737810432,2737811455,KH +2737811456,2737811711,SG +2737811712,2737811967,HK +2737811968,2737812223,GB +2737812224,2737812479,US +2737812480,2737813503,AU +2737813504,2737815551,NZ +2737815552,2737816575,MY +2737816576,2737817599,AU +2737817600,2737818623,MY +2737818624,2737819647,NZ +2737819648,2737821695,IN +2737821696,2737822719,AU +2737822720,2737823743,NZ +2737823744,2737824767,NC +2737824768,2737829887,NZ +2737829888,2737830911,NC +2737830912,2737831935,AU +2737831936,2738094079,JP +2738159616,2738163711,CN +2738163712,2738164735,HK +2738164736,2738165759,AU +2738165760,2738166783,NP +2738166784,2738167807,KH +2738167808,2738168831,AU +2738168832,2738177023,CN +2738177024,2738178047,AU +2738178048,2738179071,HK +2738179072,2738182143,IN +2738182144,2738195455,CN +2738195456,2738196479,BD +2738196480,2738197503,AU +2738197504,2738198527,BD +2738198528,2738199551,MY +2738199552,2738200575,KR +2738200576,2738204671,CN +2738204672,2738205695,IN +2738205696,2738206719,BD +2738206720,2738207743,ID +2738207744,2738208767,CN +2738208768,2738209791,ID +2738209792,2738210815,KH +2738210816,2738213887,IN +2738213888,2738215935,HK +2738215936,2738216959,CN +2738216960,2738217983,HK +2738217984,2738220031,AU +2738220032,2738221055,PK +2738221056,2738222079,CN +2738222080,2738223103,MO +2738223104,2738224127,AU +2738224128,2738225151,IN +2738225152,2738683903,JP 2738749440,2742353919,FR 2742353920,2742419455,ES 2742419456,2742484991,US @@ -43765,13 +46395,13 @@ 2770337792,2770993151,US 2770993152,2771124223,IN 2771124224,2771451903,US -2772434944,2772631551,US -2772631552,2772697087,AU -2772697088,2772762623,US +2771648512,2771910655,ZA +2772434944,2772762623,US 2772762624,2772828159,AU -2772828160,2773010431,US +2772828160,2772959231,US +2772959232,2773010431,CZ 2773010432,2773010687,EU -2773010688,2773024767,US +2773010688,2773024767,CZ 2773090304,2773221375,US 2773221376,2773286911,JP 2773286912,2773745663,US @@ -43849,7 +46479,9 @@ 2781624064,2781624319,CA 2781624320,2781629951,US 2781629952,2781630207,EU -2781630208,2781675519,US +2781630208,2781630463,US +2781630464,2781631487,MY +2781631488,2781675519,US 2781675520,2781741055,NZ 2781741056,2781937663,US 2781937664,2782003199,TH @@ -43949,7 +46581,22 @@ 2807259648,2807260159,AP 2807260160,2807566335,US 2807566336,2807574527,CA -2807574528,2807595007,US +2807574528,2807587071,US +2807587072,2807587327,IT +2807587328,2807587583,QA +2807587584,2807587839,IN +2807587840,2807588095,AE +2807588096,2807588351,ES +2807588352,2807588863,CN +2807588864,2807589119,JP +2807589120,2807589375,RO +2807589376,2807589631,FR +2807589632,2807589887,PT +2807589888,2807590143,AT +2807590144,2807590399,MT +2807590400,2807590655,GR +2807590656,2807590911,SA +2807590912,2807595007,US 2807595008,2807599103,CA 2807599104,2807607295,US 2807607296,2807611391,CA @@ -43980,7 +46627,10 @@ 2811559936,2811625471,CH 2811625472,2812084223,US 2812084224,2812149759,BO -2812149760,2812411903,US +2812149760,2812293119,US +2812293120,2812295167,IN +2812295168,2812297215,GB +2812297216,2812411903,US 2812411904,2812477439,AU 2812477440,2812753919,US 2812753920,2812755967,BR @@ -44010,7 +46660,7 @@ 2813591552,2813908479,US 2813908480,2813908735,AU 2813908736,2814181375,US -2814181376,2814246911,AU +2814181376,2814246911,CN 2814246912,2814377215,US 2814377216,2814377471,EU 2814377472,2815033343,US @@ -44037,30 +46687,33 @@ 2816271872,2816272383,IN 2816272384,2816273407,JP 2816273408,2816275455,IN -2816275456,2816671743,US +2816275456,2816278527,SG +2816278528,2816671743,US 2816671744,2816737279,CA 2816737280,2817059071,US 2817059072,2817059327,AP 2817059328,2817060863,US 2817060864,2817061119,EU 2817061120,2817062911,LU -2817062912,2817325055,US +2817062912,2817277951,US +2817277952,2817294335,NL +2817294336,2817325055,US 2817325056,2817325311,EU 2817325312,2817933055,US 2817933056,2817933311,CA 2817933312,2817933567,PR 2817933568,2817986303,US 2817986304,2817986559,AP -2817986560,2818003711,US -2818003712,2818003722,GB +2817986560,2818002943,US +2818002944,2818003722,GB 2818003723,2818003723,EU -2818003724,2818003967,GB -2818003968,2818038537,US +2818003724,2818004991,GB +2818004992,2818038537,US 2818038538,2818038538,AP 2818038539,2818310143,US 2818310144,2818375679,AR 2818375680,2818572287,US -2818637824,2818703359,CH +2818637824,2818703359,NL 2818703360,2822731894,US 2822731895,2822731895,GB 2822731896,2822848997,US @@ -44176,7 +46829,7 @@ 2831876096,2832007167,US 2832072704,2832138239,ZA 2832138240,2832269311,US -2832269312,2832400383,ZA +2832269312,2832465919,ZA 2832465920,2832793599,US 2832793600,2832859135,AU 2832859136,2832924671,US @@ -44193,8 +46846,11 @@ 2833711104,2833776639,CL 2833842176,2833907711,US 2833907712,2833973247,GT -2833973248,2833989631,US -2834038784,2834497535,US +2833973248,2834010111,US +2834010112,2834014207,CA +2834018304,2834030591,US +2834030592,2834034687,CA +2834034688,2834497535,US 2834497536,2834563071,SV 2834563072,2834825215,US 2834825216,2834956287,KR @@ -44203,7 +46859,11 @@ 2835218432,2835283967,US 2835283968,2835349503,MX 2835349504,2837446655,US -2837446656,2839543807,CH +2837446656,2838822911,CH +2838822912,2839019519,NL +2839019520,2839085055,CH +2839085056,2839150591,NL +2839150592,2839543807,CH 2839543808,2843803647,US 2843803648,2843869183,ZA 2843869184,2844524543,US @@ -44229,7 +46889,6 @@ 2848244736,2848245759,GB 2848245760,2848276479,US 2848325632,2848522239,US -2848522240,2848587775,AU 2848587776,2848653311,ZA 2848653312,2848980991,US 2848980992,2849964031,KR @@ -44264,7 +46923,9 @@ 2856452096,2856517631,BR 2856517632,2856714239,US 2856714240,2856779775,MX -2856779776,2857369599,US +2856779776,2857082879,US +2857082880,2857086975,CA +2857086976,2857238527,US 2857697280,2857766655,US 2857766656,2857766911,EU 2857766912,2859007999,US @@ -44408,7 +47069,7 @@ 2879336960,2879467519,US 2879467520,2879468031,AP 2879468032,2879469567,US -2879469568,2879470079,AP +2879469568,2879470079,IN 2879470080,2881486847,US 2881486848,2881487103,GB 2881487104,2882469887,US @@ -44435,7 +47096,9 @@ 2897215488,2897739775,DE 2897739776,2898001919,FR 2898001920,2898132991,GB -2898132992,2898788351,US +2898132992,2898264063,US +2898264064,2898264064,AU +2898264065,2898788351,US 2898788352,2899050495,GB 2899050496,2899116031,FR 2899116032,2899148799,VN @@ -44465,9 +47128,7 @@ 2905002154,2905002495,GB 2905002496,2905044991,US 2905044992,2905045503,SG -2905045504,2905378559,US -2905378560,2905378815,CA -2905378816,2905379071,US +2905045504,2905379071,US 2905379072,2905379327,CA 2905379328,2905380607,US 2905380608,2905380863,CA @@ -44475,7 +47136,9 @@ 2905387520,2905388031,CA 2905388032,2905394175,US 2905394176,2905394687,CA -2905394688,2905405679,US +2905394688,2905401855,US +2905401856,2905402111,CA +2905402112,2905405679,US 2905405680,2905405687,CN 2905405688,2905407743,US 2905407744,2905407999,TW @@ -44503,10 +47166,12 @@ 2915521536,2915526911,US 2915526912,2915527167,DE 2915527168,2915527679,US -2915527680,2915528711,NL -2915528712,2915528735,US +2915527680,2915528715,NL +2915528716,2915528735,US 2915528736,2915528751,NL -2915528752,2915795013,US +2915528752,2915528767,US +2915528768,2915528783,NL +2915528784,2915795013,US 2915795014,2915795014,MX 2915795015,2915958783,US 2915958784,2916024319,CA @@ -44526,7 +47191,13 @@ 2916581376,2916614143,PR 2916614144,2917117951,US 2917117952,2917122047,NL -2917122048,2917195775,US +2917122048,2917170822,US +2917170823,2917170823,UA +2917170824,2917170854,US +2917170855,2917170856,UA +2917170857,2917171086,US +2917171087,2917171087,UA +2917171088,2917195775,US 2917195776,2917199871,A2 2917199872,2917203967,CA 2917203968,2917257215,US @@ -44577,13 +47248,15 @@ 2917704192,2917704447,CA 2917704448,2917707519,US 2917707520,2917707775,CA -2917707776,2917710079,US -2917710080,2917710847,CA +2917707776,2917709823,US +2917709824,2917710847,CA 2917710848,2917713919,US 2917713920,2917714431,CA 2917714432,2917715967,US -2917715968,2917716223,DE -2917716224,2917842175,US +2917715968,2917716223,CA +2917716224,2917720575,US +2917720576,2917720831,CA +2917720832,2917842175,US 2917842176,2917842431,CA 2917842432,2918014975,US 2918014976,2918023167,CA @@ -44666,11 +47339,11 @@ 2918973440,2918989823,CA 2918989824,2919010303,US 2919010304,2919010559,CA -2919010560,2919020543,US -2919020544,2919020559,CA +2919010560,2919020551,US +2919020552,2919020559,CA 2919020560,2919020607,US -2919020608,2919020623,CA -2919020624,2919021359,US +2919020608,2919020615,CA +2919020616,2919021359,US 2919021360,2919021375,CA 2919021376,2919021487,US 2919021488,2919021535,CA @@ -44678,7 +47351,9 @@ 2919022208,2919022239,CA 2919022240,2919022455,US 2919022456,2919022463,CA -2919022464,2919055359,US +2919022464,2919022495,US +2919022496,2919022527,CA +2919022528,2919055359,US 2919055360,2919057407,CN 2919057408,2919059455,IN 2919059456,2919063551,CN @@ -44692,7 +47367,11 @@ 2919174144,2919178239,CA 2919178240,2919186431,US 2919186432,2919190527,CA -2919190528,2919206911,US +2919190528,2919204747,US +2919204748,2919204755,NL +2919204756,2919205027,US +2919205028,2919205031,NL +2919205032,2919206911,US 2919206912,2919211007,CA 2919211008,2919235583,US 2919235584,2919759871,CA @@ -44756,7 +47435,7 @@ 2936012800,2937847807,CN 2937847808,2937848831,KH 2937848832,2937849855,JP -2937849856,2937850879,SG +2937849856,2937850879,AU 2937850880,2937851903,MY 2937851904,2937855999,JP 2937856000,2937860095,KR @@ -44837,7 +47516,6 @@ 2943313920,2943314943,SG 2943315968,2943318015,ID 2943318016,2943320063,JP -2943320064,2943336447,PK 2943336448,2943352831,TW 2943352832,2944401407,KR 2944401408,2944925695,JP @@ -44859,7 +47537,13 @@ 2947584000,2947586047,TO 2947588096,2947590143,ID 2947590144,2947590655,JP -2947590656,2947592191,SG +2947590656,2947590911,SG +2947590912,2947590927,HK +2947590928,2947591167,SG +2947591168,2947591183,HK +2947591184,2947591679,SG +2947591680,2947591695,JP +2947591696,2947592191,SG 2947596288,2947597311,IN 2947597312,2947598335,JP 2947598336,2947602431,AU @@ -44933,7 +47617,9 @@ 2954822928,2954822931,DE 2954822932,2954823395,FR 2954823396,2954823399,GB -2954823400,2954825063,FR +2954823400,2954824255,FR +2954824256,2954824259,ES +2954824260,2954825063,FR 2954825064,2954825067,ES 2954825068,2954825315,FR 2954825316,2954825319,ES @@ -44945,37 +47631,65 @@ 2954826032,2954826035,ES 2954826036,2954826159,FR 2954826160,2954826163,ES -2954826164,2954826759,FR +2954826164,2954826755,FR +2954826756,2954826759,IT 2954826760,2954826763,ES 2954826764,2954826775,FR 2954826776,2954826779,ES 2954826780,2954827799,FR 2954827800,2954827807,DE -2954827808,2954829751,FR +2954827808,2954829395,FR +2954829396,2954829399,IT +2954829400,2954829751,FR 2954829752,2954829752,ES 2954829753,2954829759,FR 2954829760,2954829823,ES 2954829824,2954829843,FR 2954829844,2954829847,DE -2954829848,2954832343,FR +2954829848,2954830395,FR +2954830396,2954830399,ES +2954830400,2954831247,FR +2954831248,2954831251,ES +2954831252,2954832343,FR 2954832344,2954832347,CH -2954832348,2954833419,FR +2954832348,2954832891,FR +2954832892,2954832895,ES +2954832896,2954833419,FR 2954833420,2954833423,PL -2954833424,2954833567,FR +2954833424,2954833555,FR +2954833556,2954833559,NL +2954833560,2954833567,FR 2954833568,2954833571,ES -2954833572,2954834671,FR +2954833572,2954833655,FR +2954833656,2954833659,IT +2954833660,2954834519,FR +2954834520,2954834523,ES +2954834524,2954834671,FR 2954834672,2954834675,ES 2954834676,2954835295,FR 2954835296,2954835299,ES -2954835300,2954835451,FR +2954835300,2954835443,FR +2954835444,2954835447,ES +2954835448,2954835451,FR 2954835452,2954835455,ES 2954835456,2954837071,FR 2954837072,2954837075,ES -2954837076,2954837827,FR +2954837076,2954837615,FR +2954837616,2954837619,IT +2954837620,2954837667,FR +2954837668,2954837671,ES +2954837672,2954837827,FR 2954837828,2954837831,DE -2954837832,2954838599,FR +2954837832,2954837867,FR +2954837868,2954837871,ES +2954837872,2954838599,FR 2954838600,2954838607,GB -2954838608,2954839471,FR +2954838608,2954838615,NL +2954838616,2954839239,FR +2954839240,2954839243,IT +2954839244,2954839267,FR +2954839268,2954839271,ES +2954839272,2954839471,FR 2954839472,2954839479,BE 2954839480,2954840255,FR 2954840256,2954840447,GB @@ -44985,11 +47699,21 @@ 2954840928,2954840931,DE 2954840932,2954841567,FR 2954841568,2954841583,ES -2954841584,2954844147,FR +2954841584,2954841707,FR +2954841708,2954841711,NL +2954841712,2954841807,FR +2954841808,2954841815,NL +2954841816,2954843503,FR +2954843504,2954843507,ES +2954843508,2954843767,FR +2954843768,2954843771,ES +2954843772,2954844147,FR 2954844148,2954844151,DE 2954844152,2954844999,FR 2954845000,2954845003,ES -2954845004,2954846107,FR +2954845004,2954846095,FR +2954846096,2954846103,NL +2954846104,2954846107,FR 2954846108,2954846111,ES 2954846112,2954846139,FR 2954846140,2954846143,ES @@ -44997,9 +47721,15 @@ 2954855076,2954855079,ES 2954855080,2954855507,FR 2954855508,2954855511,DE -2954855512,2954856179,FR +2954855512,2954855515,FR +2954855516,2954855519,ES +2954855520,2954855527,FR +2954855528,2954855531,ES +2954855532,2954856179,FR 2954856180,2954856183,ES -2954856184,2954861875,FR +2954856184,2954859323,FR +2954859324,2954859327,ES +2954859328,2954861875,FR 2954861876,2954861879,CH 2954861880,2954862415,FR 2954862416,2954862419,ES @@ -45013,7 +47743,13 @@ 2954870844,2954870847,ES 2954870848,2954870903,FR 2954870904,2954870907,ES -2954870908,2954877103,FR +2954870908,2954875879,FR +2954875880,2954875883,ES +2954875884,2954876871,FR +2954876872,2954876875,ES +2954876876,2954876887,FR +2954876888,2954876891,ES +2954876892,2954877103,FR 2954877104,2954877107,PL 2954877108,2954877163,FR 2954877164,2954877167,ES @@ -45029,7 +47765,9 @@ 2954899456,2954901503,ES 2954901504,2954903551,IT 2954903552,2954911743,JP -2954911744,2954918911,NL +2954911744,2954911999,NL +2954912000,2954912767,US +2954912768,2954918911,NL 2954918912,2954919935,IE 2954919936,2954928127,RU 2954928128,2954932223,PL @@ -45075,7 +47813,6 @@ 2956328960,2956460031,TR 2956460032,2956468223,RU 2956468224,2956470271,LV -2956470272,2956472319,NL 2956472320,2956474367,RU 2956474368,2956476415,GB 2956476416,2956492799,ES @@ -45277,7 +48014,9 @@ 2959282176,2959290367,RO 2959290368,2959292415,PL 2959292416,2959302655,RU -2959302656,2959310847,UA +2959302656,2959308877,UA +2959308878,2959308878,RU +2959308879,2959310847,UA 2959310848,2959343615,RU 2959343616,2959351807,UA 2959351808,2959353855,DE @@ -45448,9 +48187,7 @@ 2960240640,2960244735,RO 2960244736,2960248831,PL 2960248832,2960265215,UA -2960265216,2960269311,RU -2960269312,2960273407,UA -2960273408,2960275455,RU +2960265216,2960275455,RU 2960275456,2960277503,RO 2960277504,2960285695,RU 2960285696,2960289791,RO @@ -45507,7 +48244,6 @@ 2960594944,2960596991,UA 2960596992,2960605183,PL 2960605184,2960621567,UA -2960621568,2960629759,CZ 2960629760,2960646143,RU 2960646144,2960648191,KZ 2960648192,2960650239,UA @@ -45613,9 +48349,7 @@ 2960981248,2960982015,NL 2960982016,2960990207,RO 2960990208,2960998399,UA -2960998400,2961039359,RU -2961039360,2961047551,UA -2961047552,2961057023,RU +2960998400,2961057023,RU 2961057024,2961057279,IE 2961057280,2961057535,GR 2961057536,2961057791,AT @@ -45627,7 +48361,9 @@ 2961088512,2961088767,SE 2961088768,2961089535,UA 2961089536,2961090559,KG -2961090560,2961113087,RO +2961090560,2961108991,RO +2961108992,2961111039,GB +2961111040,2961113087,RO 2961113088,2961178623,CH 2961178624,2965372927,FR 2965372928,2965766143,RU @@ -45655,7 +48391,8 @@ 2967345152,2967347199,ES 2967347200,2967351295,HR 2967351296,2967355391,FR -2967355392,2967371775,RO +2967355392,2967363583,RO +2967363584,2967371775,SE 2967371776,2967388159,KZ 2967388160,2967392255,RU 2967392256,2967394303,FR @@ -45713,7 +48450,16 @@ 2968649728,2969042943,IT 2969042944,2969567231,GB 2969567232,2984247295,BR -2984247296,2986344447,MX +2984247296,2984935423,MX +2984935424,2984936447,AR +2984936448,2984937471,BR +2984937472,2984939519,HN +2984939520,2984951807,BR +2984951808,2984968191,EC +2984968192,2985033727,BR +2985033728,2985951231,MX +2985951232,2986082303,PY +2986082304,2986344447,CO 2986344448,2987393023,DE 2987393024,2987397119,IM 2987397120,2987401215,LV @@ -45910,7 +48656,9 @@ 2988179456,2988411647,SE 2988411648,2988411775,DE 2988411776,2988441599,SE -2988441600,2988442847,FR +2988441600,2988442075,FR +2988442076,2988442079,ES +2988442080,2988442847,FR 2988442848,2988442863,IT 2988442864,2988444208,FR 2988444209,2988444209,FI @@ -45921,7 +48669,9 @@ 2988449216,2988451839,FR 2988451840,2988453887,BE 2988453888,2988457983,GB -2988457984,2988459119,FR +2988457984,2988458319,FR +2988458320,2988458327,NL +2988458328,2988459119,FR 2988459120,2988459127,IT 2988459128,2988459135,PL 2988459136,2988459535,FR @@ -45934,14 +48684,24 @@ 2988459864,2988459867,ES 2988459868,2988460575,FR 2988460576,2988460591,PT -2988460592,2988461703,FR +2988460592,2988460651,FR +2988460652,2988460655,ES +2988460656,2988461703,FR 2988461704,2988461707,NL 2988461708,2988462603,FR 2988462604,2988462607,ES -2988462608,2988463999,FR +2988462608,2988463915,FR +2988463916,2988463919,ES +2988463920,2988463999,FR 2988464000,2988464007,IE 2988464008,2988464015,LT -2988464016,2988465279,FR +2988464016,2988464611,FR +2988464612,2988464615,IT +2988464616,2988464623,FR +2988464624,2988464627,ES +2988464628,2988465215,FR +2988465216,2988465219,ES +2988465220,2988465279,FR 2988465280,2988465295,DE 2988465296,2988465559,FR 2988465560,2988465563,ES @@ -45959,31 +48719,48 @@ 2988482320,2988482335,IT 2988482336,2988482575,FR 2988482576,2988482579,CZ -2988482580,2988484831,FR +2988482580,2988483027,FR +2988483028,2988483031,ES +2988483032,2988484831,FR 2988484832,2988484847,GB 2988484848,2988485683,FR 2988485684,2988485687,PL -2988485688,2988487071,FR +2988485688,2988486311,FR +2988486312,2988486319,NL +2988486320,2988487071,FR 2988487072,2988487075,ES -2988487076,2988489479,FR +2988487076,2988487095,FR +2988487096,2988487099,ES +2988487100,2988489119,FR +2988489120,2988489127,DE +2988489128,2988489479,FR 2988489480,2988489483,DE 2988489484,2988489675,FR 2988489676,2988489679,ES 2988489680,2988490179,FR 2988490180,2988490183,ES -2988490184,2988490686,FR +2988490184,2988490683,FR +2988490684,2988490686,IT 2988490687,2988490687,BE 2988490688,2988492799,FR 2988492800,2988494847,PL -2988494848,2988499729,FR +2988494848,2988499663,FR +2988499664,2988499671,NL +2988499672,2988499729,FR 2988499730,2988499730,GB 2988499731,2988499736,FR 2988499737,2988499737,NL 2988499738,2988500415,FR 2988500416,2988500447,CZ -2988500448,2988502051,FR +2988500448,2988500855,FR +2988500856,2988500859,ES +2988500860,2988501127,FR +2988501128,2988501131,IT +2988501132,2988502051,FR 2988502052,2988502055,PL -2988502056,2988502655,FR +2988502056,2988502479,FR +2988502480,2988502483,ES +2988502484,2988502655,FR 2988502656,2988502719,DE 2988502720,2988502881,FR 2988502882,2988502882,IT @@ -45991,7 +48768,9 @@ 2988504372,2988504375,PL 2988504376,2988505391,FR 2988505392,2988505395,ES -2988505396,2988507975,FR +2988505396,2988507163,FR +2988507164,2988507167,ES +2988507168,2988507975,FR 2988507976,2988507979,IT 2988507980,2988509511,FR 2988509512,2988509515,PL @@ -45999,7 +48778,11 @@ 2988509748,2988509751,LT 2988509752,2988512903,FR 2988512904,2988512907,GB -2988512908,2988515327,FR +2988512908,2988513003,FR +2988513004,2988513007,ES +2988513008,2988513747,FR +2988513748,2988513751,IT +2988513752,2988515327,FR 2988515328,2988517375,DE 2988517376,2988519423,FR 2988519424,2988521471,PL @@ -46011,7 +48794,9 @@ 2988525888,2988525951,GB 2988525952,2988526415,FR 2988526416,2988526423,ES -2988526424,2988527831,FR +2988526424,2988527527,FR +2988527528,2988527531,NL +2988527532,2988527831,FR 2988527832,2988527839,ES 2988527840,2988527887,FR 2988527888,2988527891,ES @@ -46019,12 +48804,23 @@ 2988529352,2988529359,GB 2988529360,2988529375,FR 2988529376,2988529383,GB -2988529384,2988535807,FR +2988529384,2988529387,ES +2988529388,2988535807,FR 2988535808,2988537855,ES -2988537856,2988544671,FR +2988537856,2988539971,FR +2988539972,2988539975,ES +2988539976,2988540503,FR +2988540504,2988540507,NL +2988540508,2988544671,FR 2988544672,2988544687,GB 2988544688,2988544691,NL -2988544692,2988547655,FR +2988544692,2988546727,FR +2988546728,2988546731,ES +2988546732,2988547067,FR +2988547068,2988547071,ES +2988547072,2988547095,FR +2988547096,2988547099,ES +2988547100,2988547655,FR 2988547656,2988547663,PL 2988547664,2988547871,FR 2988547872,2988547903,GB @@ -46038,7 +48834,9 @@ 2988550439,2988550439,GB 2988550440,2988550463,FR 2988550464,2988550527,DE -2988550528,2988551535,FR +2988550528,2988551443,FR +2988551444,2988551447,ES +2988551448,2988551535,FR 2988551536,2988551551,DE 2988551552,2988553531,FR 2988553532,2988553535,ES @@ -46050,9 +48848,16 @@ 2988556208,2988556211,DE 2988556212,2988556359,FR 2988556360,2988556363,ES -2988556364,2988558203,FR +2988556364,2988557507,FR +2988557508,2988557511,ES +2988557512,2988557539,FR +2988557540,2988557543,ES +2988557544,2988558203,FR 2988558204,2988558207,DE -2988558208,2988561583,FR +2988558208,2988558803,FR +2988558804,2988558807,ES +2988558808,2988558815,NL +2988558816,2988561583,FR 2988561584,2988561591,GB 2988561592,2988561763,FR 2988561764,2988561767,IT @@ -46068,7 +48873,9 @@ 2989096960,2989228031,PL 2989228032,2989490175,RU 2989490176,2989555711,HU -2989555712,2989621247,RU +2989555712,2989588479,RU +2989588480,2989589503,CO +2989589504,2989621247,RU 2989621248,2989752319,BE 2989752320,2989817855,SY 2989817856,2989883391,KW @@ -46194,7 +49001,7 @@ 2996666368,2996682751,RU 2996682752,2996699135,DK 2996699136,2996764671,UA -2996764672,2996768767,NL +2996764672,2996768767,GB 2996768768,2996772863,RU 2996772864,2996776959,UA 2996776960,2996781055,RU @@ -46213,13 +49020,9 @@ 2996862976,2996895743,AM 2996895744,2996928511,KW 2996928512,2996994047,RU -2996994048,2996999679,DE -2996999680,2996999935,GB -2996999936,2997004607,DE +2996994048,2997004607,DE 2997004608,2997004671,RU -2997004672,2997018623,DE -2997018624,2997019135,GB -2997019136,2997026815,DE +2997004672,2997026815,DE 2997026816,2997059583,RU 2997059584,2997092351,BY 2997092352,2997125119,NO @@ -46256,7 +49059,9 @@ 2997513355,2997515683,FR 2997515684,2997515684,GB 2997515685,2997518335,FR -2997518336,2997583871,RU +2997518336,2997520383,DE +2997520384,2997526527,NL +2997526528,2997583871,RU 2997583872,2997616639,SY 2997616640,2997649407,SI 2997649408,2997682175,BY @@ -46334,7 +49139,7 @@ 3000301568,3000302591,RU 3000302592,3000303103,LV 3000303104,3000303359,CH -3000303360,3000303615,PL +3000303360,3000303615,DE 3000303616,3000305663,UA 3000305664,3000313855,RU 3000313856,3000315903,CZ @@ -46375,7 +49180,7 @@ 3000487936,3000492031,PS 3000492032,3000506367,UA 3000506368,3000508415,PL -3000508416,3000510463,UA +3000508416,3000510463,RU 3000510464,3000512511,PL 3000512512,3000514559,SE 3000514560,3000516607,SI @@ -46719,8 +49524,8 @@ 3003140608,3003141375,PA 3003141376,3003141631,CR 3003141632,3003141887,PA -3003141888,3003143935,CR -3003143936,3003144447,PA +3003141888,3003143679,CR +3003143680,3003144447,PA 3003144448,3003146239,CR 3003146240,3003146495,PA 3003146496,3003147007,CR @@ -46729,9 +49534,11 @@ 3003148032,3003148543,PA 3003148544,3003148799,CR 3003148800,3003149311,PA -3003149312,3003152127,CR -3003152128,3003152383,PA -3003152384,3003154431,CR +3003149312,3003151871,CR +3003151872,3003152383,PA +3003152384,3003152639,CR +3003152640,3003152895,PA +3003152896,3003154431,CR 3003154432,3003154687,CL 3003154688,3003154943,EC 3003154944,3003159039,AR @@ -46749,6 +49556,8 @@ 3003173632,3003173887,AR 3003173888,3003174143,EC 3003174144,3003174399,CO +3003174400,3003174911,BR +3003174912,3003179007,CR 3003179008,3003187199,AR 3003187200,3003252735,CO 3003252736,3003449343,CL @@ -46840,8 +49649,7 @@ 3006279168,3006279423,NI 3006279424,3006283519,PA 3006283520,3006283775,NI -3006283776,3006284031,PA -3006284032,3006284287,CR +3006283776,3006284287,CR 3006284288,3006284799,PA 3006284800,3006285055,CR 3006285056,3006285311,PA @@ -46864,19 +49672,23 @@ 3006308352,3006308863,CR 3006308864,3006310143,PA 3006310144,3006310399,CR -3006310400,3006311679,PA +3006310400,3006311167,PA +3006311168,3006311423,CR +3006311424,3006311679,PA 3006311680,3006312191,CR 3006312192,3006312703,PA 3006312704,3006312959,CR -3006312960,3006314239,PA +3006312960,3006313727,PA +3006313728,3006313983,CR +3006313984,3006314239,PA 3006314240,3006314495,CR -3006314496,3006315519,PA -3006315520,3006315775,CR +3006314496,3006315263,PA +3006315264,3006315775,CR 3006315776,3006320895,PA 3006320896,3006321151,CR 3006321152,3006321663,PA -3006321664,3006321919,CR -3006321920,3006322431,PA +3006321664,3006322175,CR +3006322176,3006322431,PA 3006322432,3006323199,CR 3006323200,3006323455,PA 3006323456,3006323711,CR @@ -46937,7 +49749,9 @@ 3007092736,3007094783,AR 3007094784,3007096831,CR 3007096832,3007098879,AR -3007098880,3007100927,HN +3007098880,3007100887,HN +3007100888,3007100895,PH +3007100896,3007100927,HN 3007100928,3007102975,AR 3007102976,3007103999,US 3007104000,3007106047,AR @@ -46954,7 +49768,85 @@ 3007123456,3007143935,AR 3007143936,3007148031,CL 3007148032,3007152127,CO -3007152128,3007184895,CL +3007152128,3007152383,CL +3007152384,3007152639,US +3007152640,3007152895,CL +3007152896,3007153151,US +3007153152,3007153407,CL +3007153408,3007153663,US +3007153664,3007153919,CL +3007153920,3007154175,US +3007154176,3007154431,CL +3007154432,3007154687,US +3007154688,3007154943,CL +3007154944,3007155199,US +3007155200,3007155455,CL +3007155456,3007155711,GB +3007155712,3007155967,CL +3007155968,3007156223,DE +3007156224,3007156479,CL +3007156480,3007156495,ES +3007156496,3007156991,CL +3007156992,3007157007,HR +3007157008,3007157503,CL +3007157504,3007157519,IE +3007157520,3007158015,CL +3007158016,3007158031,BE +3007158032,3007158527,CL +3007158528,3007158543,GB +3007158544,3007159039,CL +3007159040,3007159055,GB +3007159056,3007159551,CL +3007159552,3007159567,RU +3007159568,3007160063,CL +3007160064,3007160079,HR +3007160080,3007160575,CL +3007160576,3007160591,IE +3007160592,3007160607,US +3007160608,3007161087,CL +3007161088,3007161103,GB +3007161104,3007161599,CL +3007161600,3007161615,GB +3007161616,3007162111,CL +3007162112,3007162127,ES +3007162128,3007162623,CL +3007162624,3007162639,NL +3007162640,3007163135,CL +3007163136,3007163151,GB +3007163152,3007163647,CL +3007163648,3007163663,ES +3007163664,3007164159,CL +3007164160,3007164175,SK +3007164176,3007164671,CL +3007164672,3007164687,SE +3007164688,3007165183,CL +3007165184,3007165199,GB +3007165200,3007165695,CL +3007165696,3007165711,DK +3007165712,3007166207,CL +3007166208,3007166223,TR +3007166224,3007166719,CL +3007166720,3007166735,GB +3007166736,3007167231,CL +3007167232,3007167247,ES +3007167248,3007167743,CL +3007167744,3007167759,AU +3007167760,3007168255,CL +3007168256,3007168271,GR +3007168272,3007168511,CL +3007168512,3007168767,QA +3007168768,3007169023,CL +3007169024,3007169151,US +3007169152,3007171855,CL +3007171856,3007171871,US +3007171872,3007175679,CL +3007175680,3007175935,GB +3007175936,3007183359,CL +3007183360,3007183615,AU +3007183616,3007183871,IE +3007183872,3007184127,JO +3007184128,3007184383,KW +3007184384,3007184895,CL 3007184896,3007250431,AR 3007250432,3007268095,CR 3007268096,3007268607,PA @@ -47020,30 +49912,41 @@ 3024879616,3025141759,CN 3025141760,3025403903,KR 3025403904,3025600511,CN -3025600512,3025603839,IN +3025600512,3025603071,IN +3025603072,3025603087,HK +3025603088,3025603839,IN 3025603840,3025604095,HK 3025604096,3025604381,IN -3025604382,3025604637,SG -3025604638,3025606815,IN +3025604382,3025606655,SG +3025606656,3025606815,IN 3025606816,3025606831,SG 3025606832,3025607167,IN 3025607168,3025607423,SG 3025607424,3025607679,HK 3025607680,3025608191,IN 3025608192,3025608203,JP -3025608204,3025616895,IN +3025608204,3025610751,IN +3025610752,3025612799,SG +3025612800,3025616895,IN 3025616896,3025617407,SG 3025617408,3025618943,IN -3025618944,3025619471,SG -3025619472,3025620991,IN +3025618944,3025619487,SG +3025619488,3025620991,IN 3025620992,3025621247,PH -3025621248,3025625343,IN +3025621248,3025621503,IN +3025621504,3025621759,PH +3025621760,3025623295,IN +3025623296,3025623551,JP +3025623552,3025625343,IN 3025625344,3025625375,SG 3025625376,3025625391,IN -3025625392,3025625395,SG -3025625396,3025625407,IN +3025625392,3025625395,CA +3025625396,3025625399,IN +3025625400,3025625407,TH 3025625408,3025625471,SG -3025625472,3025625599,IN +3025625472,3025625503,MY +3025625504,3025625535,IN +3025625536,3025625599,CA 3025625600,3025625855,SG 3025625856,3025629439,IN 3025629440,3025629503,HK @@ -47051,14 +49954,17 @@ 3025629696,3025629951,HK 3025629952,3025630207,IN 3025630208,3025630719,AU -3025630720,3025631239,IN +3025630720,3025630975,JP +3025630976,3025631239,IN 3025631240,3025631247,AU 3025631248,3025632255,IN 3025632256,3025632271,SG 3025632272,3025633535,IN 3025633536,3025633791,HK 3025633792,3025633807,AU -3025633808,3025637375,IN +3025633808,3025637151,IN +3025637152,3025637183,MY +3025637184,3025637375,IN 3025637376,3025637631,HK 3025637632,3025637887,MY 3025637888,3025638279,IN @@ -47073,8 +49979,8 @@ 3025639424,3025639679,SG 3025639680,3025639935,HK 3025639936,3025640447,IN -3025640448,3025640767,MY -3025640768,3025641727,IN +3025640448,3025640799,MY +3025640800,3025641727,IN 3025641728,3025641743,HK 3025641744,3025641759,IN 3025641760,3025641775,HK @@ -47084,8 +49990,9 @@ 3025647616,3025647775,IN 3025647776,3025647791,SG 3025647792,3025648079,IN -3025648080,3025648083,SG -3025648084,3025649151,IN +3025648080,3025648087,SG +3025648088,3025648091,US +3025648092,3025649151,IN 3025649152,3025649663,HK 3025649664,3025666047,IN 3025666048,3025928191,CN @@ -47154,7 +50061,9 @@ 3028523008,3028525055,JP 3028525056,3028533247,HK 3028533248,3028537343,JP -3028537344,3028549631,US +3028537344,3028538317,US +3028538318,3028538318,JP +3028538319,3028549631,US 3028549632,3028811775,KR 3028811776,3029336063,CN 3029336064,3029598207,JP @@ -47290,7 +50199,7 @@ 3034483200,3034483455,US 3034483456,3034484735,AF 3034484736,3034488831,TH -3034488832,3034492927,NZ +3034488832,3034492927,AU 3034492928,3034497023,JP 3034497024,3034499071,AU 3034499072,3034500095,HK @@ -47304,7 +50213,8 @@ 3035103232,3035168767,PH 3035168768,3035193343,CN 3035193344,3035197439,JP -3035197440,3035199487,HK +3035197440,3035198463,SG +3035198464,3035199487,HK 3035199488,3035200511,IN 3035200512,3035202559,AU 3035202560,3035205631,JP @@ -47352,14 +50262,18 @@ 3039414272,3039414527,BR 3039414528,3039415295,CL 3039415296,3039415807,BR -3039415808,3039416831,CL +3039415808,3039416713,CL +3039416714,3039416715,US +3039416716,3039416735,CL +3039416736,3039416739,US +3039416740,3039416831,CL 3039416832,3039417343,BR 3039417344,3039417855,CL 3039417856,3039418111,BR 3039418112,3039418367,CL -3039418368,3039418623,BR -3039418624,3039419391,CL -3039419392,3039420159,BR +3039418368,3039418879,BR +3039418880,3039419135,CL +3039419136,3039420159,BR 3039420160,3039420415,CL 3039420416,3039428607,AR 3039428608,3039559679,CL @@ -47458,6 +50372,108 @@ 3050405888,3050438655,GT 3050438656,3050504191,HN 3050504192,3050569727,EC +3050569728,3050635263,CL +3050635264,3050700799,BR +3050700800,3050700815,JP +3050700816,3050701311,CL +3050701312,3050701327,IE +3050701328,3050701343,US +3050701344,3050701823,CL +3050701824,3050701839,SG +3050701840,3050702335,CL +3050702336,3050702351,DK +3050702352,3050703359,CL +3050703360,3050703375,AT +3050703376,3050703871,CL +3050703872,3050703887,RU +3050703888,3050704383,CL +3050704384,3050704399,KR +3050704400,3050704895,CL +3050704896,3050704911,IT +3050704912,3050705407,CL +3050705408,3050705423,JP +3050705424,3050705919,CL +3050705920,3050705935,AU +3050705936,3050706431,CL +3050706432,3050706447,NL +3050706448,3050706943,CL +3050706944,3050706959,HK +3050706960,3050707455,CL +3050707456,3050707471,IT +3050707472,3050707967,CL +3050707968,3050707983,CH +3050707984,3050708479,CL +3050708480,3050708495,FR +3050708496,3050708991,CL +3050708992,3050709007,AT +3050709008,3050709503,CL +3050709504,3050709519,TH +3050709520,3050710015,CL +3050710016,3050710031,ES +3050710032,3050710527,CL +3050710528,3050710543,FR +3050710544,3050711039,CL +3050711040,3050711055,AU +3050711056,3050711551,CL +3050711552,3050711567,EE +3050711568,3050712063,CL +3050712064,3050712079,FR +3050712080,3050712575,CL +3050712576,3050712591,PL +3050712592,3050713087,CL +3050713088,3050713103,LV +3050713104,3050766335,CL +3050766336,3050766351,NO +3050766352,3050766847,CL +3050766848,3050766863,KR +3050766864,3050767359,CL +3050767360,3050767375,AT +3050767376,3050767871,CL +3050767872,3050767887,MY +3050767888,3050768383,CL +3050768384,3050768399,AT +3050768400,3050768895,CL +3050768896,3050768911,CZ +3050768912,3050769407,CL +3050769408,3050769423,AU +3050769424,3050769919,CL +3050769920,3050769935,MY +3050769936,3050770431,CL +3050770432,3050770447,LV +3050770448,3050770943,CL +3050770944,3050770959,HK +3050770960,3050771455,CL +3050771456,3050771471,SG +3050771472,3050771967,CL +3050771968,3050771983,EE +3050771984,3050772479,CL +3050772480,3050772495,MY +3050772496,3050772991,CL +3050772992,3050773007,HK +3050773008,3050773503,CL +3050773504,3050773519,NL +3050773520,3050774015,CL +3050774016,3050774031,TR +3050774032,3050774527,CL +3050774528,3050774543,ES +3050774544,3050775039,CL +3050775040,3050775055,KR +3050775056,3050775551,CL +3050775552,3050775567,FR +3050775568,3050776063,CL +3050776064,3050776079,MY +3050776080,3050776575,CL +3050776576,3050776591,TH +3050776592,3050777087,CL +3050777088,3050777103,AU +3050777104,3050777599,CL +3050777600,3050777615,HK +3050777616,3050778111,CL +3050778112,3050778127,KR +3050778128,3050778623,CL +3050778624,3050778639,TR +3050778640,3050831871,CL +3050831872,3051356159,BR 3051356160,3051373055,CR 3051373056,3051373311,PA 3051373312,3051374335,CR @@ -47521,7 +50537,9 @@ 3051974400,3051974655,PA 3051974656,3051976191,CR 3051976192,3051976447,PA -3051976448,3051995135,CR +3051976448,3051983871,CR +3051983872,3051984895,BR +3051984896,3051995135,CR 3051995136,3052011519,PE 3052011520,3052273663,CO 3052273664,3052404735,AR @@ -47659,7 +50677,7 @@ 3068986368,3068987391,AU 3068987392,3068990463,IN 3068990464,3068991487,VN -3068991488,3068992511,IN +3068991488,3068991743,IN 3068993536,3069018111,KR 3069018112,3069034495,IN 3069034496,3069050879,KR @@ -47690,7 +50708,6 @@ 3074949120,3075342335,JP 3075342336,3075375103,MY 3075375104,3075383295,KR -3075383296,3075385343,IN 3075385344,3075386367,MY 3075386368,3075387391,AU 3075388416,3075389439,CN @@ -47736,7 +50753,12 @@ 3081437184,3081502719,MY 3081502720,3081764863,CN 3081764864,3081846783,JP -3081846784,3081854975,HK +3081846784,3081847807,TW +3081847808,3081848831,KR +3081848832,3081850879,SG +3081850880,3081851903,HK +3081851904,3081852927,JP +3081852928,3081854975,HK 3081854976,3081859071,MN 3081859072,3081861119,PH 3081861120,3081862143,AU @@ -47746,18 +50768,26 @@ 3082027008,3082158079,JP 3082158080,3082166271,CN 3082166272,3082174463,JP -3082174464,3082178559,PH +3082174464,3082178559,BZ 3082178560,3082179583,HK 3082179584,3082181631,IN 3082181632,3082182655,ID 3082182656,3082190847,LA 3082190848,3082289151,JP 3082289152,3087007743,CN -3087007744,3088629759,US +3087007744,3088605183,US +3088605184,3088609279,NL +3088609280,3088629759,US 3088629760,3088633855,NL -3088633856,3088998399,US +3088633856,3088924671,US +3088924672,3088925695,NL +3088925696,3088998399,US 3088998400,3089002495,NL -3089002496,3090325503,US +3089002496,3089027071,US +3089027072,3089031167,NL +3089031168,3089059839,US +3089059840,3089063935,NL +3089063936,3090325503,US 3090325504,3090329599,NL 3090329600,3090389503,US 3090389504,3090389631,CA @@ -47800,9 +50830,17 @@ 3093855488,3093908991,US 3093908992,3093909247,PR 3093909248,3094020095,US -3094020096,3094032759,CA +3094020096,3094023303,CA +3094023304,3094023311,BD +3094023312,3094032759,CA 3094032760,3094032767,GI -3094032768,3094085631,CA +3094032768,3094041359,CA +3094041360,3094041367,DZ +3094041368,3094045663,CA +3094045664,3094045671,CO +3094045672,3094077751,CA +3094077752,3094077759,US +3094077760,3094085631,CA 3094085632,3096444927,US 3096444928,3096969215,CA 3096969216,3097493503,US @@ -47847,7 +50885,11 @@ 3098263552,3098271743,CA 3098271744,3098278847,US 3098278848,3098278911,CA -3098278912,3098476543,US +3098278912,3098411007,US +3098411008,3098415103,PK +3098415104,3098439679,US +3098439680,3098443775,CA +3098443776,3098476543,US 3098476544,3098492927,CA 3098492928,3098494719,US 3098494720,3098495743,CA @@ -47873,10 +50915,14 @@ 3103855104,3103855359,DE 3103855360,3103855615,RU 3103855616,3103855871,ES -3103855872,3103856383,PL +3103856128,3103856383,PL 3103856384,3103856639,RU 3103856640,3103856895,HU 3103856896,3103857151,CZ +3103857152,3103857407,FR +3103857408,3103857663,RS +3103857664,3103857919,FR +3103857920,3103858175,PL 3103916032,3103917055,CH 3103917056,3103918079,IT 3103918080,3103919103,DE @@ -47886,7 +50932,8 @@ 3103922176,3103923199,NL 3103923200,3103923455,SE 3103923456,3103924223,NL -3103924224,3103925247,RU +3103924224,3103924479,DE +3103924480,3103925247,RU 3103925248,3103926271,PL 3103926272,3103927295,CZ 3103927296,3103929343,NL @@ -47922,7 +50969,8 @@ 3103960064,3103961087,NL 3103961088,3103961343,TR 3103961344,3103961599,AE -3103961600,3103962111,AT +3103961600,3103961855,AR +3103961856,3103962111,AT 3103962112,3103963135,DE 3103963136,3103964159,RU 3103964160,3103965183,MK @@ -47933,7 +50981,11 @@ 3103970304,3103971327,UA 3103971328,3103973375,GB 3103973376,3103974399,KZ -3103974400,3103975423,SE +3103974400,3103974911,SE +3103974912,3103974919,LT +3103974920,3103974943,SE +3103974944,3103975039,LT +3103975040,3103975423,SE 3103975424,3103976447,SA 3103976448,3103977471,GB 3103977472,3103978495,NL @@ -47985,6 +51037,7 @@ 3104026624,3104027647,NL 3104027648,3104028671,RU 3104028672,3104029695,DE +3104029696,3104030719,AM 3104030720,3104031743,HR 3104031744,3104032767,FR 3104032768,3104033791,IR @@ -48271,9 +51324,7 @@ 3104331776,3104333823,GB 3104333824,3104334847,ES 3104334848,3104335871,SE -3104335872,3104336239,LT -3104336240,3104336255,DE -3104336256,3104336359,LT +3104335872,3104336359,LT 3104336360,3104336367,BE 3104336368,3104336407,LT 3104336408,3104336415,CH @@ -48463,7 +51514,8 @@ 3104539648,3104540671,RU 3104540672,3104541695,DE 3104541696,3104542719,GB -3104542720,3104544767,RU +3104542720,3104543743,NL +3104543744,3104544767,RU 3104544768,3104545791,IT 3104545792,3104546815,DE 3104546816,3104547839,FR @@ -48642,8 +51694,7 @@ 3104734208,3104735231,BA 3104735232,3104736255,FR 3104736256,3104737279,JO -3104737280,3104738303,GB -3104739328,3104740351,GB +3104737280,3104740351,GB 3104740352,3104741375,PL 3104741376,3104742399,GB 3104742400,3104743423,CH @@ -48947,14 +51998,13 @@ 3105063936,3105064959,DK 3105064960,3105065983,FR 3105065984,3105067007,IT -3105067008,3105068031,GB +3105067008,3105069055,GB 3105069056,3105070079,TR 3105070080,3105071103,ES 3105071104,3105072127,FR 3105072128,3105073151,IT 3105073152,3105074175,RU 3105074176,3105075199,DE -3105075200,3105076223,DK 3105076224,3105077247,BE 3105077248,3105078271,IT 3105078272,3105079295,ES @@ -49082,7 +52132,7 @@ 3105212416,3105213439,NL 3105213440,3105214463,TR 3105214464,3105215487,GB -3105215488,3105216511,FR +3105215488,3105216511,GP 3105216512,3105217535,GB 3105217536,3105218559,CZ 3105218560,3105219583,DE @@ -49240,7 +52290,6 @@ 3105383680,3105383935,SK 3105383936,3105384447,AT 3105384448,3105385471,IT -3105385472,3105386495,DE 3105386496,3105387519,RU 3105387520,3105388543,IT 3105388544,3105389567,GB @@ -49334,7 +52383,9 @@ 3105483776,3105486847,GB 3105486848,3105487871,SK 3105487872,3105488895,IS -3105488896,3105489919,FR +3105488896,3105489407,BG +3105489408,3105489663,FR +3105489664,3105489919,BG 3105489920,3105490943,ES 3105490944,3105491967,SE 3105491968,3105494015,GB @@ -49360,7 +52411,6 @@ 3105515520,3105516543,FR 3105516544,3105517567,NL 3105517568,3105518591,RU -3105518592,3105519615,US 3105519616,3105520639,RU 3105520640,3105521663,FR 3105521664,3105522687,NO @@ -49377,7 +52427,9 @@ 3105532928,3105533951,RS 3105533952,3105534975,BA 3105534976,3105535231,GB -3105535232,3105535999,EU +3105535232,3105535773,EU +3105535774,3105535774,RU +3105535775,3105535999,EU 3105536000,3105537023,AZ 3105537024,3105538047,AT 3105538048,3105539071,RU @@ -49489,7 +52541,9 @@ 3105647616,3105648639,UA 3105648640,3105649663,GB 3105649664,3105650687,PL -3105650688,3105651711,EE +3105650688,3105651199,EE +3105651200,3105651455,PL +3105651456,3105651711,EE 3105651712,3105652735,SK 3105652736,3105653759,NO 3105653760,3105654783,TR @@ -49504,7 +52558,6 @@ 3105662976,3105663999,ES 3105664000,3105665023,DE 3105665024,3105666047,PL -3105666048,3105667071,GB 3105667072,3105668095,DE 3105668096,3105669119,NL 3105669120,3105670143,CZ @@ -49721,9 +52774,7 @@ 3105896448,3105897471,RU 3105897472,3105898495,UA 3105898496,3105899007,CZ -3105899008,3105899263,RU -3105899264,3105899519,CZ -3105899520,3105900543,RU +3105899008,3105900543,RU 3105900544,3105902591,GB 3105902592,3105903615,DE 3105903616,3105904639,RU @@ -49757,9 +52808,9 @@ 3105933344,3105933359,IT 3105933360,3105933463,GB 3105933464,3105933471,IT -3105933472,3105934007,GB -3105934008,3105934015,IT -3105934016,3105934215,GB +3105933472,3105934127,GB +3105934128,3105934135,IT +3105934136,3105934215,GB 3105934216,3105934223,IT 3105934224,3105934231,GB 3105934232,3105934239,IT @@ -49777,7 +52828,6 @@ 3105944576,3105945599,DE 3105945600,3105946623,RU 3105946624,3105947647,IE -3105947648,3105948671,DE 3105948672,3105949695,GB 3105949696,3105950719,AT 3105950720,3105951743,FR @@ -49852,11 +52902,7 @@ 3106021376,3106022399,FR 3106022400,3106023423,IT 3106023424,3106023679,NL -3106023680,3106023807,US -3106023808,3106023935,NL -3106023936,3106024063,US -3106024064,3106024191,NL -3106024192,3106024319,US +3106023680,3106024319,US 3106024320,3106024447,RU 3106024448,3106025471,GB 3106025472,3106026495,PL @@ -49963,7 +53009,8 @@ 3106126848,3106127871,ES 3106127872,3106128895,RU 3106128896,3106129919,PL -3106129920,3106130943,NO +3106129920,3106130175,SE +3106130176,3106130943,NO 3106130944,3106131967,FR 3106131968,3106132991,DE 3106132992,3106134015,NO @@ -50002,7 +53049,9 @@ 3106166784,3106167807,BH 3106167808,3106168831,RO 3106168832,3106169855,FI -3106169856,3106170879,CZ +3106169856,3106170000,NL +3106170001,3106170001,A1 +3106170002,3106170879,NL 3106170880,3106171903,RU 3106171904,3106172927,GB 3106172928,3106173951,NL @@ -50036,7 +53085,7 @@ 3106204672,3106205695,MT 3106205696,3106206719,NO 3106206720,3106207743,GE -3106207744,3106208767,SE +3106207744,3106208767,GB 3106208768,3106209791,RO 3106209792,3106210815,CH 3106210816,3106211839,NL @@ -50255,7 +53304,7 @@ 3106442240,3106443263,GB 3106443264,3106445311,ES 3106445312,3106446335,RU -3106446336,3106448383,DE +3106447360,3106448383,DE 3106448384,3106449407,BG 3106449408,3106450431,AT 3106450432,3106451455,DE @@ -50290,7 +53339,13 @@ 3106480128,3106481151,IT 3106481152,3106482175,NL 3106482176,3106483199,RU -3106483200,3106484223,GB +3106483200,3106483423,GB +3106483424,3106483424,ES +3106483425,3106483425,NL +3106483426,3106483426,FR +3106483427,3106483429,GB +3106483430,3106483430,IE +3106483431,3106484223,GB 3106484224,3106485247,NL 3106485248,3106486271,CZ 3106486272,3106488319,DE @@ -50418,7 +53473,8 @@ 3106627584,3106628607,GB 3106628608,3106629631,RU 3106629632,3106630655,EE -3106630656,3106631679,GB +3106630656,3106630911,US +3106630912,3106631679,GB 3106631680,3106632703,SK 3106632704,3106633727,DE 3106633728,3106634751,FI @@ -50451,8 +53507,7 @@ 3106661376,3106662399,TR 3106662400,3106663423,IE 3106663424,3106664447,UA -3106664448,3106665471,FR -3106665472,3106666495,CH +3106664448,3106666495,FR 3106666496,3106667519,UA 3106667520,3106668543,ES 3106668544,3106669567,RU @@ -50470,7 +53525,9 @@ 3106684928,3106685951,IR 3106685952,3106686975,RU 3106686976,3106687999,LT -3106688000,3106689023,GB +3106688000,3106688255,GB +3106688256,3106688511,FR +3106688512,3106689023,GB 3106689024,3106690047,CH 3106690048,3106691071,UA 3106691072,3106692095,FR @@ -50511,8 +53568,8 @@ 3106728960,3106729983,RU 3106729984,3106731007,IS 3106731008,3106732031,NL -3106732032,3106735103,GB -3106735104,3106737151,IE +3106732032,3106736127,GB +3106736128,3106737151,IE 3106737152,3106738175,RO 3106738176,3106739199,DE 3106739200,3106740223,DK @@ -50558,7 +53615,8 @@ 3106780160,3106781183,FR 3106781184,3106782207,DK 3106782208,3106783231,IR -3106783232,3106784255,SC +3106783232,3106783743,NL +3106783744,3106784255,AE 3106784256,3106785279,HU 3106785280,3106786303,CZ 3106786304,3106787327,DE @@ -50985,8 +54043,7 @@ 3107252224,3107253247,SY 3107253248,3107254271,NL 3107254272,3107255295,IT -3107255296,3107256319,DE -3107256320,3107257343,CZ +3107255296,3107257343,DE 3107257344,3107258367,GB 3107258368,3107259391,IT 3107259392,3107260415,CZ @@ -51029,7 +54086,8 @@ 3107298304,3107299327,DE 3107299328,3107300351,NL 3107300352,3107301375,SE -3107301376,3107303423,GB +3107301376,3107302399,DE +3107302400,3107303423,GB 3107303424,3107304447,DE 3107304448,3107305471,AT 3107305472,3107306495,FR @@ -51095,7 +54153,7 @@ 3107371008,3107372031,PL 3107372032,3107373055,DE 3107373056,3107374079,ES -3107374080,3107374080,VA +3107374080,3107374080,A1 3107374081,3107374100,MT 3107374101,3107374120,CR 3107374121,3107374140,IT @@ -51105,9 +54163,12 @@ 3107374201,3107374220,BR 3107374221,3107374240,CA 3107374241,3107374260,BO -3107374261,3107374320,US -3107374321,3107374335,MX -3107374336,3107375103,VA +3107374261,3107374280,US +3107374281,3107374320,A1 +3107374321,3107374332,MX +3107374333,3107374333,A1 +3107374334,3107374335,MX +3107374336,3107375103,A1 3107375104,3107376127,GB 3107376128,3107377151,NL 3107377152,3107378175,AT @@ -51197,7 +54258,7 @@ 3107470336,3107471359,NL 3107471360,3107473407,GB 3107473408,3107474431,IL -3107474432,3107475455,RO +3107474432,3107475455,ES 3107475456,3107476479,NL 3107476480,3107477503,BG 3107477504,3107478527,AE @@ -51216,8 +54277,596 @@ 3107492864,3107493887,DE 3107493888,3107494911,FR 3107494912,3107495935,IT -3107495936,3107496959,FR +3107495936,3107496191,FR +3107496192,3107496255,DE +3107496256,3107496287,BS +3107496288,3107496319,FR +3107496320,3107496703,NL +3107496704,3107496719,PE +3107496720,3107496735,PK +3107496736,3107496751,FJ +3107496752,3107496783,PA +3107496784,3107496799,AQ +3107496800,3107496815,MX +3107496816,3107496831,CN +3107496832,3107496847,BR +3107496848,3107496863,KP +3107496864,3107496879,HK +3107496880,3107496895,IS +3107496896,3107496911,US +3107496912,3107496927,PL +3107496928,3107496959,FR 3107496960,3107497983,DK +3107497984,3107499007,IT +3107499008,3107500031,PL +3107500032,3107501055,FR +3107501056,3107502079,ES +3107502080,3107503103,NO +3107503104,3107504127,PL +3107504128,3107505151,IQ +3107505152,3107506175,SA +3107506176,3107507199,GB +3107507200,3107508223,FR +3107508224,3107509247,PL +3107509248,3107510271,SE +3107510272,3107511295,IT +3107511296,3107512319,SI +3107512320,3107513343,NL +3107513344,3107514367,DE +3107514368,3107515391,US +3107515392,3107516415,TR +3107516416,3107517439,FR +3107517440,3107518463,PL +3107518464,3107519487,MK +3107519488,3107520511,MT +3107520512,3107521535,DE +3107521536,3107522559,SE +3107522560,3107523583,NL +3107523584,3107524607,FR +3107524608,3107525631,SI +3107525632,3107526655,IT +3107526656,3107527679,DE +3107527680,3107528703,RU +3107528704,3107531775,GB +3107531776,3107532799,MD +3107532800,3107533823,AT +3107533824,3107534847,FR +3107534848,3107536895,NL +3107536896,3107537919,TR +3107537920,3107538943,AM +3107538944,3107539967,KZ +3107539968,3107540991,GB +3107540992,3107542015,RO +3107542016,3107543039,SE +3107543040,3107544063,DE +3107544064,3107545087,IR +3107545088,3107546111,NL +3107546112,3107547135,GB +3107547136,3107548159,SE +3107548160,3107549183,IT +3107549184,3107551231,IE +3107551232,3107552255,JO +3107552256,3107553279,FR +3107553280,3107554303,BE +3107554304,3107555327,IR +3107555328,3107556351,SE +3107556352,3107557375,NL +3107557376,3107558399,SI +3107558400,3107559423,FR +3107559424,3107561471,GB +3107561472,3107562495,GL +3107562496,3107563519,IR +3107563520,3107564543,SE +3107564544,3107565567,NL +3107565568,3107566591,AT +3107566592,3107567615,FI +3107567616,3107568639,DE +3107568640,3107569663,GB +3107569664,3107571711,ES +3107571712,3107572735,IR +3107572736,3107573759,ES +3107573760,3107574783,IT +3107574784,3107575807,JE +3107575808,3107576831,DE +3107576832,3107577855,FR +3107577856,3107578879,SI +3107578880,3107579903,CZ +3107579904,3107580927,IT +3107580928,3107581951,RU +3107581952,3107582975,DE +3107582976,3107583999,TR +3107584000,3107585023,RU +3107585024,3107586047,NO +3107586048,3107587071,DE +3107587072,3107588095,IT +3107588096,3107589119,FR +3107589120,3107590143,IQ +3107590144,3107591167,IE +3107591168,3107592191,BG +3107592192,3107593215,NL +3107593216,3107594239,DE +3107594240,3107595263,FI +3107595264,3107596287,DE +3107596288,3107597311,CZ +3107597312,3107598335,IT +3107598336,3107599359,PL +3107599360,3107600383,AT +3107600384,3107601407,NL +3107601408,3107602431,DK +3107602432,3107603455,LT +3107603456,3107604479,NO +3107604480,3107605503,HR +3107605504,3107606527,SE +3107606528,3107607551,PT +3107607552,3107609599,GB +3107609600,3107610623,BA +3107610624,3107611647,BE +3107611648,3107612671,SK +3107612672,3107613695,IT +3107613696,3107614719,DE +3107614720,3107615743,RU +3107615744,3107617791,IT +3107617792,3107618815,RU +3107618816,3107619839,CH +3107619840,3107620863,IT +3107620864,3107621887,NO +3107621888,3107622911,SA +3107622912,3107623935,SE +3107623936,3107624959,NL +3107624960,3107625983,RU +3107625984,3107627007,DE +3107627008,3107628031,PL +3107628032,3107629055,GB +3107629056,3107630079,DE +3107630080,3107631103,ES +3107631104,3107632127,GB +3107632128,3107633151,SI +3107633152,3107634175,FR +3107634176,3107635199,RU +3107635200,3107636223,IT +3107636224,3107637247,ES +3107637248,3107638271,LB +3107638272,3107639295,RU +3107639296,3107640319,ES +3107640320,3107641343,DK +3107641344,3107643391,RU +3107643392,3107644415,IT +3107644416,3107645439,FR +3107645440,3107646463,IE +3107646464,3107647487,NL +3107647488,3107648511,IR +3107648512,3107649535,TR +3107649536,3107651583,RU +3107651584,3107652607,CZ +3107652608,3107653631,PL +3107653632,3107654655,FR +3107654656,3107655679,DE +3107655680,3107656703,BE +3107656704,3107657727,IT +3107657728,3107658751,SI +3107658752,3107659775,TR +3107659776,3107660799,EE +3107660800,3107661823,NL +3107661824,3107662847,FR +3107662848,3107663871,TR +3107663872,3107664895,ES +3107664896,3107665919,CH +3107665920,3107666943,RU +3107666944,3107667967,GB +3107667968,3107668991,ES +3107668992,3107670015,AM +3107670016,3107671039,TR +3107671040,3107672063,NL +3107672064,3107673087,IT +3107673088,3107674111,AE +3107674112,3107675135,PL +3107675136,3107676159,GB +3107676160,3107678207,DE +3107678208,3107679231,DK +3107679232,3107680255,PL +3107680256,3107681279,IR +3107681280,3107682303,FI +3107682304,3107683327,CZ +3107683328,3107684351,GB +3107684352,3107685375,DE +3107685376,3107686399,IT +3107686400,3107688447,RU +3107688448,3107689471,CZ +3107689472,3107690495,GB +3107690496,3107691519,IT +3107691520,3107692543,UA +3107692544,3107693567,PL +3107693568,3107694591,IT +3107694592,3107695615,BE +3107695616,3107696639,RU +3107696640,3107698687,GB +3107698688,3107699711,SK +3107699712,3107700735,SA +3107700736,3107701759,RU +3107701760,3107702783,BE +3107702784,3107703807,DE +3107703808,3107704831,GB +3107704832,3107705855,CZ +3107705856,3107706879,NO +3107706880,3107707903,RU +3107707904,3107708927,GB +3107708928,3107709951,PL +3107709952,3107710975,DK +3107710976,3107711999,RU +3107712000,3107713023,NO +3107713024,3107714047,RO +3107714048,3107715071,RU +3107715072,3107716095,DE +3107716096,3107717119,LV +3107717120,3107718143,DE +3107718144,3107719167,GB +3107719168,3107720191,FR +3107720192,3107721215,RU +3107721216,3107723263,DE +3107723264,3107724287,FR +3107724288,3107725311,GB +3107725312,3107726335,IR +3107726336,3107727359,DE +3107727360,3107728383,ES +3107728384,3107730431,RU +3107730432,3107731455,CH +3107731456,3107732479,DE +3107732480,3107733503,NL +3107733504,3107734527,BG +3107734528,3107735551,HU +3107735552,3107737599,DE +3107737600,3107738623,NL +3107738624,3107739647,RO +3107739648,3107740671,IM +3107740672,3107741695,FR +3107741696,3107742719,DE +3107742720,3107743743,HU +3107743744,3107744767,CZ +3107744768,3107746815,FR +3107746816,3107747839,SI +3107747840,3107748863,GB +3107748864,3107749887,IE +3107749888,3107750911,SE +3107750912,3107751935,RU +3107751936,3107752959,IR +3107752960,3107753983,IT +3107753984,3107755007,CH +3107755008,3107756031,FR +3107756032,3107757055,RU +3107757056,3107758079,NL +3107758080,3107759103,DK +3107759104,3107760127,FR +3107760128,3107761151,IL +3107761152,3107762175,NO +3107762176,3107763199,FR +3107763200,3107764223,CH +3107764224,3107765247,PL +3107765248,3107767295,IT +3107767296,3107768319,DE +3107768320,3107769343,AE +3107769344,3107770367,DK +3107770368,3107771391,DE +3107771392,3107772415,RU +3107772416,3107773439,IE +3107773440,3107774463,GB +3107774464,3107775487,TR +3107775488,3107776511,PL +3107776512,3107777535,FR +3107777536,3107778559,CY +3107778560,3107779583,IT +3107779584,3107780607,PL +3107780608,3107781631,DE +3107781632,3107782655,NL +3107782656,3107783679,IE +3107783680,3107784703,PL +3107784704,3107785727,DE +3107785728,3107786751,IT +3107786752,3107787775,SK +3107787776,3107788799,PS +3107788800,3107789823,RU +3107789824,3107791871,DE +3107791872,3107792895,RU +3107792896,3107793919,AT +3107793920,3107794943,TR +3107794944,3107795967,LB +3107795968,3107796991,NL +3107796992,3107798015,RS +3107798016,3107799039,IE +3107799040,3107800063,LT +3107800064,3107801087,NL +3107801088,3107802111,BE +3107802112,3107803135,RU +3107803136,3107804159,ES +3107804160,3107805183,CZ +3107805184,3107806207,ES +3107806208,3107807231,RU +3107807232,3107808255,GB +3107808256,3107809279,DE +3107809280,3107810303,BY +3107810304,3107811327,SE +3107811328,3107812351,GB +3107812352,3107813375,FR +3107813376,3107814399,DE +3107814400,3107815423,ES +3107815424,3107816447,RU +3107816448,3107817471,GB +3107817472,3107818495,UA +3107818496,3107819519,GB +3107819520,3107820543,FR +3107820544,3107821055,LV +3107821056,3107821567,SE +3107821568,3107822591,GB +3107822592,3107823615,UA +3107823616,3107824639,FR +3107824640,3107825663,GB +3107825664,3107826687,IT +3107826688,3107827711,RU +3107827712,3107828735,FR +3107828736,3107829759,IT +3107829760,3107830783,FR +3107830784,3107831807,GB +3107831808,3107832831,RU +3107832832,3107833855,NL +3107833856,3107834879,PS +3107834880,3107835903,ES +3107835904,3107837951,GB +3107837952,3107839999,RU +3107840000,3107841023,NL +3107841024,3107842047,CZ +3107842048,3107843071,FI +3107843072,3107844095,SE +3107844096,3107845119,CY +3107845120,3107846143,PL +3107846144,3107847167,EU +3107847168,3107848191,RU +3107848192,3107849215,IT +3107849216,3107850239,BE +3107850240,3107851263,CZ +3107851264,3107853311,NL +3107853312,3107854335,ES +3107854336,3107855359,DE +3107855360,3107856383,IT +3107856384,3107857407,SM +3107857408,3107858431,MT +3107858432,3107859455,FR +3107859456,3107860479,GB +3107860480,3107862527,IT +3107862528,3107863551,NL +3107863552,3107864575,IS +3107864576,3107865599,DE +3107865600,3107866623,NL +3107866624,3107867647,HR +3107867648,3107868671,GB +3107868672,3107869695,CH +3107869696,3107870719,GB +3107870720,3107871743,CH +3107871744,3107872767,PL +3107872768,3107873791,LV +3107873792,3107874815,RU +3107874816,3107875839,CH +3107875840,3107876863,CZ +3107876864,3107877887,RS +3107877888,3107878911,NL +3107878912,3107879935,IL +3107879936,3107880959,DE +3107880960,3107881983,HU +3107881984,3107883007,RS +3107883008,3107884031,US +3107884032,3107885055,NO +3107885056,3107887103,DE +3107887104,3107888127,BG +3107888128,3107889151,GB +3107889152,3107890175,NO +3107890176,3107891199,IE +3107891200,3107892223,CH +3107892224,3107893247,AL +3107893248,3107894271,SA +3107894272,3107895295,PL +3107895296,3107896319,FR +3107896320,3107897343,NL +3107897344,3107898367,RU +3107898368,3107899391,LV +3107899392,3107900415,RU +3107900416,3107901439,SE +3107901440,3107902463,NL +3107902464,3107904511,GB +3107904512,3107907583,FR +3107907584,3107908607,IR +3107908608,3107909631,BG +3107909632,3107910655,IT +3107910656,3107911679,DE +3107911680,3107912703,IT +3107912704,3107913727,SE +3107913728,3107914751,AT +3107914752,3107915775,RO +3107915776,3107916799,DE +3107916800,3107917823,IT +3107917824,3107918847,HU +3107918848,3107919871,NL +3107919872,3107920895,CZ +3107920896,3107921919,ES +3107921920,3107922943,UA +3107922944,3107923967,CH +3107923968,3107924991,IT +3107924992,3107926015,HU +3107926016,3107927039,FR +3107927040,3107928063,IT +3107928064,3107929087,NL +3107929088,3107930111,RU +3107930112,3107931135,CH +3107931136,3107932159,NL +3107932160,3107934207,MT +3107934208,3107935231,GB +3107935232,3107936255,PL +3107936256,3107937279,IT +3107937280,3107938303,FR +3107938304,3107939327,CZ +3107939328,3107940351,IT +3107940352,3107941375,CZ +3107941376,3107942399,PL +3107942400,3107943423,RU +3107943424,3107944447,NL +3107944448,3107945471,FR +3107945472,3107947519,DE +3107947520,3107948543,IT +3107948544,3107949567,RO +3107949568,3107950591,GB +3107950592,3107951615,US +3107951616,3107952639,CH +3107952640,3107953663,NL +3107953664,3107954687,SK +3107954688,3107955711,IT +3107955712,3107956735,NL +3107956736,3107957759,IT +3107957760,3107958783,FR +3107958784,3107959807,AL +3107959808,3107960831,PT +3107960832,3107961855,IM +3107961856,3107962879,RU +3107962880,3107963903,FR +3107963904,3107964927,RU +3107964928,3107965951,ES +3107965952,3107966975,DE +3107966976,3107967999,NO +3107968000,3107969023,DE +3107969024,3107970047,RU +3107970048,3107971071,GB +3107971072,3107972095,UZ +3107972096,3107973119,IT +3107973120,3107974143,SA +3107974144,3107976191,IR +3107976192,3107977215,NL +3107977216,3107978239,AT +3107978240,3107979263,NL +3107979264,3107980287,ME +3107980288,3107981311,BE +3107981312,3107982335,IL +3107982336,3107983359,GB +3107983360,3107984383,IE +3107984384,3107985407,BG +3107985408,3107986431,OM +3107986432,3107987455,PL +3107987456,3107988479,NL +3107988480,3107989503,GB +3107989504,3107990527,CZ +3107990528,3107991551,RU +3107991552,3107992575,AT +3107992576,3107993599,RU +3107993600,3107994623,RO +3107994624,3107995647,AT +3107995648,3107996671,BE +3107996672,3107997695,IT +3107997696,3107998719,SE +3107998720,3107999743,AE +3107999744,3108000767,TR +3108000768,3108001791,MK +3108001792,3108002815,GB +3108002816,3108003839,RO +3108003840,3108004863,DE +3108004864,3108005887,RU +3108005888,3108006911,RO +3108006912,3108007935,NL +3108007936,3108008959,DE +3108008960,3108009983,CH +3108009984,3108011007,NL +3108011008,3108012031,DE +3108012032,3108013055,FR +3108013056,3108014079,HR +3108014080,3108015103,NL +3108015104,3108016127,IE +3108016128,3108017151,DE +3108017152,3108018175,FR +3108018176,3108019199,AT +3108019200,3108020223,DE +3108020224,3108021247,US +3108021248,3108022271,AT +3108022272,3108023295,DE +3108023296,3108024319,RS +3108024320,3108025343,IR +3108025344,3108026367,BE +3108026368,3108027391,CH +3108027392,3108028415,GB +3108028416,3108029439,NL +3108029440,3108030463,CH +3108030464,3108031487,KW +3108031488,3108032511,IT +3108032512,3108033535,RU +3108033536,3108034559,GB +3108034560,3108036607,CZ +3108036608,3108037631,GB +3108037632,3108038655,RU +3108038656,3108039679,ES +3108039680,3108040703,MD +3108040704,3108041727,ES +3108041728,3108042751,DE +3108042752,3108044799,GB +3108044800,3108045823,LU +3108045824,3108046847,DE +3108046848,3108047871,HU +3108047872,3108048895,RU +3108048896,3108049919,UA +3108049920,3108050943,RU +3108050944,3108051967,GB +3108051968,3108052991,FR +3108052992,3108054015,IR +3108054016,3108055039,LV +3108055040,3108056063,GB +3108056064,3108057087,IT +3108057088,3108058111,LT +3108058112,3108059135,NL +3108059136,3108060159,FR +3108060160,3108061183,CH +3108061184,3108062207,ES +3108062208,3108063231,TR +3108063232,3108064255,BE +3108064256,3108065279,CZ +3108065280,3108066303,FR +3108066304,3108067327,GB +3108067328,3108068351,AT +3108068352,3108069375,CZ +3108069376,3108070399,FR +3108070400,3108073471,GB +3108073472,3108074495,FR +3108074496,3108075519,DK +3108075520,3108076543,BA +3108076544,3108077567,NL +3108077568,3108078591,GB +3108078592,3108079615,SE +3108079616,3108080639,MD +3108080640,3108081663,SE +3108081664,3108082687,GB +3108082688,3108083711,RU +3108083712,3108084735,NO +3108084736,3108085759,ES +3108085760,3108086783,LV +3108086784,3108087807,GB +3108087808,3108088831,CH +3108088832,3108089855,NL +3108089856,3108090879,SE +3108090880,3108091903,BE +3108091904,3108092927,ES +3108092928,3108093951,SE +3108093952,3108095999,DE +3108096000,3108097023,RU +3108097024,3108098047,TR +3108098048,3108099071,DE +3108099072,3108100095,NL +3108100096,3108101119,IT +3108101120,3108102143,SK +3108102144,3108103167,FR +3108103168,3108104191,SI +3108104192,3108105215,AT +3108105216,3108106239,GB +3108106240,3108107263,DE +3108107264,3108108287,UA +3108108288,3108109311,FR +3108109312,3108110335,IQ +3108110336,3108111359,DK +3108111360,3108112383,GB +3108112384,3108113407,UA +3108113408,3108114431,RU +3108114432,3108115455,AE +3108115456,3108116479,GB 3120562176,3120594943,CO 3120594944,3120599039,AR 3120599040,3120601087,EC @@ -51237,13 +54886,12 @@ 3120691200,3120693247,CO 3120693248,3120726015,BO 3120726016,3120734207,HN -3120734208,3120735231,RU -3120735232,3120738303,BZ +3120734208,3120735743,RU +3120735744,3120738303,BZ 3120738304,3120742399,CW 3120742400,3120754687,PY 3120754688,3120755711,CR 3120755712,3120756735,GY -3120756736,3120757503,PA 3120757504,3120757759,BZ 3120757760,3120758783,CL 3120758784,3120824319,EC @@ -51333,7 +54981,9 @@ 3124846592,3124848639,AR 3124848640,3124849663,PA 3124849664,3124850687,AR -3124850688,3124854783,HN +3124850688,3124853887,HN +3124853888,3124853903,FR +3124853904,3124854783,HN 3124854784,3124887551,CL 3124887552,3124953087,EC 3124953088,3125018623,CL @@ -51422,8 +55072,15 @@ 3133074432,3133075455,CL 3133075456,3133079551,CW 3133079552,3133145087,AR -3133145088,3145727999,BR -3145728000,3154116607,MX +3133145088,3136985343,BR +3136985344,3136986111,AR +3136986112,3145727999,BR +3145728000,3149135871,MX +3149135872,3149398015,BR +3149398016,3149881343,MX +3149881344,3149889535,BR +3149889536,3154051071,MX +3154051072,3154116607,BR 3154116608,3154124799,RU 3154124800,3154126847,PL 3154126848,3154128895,RU @@ -51549,20 +55206,35 @@ 3158822912,3158835199,KW 3158835200,3158851583,IQ 3158851584,3158859775,RU -3158859776,3158864383,NL -3158864384,3158864639,RU -3158864640,3158867967,NL +3158859776,3158861567,NL +3158861568,3158861823,AE +3158861824,3158862079,IN +3158862080,3158862335,GB +3158862336,3158862591,NL +3158862592,3158862847,FR +3158862848,3158863103,PL +3158863104,3158863359,IT +3158863360,3158863615,MD +3158863616,3158863871,EE +3158863872,3158864127,SK +3158864128,3158864383,ES +3158864384,3158864639,AT +3158864640,3158864895,RO +3158864896,3158865151,LT +3158865152,3158865407,NL +3158865408,3158865663,AL +3158865664,3158865919,CY +3158865920,3158866943,IT +3158866944,3158867455,NL +3158867456,3158867711,DE +3158867712,3158867967,NL 3158867968,3158884351,AZ 3158884352,3158884863,DE 3158884864,3158885119,GB 3158885120,3158885887,TR -3158885888,3158891551,DE -3158891552,3158891583,GB -3158891584,3158891775,DE +3158885888,3158891775,DE 3158891776,3158892031,PL -3158892032,3158892415,DE -3158892416,3158892543,GB -3158892544,3158893567,DE +3158892032,3158893567,DE 3158893568,3158893823,GB 3158893824,3158897727,DE 3158897728,3158897791,RU @@ -51765,9 +55437,7 @@ 3161784320,3161800703,FI 3161800704,3161817087,SA 3161817088,3161833471,PL -3161833472,3161840639,AT -3161840640,3161840895,MK -3161840896,3161846015,AT +3161833472,3161846015,AT 3161846016,3161847039,MK 3161847040,3161849855,AT 3161849856,3161866239,BE @@ -51867,7 +55537,10 @@ 3162636288,3162669055,FR 3162669056,3162681343,RU 3162681344,3162682367,UA -3162682368,3162685439,RU +3162682368,3162682879,RU +3162682880,3162683135,CZ +3162683136,3162683391,ES +3162683392,3162685439,RU 3162685440,3162693631,UA 3162693632,3162701823,RU 3162701824,3162734591,MD @@ -51883,9 +55556,7 @@ 3163062272,3163095039,IR 3163095040,3163127807,PL 3163127808,3163160575,BH -3163160576,3163161816,DE -3163161817,3163161817,EG -3163161818,3163164927,DE +3163160576,3163164927,DE 3163164928,3163165183,FR 3163165184,3163166975,DE 3163166976,3163167231,FR @@ -51895,9 +55566,7 @@ 3163186535,3163186535,FR 3163186536,3163186673,DE 3163186674,3163186674,FR -3163186675,3163192621,DE -3163192622,3163192622,EG -3163192623,3163193343,DE +3163186675,3163193343,DE 3163193344,3163226111,MD 3163226112,3163258879,SA 3163258880,3163291647,SY @@ -51941,9 +55610,13 @@ 3164936192,3164937749,LT 3164937750,3164937750,FR 3164937751,3164938239,LT -3164938240,3164949135,FR +3164938240,3164947579,FR +3164947580,3164947583,IT +3164947584,3164949135,FR 3164949136,3164949151,NL -3164949152,3164951663,FR +3164949152,3164950695,FR +3164950696,3164950703,NL +3164950704,3164951663,FR 3164951664,3164951671,PL 3164951672,3164952224,FR 3164952225,3164952231,GB @@ -51953,30 +55626,46 @@ 3164952237,3164952237,GB 3164952238,3164953255,FR 3164953256,3164953263,CZ -3164953264,3164953583,FR +3164953264,3164953391,FR +3164953392,3164953399,NL +3164953400,3164953583,FR 3164953584,3164953599,ES -3164953600,3164960439,FR +3164953600,3164954511,FR +3164954512,3164954515,IT +3164954516,3164960439,FR 3164960440,3164960443,DE -3164960444,3164961391,FR +3164960444,3164960715,FR +3164960716,3164960719,NL +3164960720,3164960843,FR +3164960844,3164960847,NL +3164960848,3164961391,FR 3164961392,3164961395,ES 3164961396,3164961511,FR 3164961512,3164961519,GB 3164961520,3164961551,FR 3164961552,3164961555,ES -3164961556,3164962815,FR +3164961556,3164962471,FR +3164962472,3164962475,ES +3164962476,3164962815,FR 3164962816,3164964863,ES 3164964864,3164966911,FI 3164966912,3164968319,FR 3164968320,3164968447,GB -3164968448,3164968835,FR +3164968448,3164968455,FR +3164968456,3164968459,NL +3164968460,3164968835,FR 3164968836,3164968839,ES 3164968840,3164969019,FR 3164969020,3164969023,BE -3164969024,3164970413,FR +3164969024,3164969039,FR +3164969040,3164969047,NL +3164969048,3164970413,FR 3164970414,3164970415,IT 3164970416,3164970923,FR 3164970924,3164970927,LT -3164970928,3164973419,FR +3164970928,3164971791,FR +3164971792,3164971799,IT +3164971800,3164973419,FR 3164973420,3164973423,ES 3164973424,3164973663,FR 3164973664,3164973695,GB @@ -51995,12 +55684,17 @@ 3165192192,3165257727,GE 3165257728,3165323263,RO 3165323264,3165388799,ES -3165388800,3165437951,RO +3165388800,3165417471,RO +3165417472,3165421567,DE +3165421568,3165425663,IE +3165425664,3165437951,RO 3165437952,3165454335,AT 3165454336,3165519871,RO 3165519872,3165585407,DE 3165585408,3165650943,CZ -3165650944,3166175231,DK +3165650944,3165938259,DK +3165938260,3165938263,US +3165938264,3166175231,DK 3166175232,3166306303,CH 3166306304,3166437375,RU 3166437376,3166568447,BE @@ -52033,25 +55727,33 @@ 3166699520,3166961663,DE 3166961664,3167223807,SI 3167223808,3167748095,NL -3167748096,3167772671,RO +3167748096,3167762431,RO +3167762432,3167764479,MD +3167764480,3167772671,RO 3167772672,3167773695,MD 3167773696,3167774719,RO 3167774720,3167775743,MD -3167775744,3167776767,RO +3167775744,3167776511,RO +3167776512,3167776767,GB 3167776768,3167777791,MD 3167777792,3167778815,RO 3167778816,3167780863,MD 3167780864,3167797247,RO 3167797248,3167798271,MD 3167798272,3167799295,RO -3167799296,3167801343,MD -3167801344,3167868927,RO +3167799296,3167803391,MD +3167803392,3167813631,RO +3167813632,3167815679,MD +3167815680,3167868927,RO 3167868928,3167879167,MD -3167879168,3167938559,RO +3167879168,3167895551,DE +3167895552,3167938559,RO 3167938560,3167939583,MD 3167939584,3167940607,RO 3167940608,3167943679,MD -3167943680,3167987711,RO +3167943680,3167944447,RO +3167944448,3167944703,GB +3167944704,3167987711,RO 3167987712,3167989759,MD 3167989760,3168005887,RO 3168005888,3168006143,NL @@ -52063,13 +55765,19 @@ 3168016384,3168018431,MD 3168018432,3168020479,RO 3168020480,3168022527,MD -3168022528,3168050431,RO +3168022528,3168039935,RO +3168039936,3168040959,BE +3168040960,3168050431,RO 3168050432,3168050687,MD -3168050688,3168084991,RO +3168050688,3168081919,RO +3168081920,3168083967,FR +3168083968,3168084991,RO 3168084992,3168086015,MD -3168086016,3168089087,RO +3168086016,3168088063,IT +3168088064,3168089087,RO 3168089088,3168090111,MD -3168090112,3168096255,RO +3168090112,3168092159,ES +3168092160,3168096255,RO 3168096256,3168100351,MD 3168100352,3168129023,RO 3168129024,3168130047,MD @@ -52081,15 +55789,23 @@ 3168138240,3168139263,MD 3168139264,3168156671,RO 3168156672,3168157695,MD -3168157696,3168176127,RO +3168157696,3168165887,RO +3168165888,3168166911,MD +3168166912,3168169983,RO +3168169984,3168172031,ES +3168172032,3168176127,RO 3168176128,3168177151,MD 3168177152,3168178175,RO 3168178176,3168179199,MD -3168179200,3168192511,RO +3168179200,3168191999,RO +3168192000,3168192255,GB +3168192256,3168192511,RO 3168192512,3168194559,MD 3168194560,3168199679,RO 3168199680,3168200703,MD -3168200704,3168267263,RO +3168200704,3168202751,RO +3168202752,3168203775,ES +3168203776,3168267263,RO 3168267264,3168269311,MD 3168269312,3168271359,RO 3168271360,3168272383,MD @@ -52104,7 +55820,6 @@ 3168993280,3169026047,RU 3169026048,3169034239,CZ 3169034240,3169042431,GB -3169042432,3169044479,GR 3169044480,3169046527,NL 3169046528,3169050623,AZ 3169050624,3169052671,HU @@ -52122,15 +55837,17 @@ 3169255424,3169264127,KW 3169264128,3169264383,US 3169264384,3169279999,KW -3169280000,3169282047,GB -3169282048,3169288191,KW +3169280000,3169285119,GB +3169285120,3169288191,KW 3169288192,3169320959,UA 3169320960,3169583103,RU 3169583104,3169648639,KW 3169648640,3169714175,MD 3169714176,3169779711,FI 3169779712,3169845247,UA -3169845248,3169854463,RO +3169845248,3169851391,RO +3169851392,3169853439,MD +3169853440,3169854463,RO 3169854464,3169855487,IR 3169855488,3169863167,RO 3169863168,3169863423,MD @@ -52181,7 +55898,11 @@ 3170828288,3170861055,RU 3170861056,3170893823,RS 3170893824,3179282431,BR -3179282432,3187671039,MX +3179282432,3184116735,MX +3184116736,3184123903,BR +3184123904,3184125951,MX +3184125952,3184127999,BR +3184128000,3187671039,MX 3187671040,3187687423,CO 3187687424,3187695615,DO 3187695616,3187703807,AR @@ -52199,6 +55920,7 @@ 3187761152,3187769343,AR 3187769344,3187802111,CO 3187802112,3187818495,AR +3187820544,3187822591,BR 3187822592,3187824639,AR 3187824640,3187826687,CL 3187826688,3187834879,AR @@ -52254,6 +55976,7 @@ 3188006912,3188015103,CL 3188015104,3188031487,HN 3188031488,3188039679,SV +3188039680,3188047871,AR 3188047872,3188051967,CO 3188051968,3188054015,CR 3188054016,3188056063,AR @@ -52267,7 +55990,9 @@ 3188113408,3188117503,HN 3188117504,3188121599,AR 3188121600,3188125695,TT -3188125696,3188146175,AR +3188125696,3188137175,AR +3188137176,3188137183,DE +3188137184,3188146175,AR 3188146176,3188170751,CO 3188170752,3188174847,CR 3188174848,3188178943,AR @@ -52289,7 +56014,8 @@ 3188269184,3188269311,MX 3188269312,3188269439,VE 3188269440,3188269567,CO -3188269568,3188270079,VE +3188269568,3188269823,MX +3188269824,3188270079,VE 3188270080,3188270335,MX 3188270336,3188270847,VE 3188270848,3188271103,BR @@ -52339,8 +56065,10 @@ 3188628480,3188637695,AR 3188637696,3188645887,PA 3188645888,3188662271,CO +3188662272,3188670463,BR 3188670464,3188674559,HN 3188674560,3188678655,AR +3188678656,3188682751,BR 3188682752,3188686847,AR 3188686848,3188690943,EC 3188690944,3188695039,CU @@ -52361,6 +56089,7 @@ 3191093248,3191095295,AR 3191095296,3191099391,EC 3191099392,3191103487,AR +3191103488,3191107583,VE 3191107584,3191108607,PE 3191108608,3191108639,MX 3191108640,3191108959,PE @@ -52393,7 +56122,14 @@ 3191610624,3191610879,PE 3191610880,3191611391,CO 3191611392,3191619583,VE -3191619584,3191647743,CO +3191619584,3191624703,CL +3191624704,3191624959,CO +3191624960,3191626239,CL +3191626240,3191626495,CO +3191626496,3191633663,CL +3191633664,3191633919,CO +3191633920,3191635967,CL +3191635968,3191647743,CO 3191647744,3191647807,AR 3191647808,3191648255,CO 3191648256,3191649791,US @@ -52403,7 +56139,9 @@ 3191651072,3191651839,US 3191651840,3191670015,CO 3191670016,3191670271,AR -3191670272,3191674879,CO +3191670272,3191670783,CO +3191670784,3191672831,CL +3191672832,3191674879,CO 3191674880,3191676927,CL 3191676928,3191677951,US 3191677952,3191678207,AR @@ -52412,7 +56150,9 @@ 3191678976,3191680255,US 3191680256,3191680511,AR 3191680512,3191680767,US -3191680768,3191683327,AR +3191680768,3191681279,AR +3191681280,3191681535,US +3191681536,3191683327,AR 3191683328,3191684607,US 3191684608,3191684863,AR 3191684864,3191685119,US @@ -52425,7 +56165,7 @@ 3191695872,3191696127,US 3191696128,3191696383,CO 3191696384,3191701503,US -3191701504,3191702527,CO +3191701504,3191702527,CL 3191702528,3191703039,US 3191703040,3191704063,CO 3191704064,3191704575,US @@ -52475,7 +56215,9 @@ 3193579264,3193579519,EC 3193579520,3193582591,CO 3193582592,3193583103,EC -3193583104,3193599999,CO +3193583104,3193595391,CO +3193595392,3193595647,EC +3193595648,3193599999,CO 3193600000,3193600255,EC 3193600256,3193605375,CO 3193605376,3193605631,EC @@ -52515,8 +56257,8 @@ 3193741824,3193742079,AR 3193742080,3193742335,US 3193742336,3193742591,AR -3193742592,3193742719,US -3193742720,3193743231,AR +3193742592,3193742847,US +3193742848,3193743231,AR 3193743232,3193743359,US 3193743360,3193743743,AR 3193743744,3193743871,US @@ -52569,7 +56311,9 @@ 3193810944,3193815039,PY 3193815040,3193823231,AR 3193823232,3193827327,CL -3193827328,3193831423,CR +3193827328,3193828351,CR +3193828352,3193828863,US +3193828864,3193831423,CR 3193831424,3193864191,DO 3193864192,3193872383,EC 3193872384,3193880575,AR @@ -52635,6 +56379,7 @@ 3194445824,3194454015,CO 3194454016,3194458111,AR 3194458112,3194462207,CL +3194462208,3194466303,BR 3194466304,3194467327,AR 3194467328,3194468351,DO 3194468352,3194469375,US @@ -52702,6 +56447,7 @@ 3194728448,3194729471,CL 3194729472,3194730495,PE 3194730496,3194732543,AR +3194732544,3194736639,BR 3194736640,3194737663,NI 3194737664,3194740735,AR 3194740736,3194742783,CL @@ -52714,12 +56460,15 @@ 3194767360,3194768383,CR 3194768384,3194769407,AR 3194769408,3194773503,PE +3194773504,3194781695,BR 3194781696,3194798079,CL 3194798080,3194799103,AR 3194799104,3194804223,GY 3194804224,3194805247,AR 3194805248,3194806271,CR -3194806272,3194830847,AR +3194806272,3194814463,AR +3194814464,3194818559,PA +3194818560,3194830847,AR 3194830848,3194839039,PA 3194839040,3194863615,CO 3194863616,3194871807,HN @@ -52751,8 +56500,7 @@ 3194984960,3194985471,PA 3194985472,3194985599,US 3194985600,3194994687,PA -3194994688,3195011071,AR -3195019264,3195023359,AR +3194994688,3195023359,AR 3195023360,3195024383,CL 3195024384,3195025407,UY 3195025408,3195043839,AR @@ -52763,6 +56511,8 @@ 3195062272,3195062783,US 3195062784,3195063039,UY 3195063040,3195063295,US +3195063296,3195064319,BR +3195064320,3195066367,PY 3195066368,3195067391,AR 3195067392,3195068415,CR 3195068416,3195076607,CW @@ -52868,6 +56618,7 @@ 3195830272,3195838463,AR 3195838464,3195840511,HN 3195840512,3195842559,AR +3195842560,3195846655,BR 3195846656,3195852799,AR 3195852800,3195853823,CW 3195853824,3195854847,GY @@ -52914,7 +56665,11 @@ 3198926848,3198943231,BO 3198943232,3199467519,AR 3199467520,3199500287,BO +3199500288,3199504383,BR 3199504384,3199505407,AR +3199505408,3199506431,BR +3199506432,3199508479,AR +3199508480,3199516671,BR 3199516672,3199533055,CL 3199533056,3199549439,BO 3199549440,3199565823,AR @@ -52977,7 +56732,7 @@ 3201855488,3201859583,PE 3201859584,3201863679,CO 3201863680,3201865727,CL -3201865728,3201867775,AR +3201865728,3201867775,CO 3201867776,3201869823,PE 3201869824,3201869855,AR 3201869856,3201869871,PE @@ -53020,13 +56775,17 @@ 3203545088,3203545599,GT 3203545600,3203547135,CO 3203547136,3203549183,PA -3203549184,3203561471,CO +3203549184,3203556863,CO +3203556864,3203557119,DO +3203557120,3203561471,CO 3203561472,3203562495,SV 3203562496,3203564031,CO 3203564032,3203564287,PA 3203564288,3203566591,CO 3203566592,3203566847,PA -3203566848,3203661823,CO +3203566848,3203568639,CO +3203568640,3203569663,SV +3203569664,3203661823,CO 3203661824,3203923967,AR 3203923968,3204448255,CO 3204448256,3208642559,BR @@ -53037,9 +56796,88 @@ 3210739712,3210739967,CL 3210739968,3210740223,MX 3210740224,3210740479,AR -3210740480,3210740735,CL -3210740736,3210740991,BR -3210740992,3210805247,CL +3210740480,3210740735,US +3210740736,3210742015,BR +3210742016,3210742031,IT +3210742032,3210742047,US +3210742048,3210742271,BR +3210742272,3210742527,CL +3210742528,3210742543,KR +3210742544,3210743039,CL +3210743040,3210743055,GR +3210743056,3210743295,CL +3210743296,3210743551,US +3210743552,3210743567,TH +3210743568,3210743583,US +3210743584,3210744063,CL +3210744064,3210744079,TR +3210744080,3210744575,CL +3210744576,3210744591,BE +3210744592,3210745343,CL +3210745344,3210745359,RU +3210745360,3210745375,US +3210745376,3210745855,CL +3210745856,3210745871,IT +3210745872,3210746367,CL +3210746368,3210746383,SE +3210746384,3210746879,CL +3210746880,3210746895,CH +3210746896,3210747647,CL +3210747648,3210747903,US +3210747904,3210748159,BR +3210748160,3210748175,JP +3210748176,3210748415,BR +3210748416,3210751999,CL +3210752000,3210752255,US +3210752256,3210755839,CL +3210755840,3210755855,MY +3210755856,3210755871,US +3210755872,3210757119,CL +3210757120,3210757375,US +3210757376,3210763519,CL +3210763520,3210763775,US +3210763776,3210764031,CL +3210764032,3210764047,IE +3210764048,3210764063,US +3210764064,3210765055,CL +3210765056,3210765071,SE +3210765072,3210769919,CL +3210769920,3210770175,US +3210770176,3210771199,CL +3210771200,3210771215,TH +3210771216,3210772991,CL +3210772992,3210773247,US +3210773248,3210773503,CL +3210773504,3210773519,PL +3210773520,3210774271,CL +3210774272,3210774287,NO +3210774288,3210774783,CL +3210774784,3210774799,IT +3210774800,3210775295,CL +3210775296,3210775311,CH +3210775312,3210776319,CL +3210776320,3210776575,US +3210776576,3210776831,CL +3210776832,3210777087,US +3210777088,3210778367,CL +3210778368,3210778623,US +3210778624,3210782975,CL +3210782976,3210782991,TR +3210782992,3210783487,CL +3210783488,3210783503,JP +3210783504,3210783999,CL +3210784000,3210784015,JP +3210784016,3210784511,CL +3210784512,3210784527,BE +3210784528,3210786047,CL +3210786048,3210786063,AU +3210786064,3210786559,CL +3210786560,3210786575,GR +3210786576,3210803071,CL +3210803072,3210803087,US +3210803088,3210803327,CL +3210803328,3210803455,BR +3210803456,3210805247,CL 3210805248,3210809343,PA 3210809344,3210810367,VE 3210810368,3210811391,PA @@ -53064,8 +56902,78 @@ 3210926080,3210928127,AR 3210928128,3210936319,NI 3210936320,3211067391,EC -3211067392,3211069439,US -3211069440,3211132927,CL +3211067392,3211073023,US +3211073024,3211073279,CA +3211073280,3211073535,US +3211073536,3211075583,CL +3211075584,3211075839,US +3211075840,3211080703,CL +3211080704,3211080959,NL +3211080960,3211081215,CL +3211081216,3211081727,CH +3211081728,3211083775,CL +3211083776,3211083791,RU +3211083792,3211084287,CL +3211084288,3211084303,NL +3211084304,3211084671,CL +3211084672,3211084799,BY +3211084800,3211084815,AT +3211084816,3211085311,CL +3211085312,3211085327,GB +3211085328,3211085695,CL +3211085696,3211085823,GE +3211085824,3211085839,TH +3211085840,3211086095,CL +3211086096,3211086111,US +3211086112,3211086335,CL +3211086336,3211086351,FR +3211086352,3211086847,CL +3211086848,3211086863,PL +3211086864,3211087359,CL +3211087360,3211087375,GB +3211087376,3211087871,CL +3211087872,3211087887,ES +3211087888,3211088383,CL +3211088384,3211088399,BE +3211088400,3211088895,CL +3211088896,3211088911,DK +3211088912,3211089407,CL +3211089408,3211089423,GB +3211089424,3211089919,CL +3211089920,3211089935,GB +3211089936,3211090431,CL +3211090432,3211090447,GR +3211090448,3211090943,CL +3211090944,3211090959,TR +3211090960,3211091455,CL +3211091456,3211091471,FI +3211091472,3211091967,CL +3211091968,3211091983,RU +3211091984,3211092479,CL +3211092480,3211092495,BE +3211092496,3211092991,CL +3211092992,3211093007,SK +3211093008,3211093503,CL +3211093504,3211093519,HR +3211093520,3211094015,CL +3211094016,3211094031,CZ +3211094032,3211094527,CL +3211094528,3211094543,HR +3211094544,3211095039,CL +3211095040,3211095055,ES +3211095056,3211095551,CL +3211095552,3211095567,GB +3211095568,3211096063,CL +3211096064,3211096079,GB +3211096080,3211096575,CL +3211096576,3211096831,GB +3211096832,3211097087,CL +3211097088,3211097103,DE +3211097104,3211099647,CL +3211099648,3211099663,DE +3211099664,3211129599,CL +3211129600,3211129855,BR +3211129856,3211132927,CL 3211132928,3211137023,CO 3211137024,3211141119,AR 3211141120,3211142143,CL @@ -53087,16 +56995,108 @@ 3212574720,3212836863,CL 3212836864,3213885439,BR 3213885440,3214934015,CO -3214934016,3219796375,BR -3219796376,3219796376,US -3219796377,3221225471,BR +3214934016,3219652607,BR +3219652608,3219653119,US +3219653120,3219653127,BR +3219653128,3219653135,US +3219653136,3219653183,AU +3219653184,3219653247,BR +3219653248,3219653663,HK +3219653664,3219653695,SG +3219653696,3219653711,AU +3219653712,3219653727,US +3219653728,3219653823,JP +3219653824,3219653887,BR +3219653888,3219654399,US +3219654400,3219654463,CH +3219654464,3219654527,SE +3219654528,3219657727,US +3219657728,3219657983,SG +3219657984,3219658239,HK +3219658240,3219658495,FI +3219658496,3219658751,SE +3219658752,3219673183,US +3219673184,3219673343,BR +3219673344,3219673599,US +3219673600,3219685375,BR +3219685376,3219726335,US +3219726336,3219734527,JP +3219734528,3219750911,NL +3219750912,3219783679,US +3219783680,3219783743,AU +3219783744,3219783751,HK +3219783752,3219783807,BR +3219783808,3219783871,AU +3219783872,3219783935,BR +3219783936,3219784191,US +3219784192,3219784703,HK +3219784704,3219787775,US +3219787776,3219791871,HK +3219791872,3219800319,US +3219800320,3219800575,NL +3219800576,3219800591,US +3219800592,3219800703,BR +3219800704,3219800847,US +3219800848,3219800863,BR +3219800864,3219800895,US +3219800896,3219802111,BR +3219802112,3219802623,US +3219802624,3219803135,NL +3219803136,3219808255,US +3219808256,3219816447,BR +3219816448,3219818495,US +3219818496,3219819007,BR +3219819008,3219819519,JP +3219819520,3219820543,HK +3219820544,3219841023,US +3219841024,3219842047,NL +3219842048,3219842815,US +3219842816,3219843071,JP +3219843072,3219844351,US +3219844352,3219845119,BR +3219845120,3219847167,US +3219847168,3219848191,BR +3219848192,3219848447,AU +3219848448,3219849215,BR +3219849216,3219853311,US +3219853312,3219865599,BR +3219865600,3219881983,US +3219881984,3219914751,IE +3219914752,3220039679,US +3220039680,3220040703,NL +3220040704,3220041215,JP +3220041216,3220041471,HK +3220041472,3220041727,BR +3220041728,3220042239,JP +3220042240,3220042751,BR +3220042752,3220043775,US +3220043776,3220045823,BR +3220045824,3220062207,US +3220062208,3220062719,SG +3220062720,3220063231,AU +3220063232,3220063743,JP +3220063744,3220066303,US +3220066304,3220070399,JP +3220070400,3220078591,IE +3220078592,3220127743,US +3220127744,3220135935,AU +3220135936,3220152319,JP +3220152320,3220161535,AU +3220161536,3220161807,US +3220161808,3220162559,BR +3220162560,3220163583,NL +3220163584,3220164607,BR +3220164608,3220168703,IE +3220168704,3220172799,US +3220172800,3221225471,BR 3221225480,3221225727,GB -3221225728,3221225983,US 3221226240,3221226495,US 3221226496,3221227519,KY 3221227520,3221242879,US 3221242880,3221243391,GB -3221243392,3221258239,US +3221243392,3221243647,US +3221243648,3221243903,SG +3221243904,3221258239,US 3221258240,3221291007,CA 3221291008,3221334269,US 3221334270,3221334270,DZ @@ -53143,7 +57143,9 @@ 3221656832,3221657087,AU 3221657088,3221664255,US 3221664256,3221664511,EU -3221664512,3221801983,US +3221664512,3221795583,US +3221795584,3221795839,IN +3221795840,3221801983,US 3221801984,3221802239,IN 3221802240,3221803775,US 3221803776,3221804031,IN @@ -53251,11 +57253,9 @@ 3222953216,3222953727,AU 3222953728,3222953983,US 3222953984,3222954239,AU -3222954240,3222954495,US -3222955008,3222956287,US +3222954240,3222956287,US 3222956288,3222962431,FI -3222962432,3222962687,US -3222963200,3222963455,US +3222962432,3222963455,US 3222963456,3222964223,FI 3222964224,3222968831,US 3222968832,3222973951,NL @@ -53278,26 +57278,23 @@ 3223077376,3223201791,US 3223201792,3223202815,PR 3223202816,3223214079,US +3223214080,3223214591,CA 3223214592,3223215103,US 3223215104,3223215359,AU 3223215360,3223216383,US -3223216384,3223216639,CA -3223217152,3223217663,US -3223218176,3223222271,US -3223222784,3223223295,US +3223216384,3223217151,CA +3223217152,3223223295,US 3223223296,3223223551,AI -3223223552,3223223807,US -3223224320,3223227391,US +3223223552,3223227903,US 3223227904,3223228159,CA 3223228160,3223228415,US 3223228928,3223229695,US 3223229696,3223229951,CA -3223230464,3223236607,US +3223229952,3223236607,US 3223236608,3223237631,GB 3223237632,3223243263,US 3223243264,3223243519,CA -3223243520,3223243775,US -3223244288,3223248895,US +3223243520,3223249407,US 3223249408,3223249663,CA 3223249664,3223250943,US 3223250944,3223252991,CA @@ -53317,25 +57314,23 @@ 3223266560,3223266815,AU 3223266816,3223267327,US 3223267328,3223267583,BE -3223267584,3223269887,US +3223267584,3223270399,US 3223270400,3223271423,CA -3223271424,3223272447,US +3223271424,3223272959,US 3223272960,3223273215,GB 3223273216,3223283199,US 3223283200,3223283455,NL 3223283456,3223286783,US 3223286784,3223289087,JP -3223289088,3223289343,US -3223289856,3223299583,US +3223289088,3223299583,US 3223299584,3223301119,NL 3223301120,3223302399,US 3223302400,3223302655,CA +3223302656,3223303167,US 3223303168,3223303423,CA -3223303424,3223303679,US -3223304192,3223307519,US +3223303424,3223307519,US 3223307520,3223310079,JP -3223310080,3223310335,US -3223310848,3223311103,US +3223310080,3223311103,US 3223311104,3223311359,NL 3223311360,3223315455,US 3223315456,3223315711,CA @@ -53346,12 +57341,10 @@ 3223321600,3223321855,FR 3223321856,3223390719,US 3223390720,3223390975,MU -3223391232,3223391999,US +3223390976,3223391999,US 3223392000,3223392255,NL 3223392256,3223392511,GB -3223392512,3223392767,US -3223393024,3223393791,US -3223394304,3223397375,US +3223392512,3223397375,US 3223397376,3223397631,NL 3223397632,3223410431,US 3223410432,3223416831,CH @@ -53361,11 +57354,15 @@ 3223418368,3223420927,CH 3223420928,3223421439,US 3223421440,3223421951,NL -3223422464,3223422719,US -3223422720,3223422975,AU +3223421952,3223422719,US +3223422720,3223422975,JP 3223422976,3223424767,US 3223424768,3223425023,NL -3223425024,3223432191,FR +3223425024,3223425535,FR +3223425536,3223425791,US +3223425792,3223430911,FR +3223430912,3223431423,US +3223431424,3223432191,FR 3223432192,3223433215,A2 3223433216,3223435007,FR 3223435008,3223437311,US @@ -53374,31 +57371,39 @@ 3223447808,3223448063,NL 3223448064,3223449087,US 3223449088,3223449343,NL -3223449344,3223452671,US -3223452928,3223453183,US +3223449344,3223453183,US 3223453184,3223453439,NL -3223453696,3223457791,US +3223453440,3223458559,US 3223458560,3223458815,NL -3223458816,3223461887,US -3223462656,3223462911,US +3223458816,3223460351,US +3223460352,3223460863,CA +3223460864,3223462911,US 3223462912,3223463935,CA -3223463936,3223465983,US +3223463936,3223466495,US 3223466496,3223466751,NL +3223466752,3223467007,US 3223467008,3223468031,CA -3223468032,3223471103,US +3223468032,3223471615,US 3223471616,3223471871,CA -3223471872,3223472383,US -3223473152,3223474175,CA -3223474176,3223476223,US -3223476736,3223476991,US +3223471872,3223473151,US +3223473152,3223473215,CA +3223473216,3223473231,US +3223473232,3223474175,CA +3223474176,3223477247,US 3223477248,3223478271,CA 3223478272,3223480319,US +3223480832,3223481087,US 3223481088,3223481343,SE 3223481344,3223483391,US 3223483392,3223483647,NL +3223483648,3223483903,US 3223484416,3223498751,US +3223499264,3223499519,US 3223499520,3223499775,FI -3223499776,3223504895,CA +3223499776,3223500031,US +3223500032,3223503871,CA +3223504384,3223504639,US +3223504640,3223504895,CA 3223504896,3223508991,US 3223508992,3223513087,CA 3223513088,3223519231,US @@ -53407,8 +57412,7 @@ 3223528234,3223528234,GB 3223528235,3223534335,US 3223534336,3223534591,AU -3223534592,3223534847,US -3223535104,3223535359,US +3223534592,3223535359,US 3223535360,3223537919,DE 3223537920,3223542271,US 3223542272,3223542527,NL @@ -53420,7 +57424,7 @@ 3223552512,3223553535,NL 3223553536,3223554559,US 3223554560,3223554815,GB -3223555072,3223556095,US +3223554816,3223556095,US 3223556096,3223556351,CA 3223556352,3223556607,US 3223556608,3223556863,NL @@ -53428,12 +57432,11 @@ 3223557376,3223558655,DE 3223558656,3223563263,US 3223563264,3223563519,GB -3223563520,3223565567,US -3223565824,3223566079,US +3223563520,3223566079,US 3223566080,3223568639,NL 3223568640,3223569663,US 3223569664,3223570175,GB -3223570432,3223571711,US +3223570176,3223571711,US 3223571712,3223572223,GB 3223572224,3223572479,IE 3223572480,3223577855,US @@ -53443,7 +57446,7 @@ 3223581952,3223582207,US 3223582208,3223582719,NL 3223582720,3223582975,AU -3223583488,3223584767,US +3223582976,3223584767,US 3223584768,3223585023,GB 3223585024,3223585791,SE 3223585792,3223586047,GB @@ -53502,25 +57505,28 @@ 3223715840,3223781375,DK 3223781376,3223855103,US 3223855104,3223857151,CA -3223857152,3223863295,US -3223863552,3223863807,US +3223857152,3223863807,US +3223864320,3223864575,US 3223864576,3223864831,AE 3223864832,3223865343,HR 3223865344,3223867391,FI 3223867392,3223867647,GB +3223867648,3223867903,CA 3223868416,3223869439,BM 3223869440,3223871487,US 3223871488,3223873535,CA 3223873536,3223881727,US 3223881728,3223882751,CA +3223883264,3223883519,CA 3223883520,3223902207,US 3223902464,3223902719,CA 3223903232,3223905279,US 3223905280,3223905535,FI +3223905536,3223905791,US 3223906304,3223909375,CA 3223909376,3223910911,US 3223911936,3223912191,CA -3223912448,3223938559,US +3223912192,3223938815,US 3223938816,3223946239,GB 3223946240,3223947519,CH 3223947520,3223947775,US @@ -53546,11 +57552,11 @@ 3223967744,3223967999,NL 3223968000,3223968255,US 3223968256,3223968511,NL -3223968512,3223970303,US +3223968512,3223970559,US 3223970560,3223970815,DE -3223970816,3223977983,US +3223970816,3223978239,US 3223978240,3223978495,NL -3223978752,3223979263,US +3223978496,3223979263,US 3223979264,3223979775,CA 3223979776,3223988735,US 3223988736,3223990271,CH @@ -53563,20 +57569,18 @@ 3223994112,3223994623,DE 3223994880,3223995391,US 3223995392,3223995647,CA -3223995648,3223996159,US -3223996416,3223999487,US +3223995648,3223999487,US 3224000256,3224000511,NL 3224000512,3224001023,US 3224001024,3224001279,CA -3224001280,3224002559,US -3224002816,3224003327,US +3224001280,3224003327,US 3224003328,3224003583,ZA 3224003584,3224003839,GB 3224003840,3224004095,US 3224004096,3224004351,NL 3224004352,3224005631,JP -3224005632,3224006655,US -3224006656,3224012031,NL +3224005632,3224006911,US +3224006912,3224012031,NL 3224012032,3224014591,US 3224014592,3224014847,DE 3224014848,3224016639,US @@ -53584,13 +57588,13 @@ 3224016896,3224024063,US 3224024064,3224029695,CH 3224029696,3224030463,CA +3224030464,3224030719,US 3224030720,3224030975,CA 3224030976,3224038655,US 3224038656,3224038911,AU 3224038912,3224042751,US 3224042752,3224043007,DE -3224043008,3224043263,US -3224043520,3224084991,US +3224043008,3224084991,US 3224084992,3224087551,SE 3224087552,3224088063,US 3224088064,3224088319,AU @@ -53598,30 +57602,32 @@ 3224090880,3224091135,AU 3224091648,3224091903,US 3224091904,3224092159,AU +3224092160,3224092415,CA 3224092416,3224092671,US 3224092672,3224093951,CH 3224093952,3224094207,US 3224094208,3224094463,AU 3224094464,3224094975,US 3224094976,3224095487,AU -3224095488,3224096255,US +3224095488,3224096511,US 3224096512,3224097279,AU 3224097280,3224097535,NL 3224097536,3224097791,US 3224097792,3224098047,NL -3224098048,3224098559,US -3224098816,3224099583,US +3224098048,3224099583,US 3224099584,3224099839,CA 3224099840,3224100863,US 3224101120,3224101375,US 3224101376,3224102399,AU 3224103424,3224103679,NL -3224103680,3224104447,US +3224103680,3224104703,US 3224104704,3224104959,AU 3224104960,3224109055,US 3224109056,3224109311,NL 3224109312,3224119551,DE -3224119552,3224129791,FR +3224119552,3224126463,FR +3224126976,3224127231,US +3224127232,3224129791,FR 3224129792,3224132351,DE 3224132352,3224170495,US 3224170496,3224173567,SE @@ -53955,7 +57961,7 @@ 3225664512,3225669887,DE 3225669888,3225671935,US 3225671936,3225672191,AU -3225672192,3225672447,NL +3225672192,3225672447,DE 3225672448,3225672703,US 3225672704,3225673215,NL 3225673472,3225673727,IE @@ -54134,7 +58140,9 @@ 3226067456,3226067711,BE 3226067712,3226068223,US 3226068224,3226068479,NL -3226068480,3226109951,US +3226068480,3226074879,US +3226074880,3226075135,AT +3226075136,3226109951,US 3226110208,3226110719,US 3226110720,3226128639,AU 3226128640,3226140671,US @@ -54233,7 +58241,9 @@ 3226580480,3226581247,FI 3226581248,3226583295,US 3226583552,3226583807,NL -3226584064,3226591231,US +3226584064,3226584415,US +3226584416,3226584447,AU +3226584448,3226591231,US 3226591232,3226592255,CA 3226592768,3226593023,NL 3226593792,3226594047,NL @@ -54664,9 +58674,23 @@ 3227648000,3227713535,FI 3227713536,3227722521,CA 3227722522,3227722522,US -3227722523,3227748035,CA +3227722523,3227724031,CA +3227724032,3227724287,US +3227724288,3227748035,CA 3227748036,3227748039,US -3227748040,3227779071,CA +3227748040,3227751868,CA +3227751869,3227751869,US +3227751870,3227756505,CA +3227756506,3227756506,US +3227756507,3227765503,CA +3227765504,3227765759,US +3227765760,3227777759,CA +3227777760,3227777763,US +3227777764,3227777951,CA +3227777952,3227777967,US +3227777968,3227777983,CA +3227777984,3227777999,US +3227778000,3227779071,CA 3227779328,3227779583,MU 3227779584,3227779839,AU 3227779840,3227783679,US @@ -54711,7 +58735,27 @@ 3227818496,3227818751,GB 3227818752,3227819263,MX 3227819264,3227819519,AR -3227819520,3227844607,MX +3227819520,3227822847,MX +3227822848,3227823103,HN +3227823104,3227824383,MX +3227824384,3227824639,BR +3227824640,3227825663,MX +3227825664,3227825919,CR +3227825920,3227826687,MX +3227826688,3227827199,AR +3227827200,3227829759,MX +3227829760,3227830015,BR +3227830016,3227831807,MX +3227831808,3227832063,BR +3227832064,3227833855,MX +3227833856,3227834367,BR +3227834368,3227837439,MX +3227837440,3227837951,BR +3227837952,3227842559,MX +3227842560,3227842815,BR +3227842816,3227843327,MX +3227843328,3227843583,BR +3227844096,3227844351,AR 3227844864,3227845119,ES 3227845120,3227845631,US 3227845632,3227845887,NL @@ -54927,7 +58971,7 @@ 3228297216,3228297727,AT 3228297728,3228297983,US 3228297984,3228298495,NL -3228298496,3228309247,US +3228298752,3228309247,US 3228309248,3228310271,DE 3228310272,3228311807,EU 3228311808,3228312063,DE @@ -54982,7 +59026,9 @@ 3228405760,3228406015,IN 3228406016,3228406271,US 3228406272,3228407039,FR -3228407040,3228430847,DE +3228407040,3228424703,DE +3228424704,3228424959,US +3228425216,3228430847,DE 3228430848,3228431103,MU 3228431104,3228434431,DE 3228434432,3228456191,US @@ -55020,7 +59066,7 @@ 3228532224,3228532479,US 3228532480,3228532735,NL 3228532736,3228558591,US -3228558592,3228558847,BR +3228558592,3228559103,BR 3228559104,3228564479,US 3228564480,3228564735,AT 3228564992,3228565247,US @@ -55095,9 +59141,12 @@ 3229184512,3229195263,SE 3229195264,3229196287,DE 3229196288,3229196799,SE -3229196800,3229197311,AT -3229197312,3229198847,SE -3229198848,3229199359,AT +3229196800,3229197311,NL +3229197312,3229197823,SE +3229197824,3229198335,GB +3229198336,3229198847,SE +3229198848,3229199103,CH +3229199104,3229199359,AT 3229199360,3229200383,SE 3229200384,3229200895,GB 3229200896,3229201151,DE @@ -55563,7 +59612,9 @@ 3230897664,3230897919,NL 3230898688,3230898943,US 3230898944,3230899199,NL -3230899200,3230913535,US +3230899200,3230913023,US +3230913024,3230913279,BR +3230913280,3230913535,US 3230913536,3230913791,NL 3230913792,3230914047,CA 3230914048,3230914303,US @@ -55908,7 +59959,8 @@ 3231483136,3231484927,US 3231484928,3231487999,JP 3231488512,3231488767,JP -3231489536,3231490047,AU +3231489536,3231489791,JP +3231489792,3231490047,AU 3231490048,3231490559,US 3231490560,3231490815,GB 3231490816,3231491071,US @@ -55949,10 +60001,14 @@ 3231518976,3231519231,SE 3231519744,3231526911,US 3231526912,3231528959,A2 -3231528960,3231528999,CA -3231529000,3231529015,US -3231529016,3231530751,CA -3231530752,3231539199,US +3231528960,3231528991,CA +3231528992,3231529031,US +3231529032,3231529039,CA +3231529040,3231529471,US +3231529472,3231529487,CA +3231529488,3231529727,US +3231529728,3231529983,CA +3231529984,3231539199,US 3231539200,3231547391,CA 3231547392,3231547647,US 3231547648,3231547903,NL @@ -55994,7 +60050,9 @@ 3231591680,3231591935,AU 3231591936,3231593983,US 3231593984,3231594495,GB -3231594496,3231649791,US +3231594496,3231641855,US +3231641856,3231642111,SG +3231642112,3231649791,US 3231649792,3231653887,SG 3231653888,3231663103,US 3231663616,3231663871,NL @@ -56261,7 +60319,6 @@ 3232555776,3232557055,JP 3232557056,3232557311,AU 3232557568,3232560127,JP -3232560640,3232560895,JP 3232560896,3232561663,US 3232561664,3232561919,CA 3232561920,3232562431,US @@ -56287,7 +60344,9 @@ 3232704512,3232705535,GB 3232705536,3232706559,FI 3232706560,3232716799,US -3232716800,3232727039,CA +3232716800,3232724151,CA +3232724152,3232724159,US +3232724160,3232727039,CA 3232727040,3232759807,US 3232759808,3232772095,SE 3232772096,3232774143,IT @@ -56342,7 +60401,8 @@ 3233564672,3233564927,US 3233564928,3233566719,JP 3233567744,3233568767,JP -3233568768,3233570047,AU +3233568768,3233569791,AU +3233569792,3233570047,JP 3233570048,3233570559,US 3233570816,3233571071,GB 3233571072,3233572095,US @@ -56371,7 +60431,7 @@ 3233583360,3233583615,NL 3233583616,3233584895,US 3233584896,3233585151,AU -3233585152,3233586431,US +3233585152,3233586175,US 3233586432,3233586943,GB 3233586944,3233588223,US 3233588224,3233589247,GA @@ -56630,7 +60690,13 @@ 3234065664,3234065919,BR 3234065920,3234070527,US 3234070528,3234110463,FR -3234110464,3234136063,US +3234110464,3234128455,US +3234128456,3234128463,GB +3234128464,3234130695,US +3234130696,3234130703,AU +3234130704,3234131183,US +3234131184,3234131191,GB +3234131192,3234136063,US 3234136064,3234164991,CA 3234164992,3234165247,US 3234165248,3234172927,CA @@ -56643,8 +60709,16 @@ 3234192384,3234193663,US 3234193664,3234201599,CA 3234201600,3234203647,US -3234203648,3234205695,BR -3234205696,3234230015,US +3234203648,3234205183,BR +3234205184,3234205439,AR +3234205440,3234205695,BR +3234205696,3234226983,US +3234226984,3234226991,CA +3234226992,3234227455,US +3234227456,3234227711,CA +3234227712,3234228223,US +3234228224,3234228351,CA +3234228352,3234230015,US 3234230016,3234230271,ES 3234230272,3234232319,US 3234232320,3234232575,EG @@ -56755,7 +60829,7 @@ 3234809088,3234810879,US 3234810880,3234811135,CA 3234811136,3234814719,US -3234814720,3234814975,AU +3234814720,3234814975,HK 3234814976,3234815999,US 3234816000,3234816767,AU 3234816768,3234820351,US @@ -56803,9 +60877,7 @@ 3235004416,3235021823,CA 3235021824,3235026943,US 3235026944,3235028991,CA -3235028992,3235038463,US -3235038464,3235038719,GB -3235038720,3235045375,US +3235028992,3235045375,US 3235045376,3235046143,CA 3235046144,3235085311,US 3235085312,3235086335,CA @@ -56902,10 +60974,12 @@ 3236052992,3236069375,US 3236069376,3236102143,CA 3236102144,3236106239,PH -3236106240,3236139007,US -3236139008,3236142079,CA -3236142080,3236142335,US -3236142336,3236143103,CA +3236106240,3236140031,US +3236140032,3236142079,CA +3236142080,3236142847,US +3236142848,3236143005,CA +3236143006,3236143006,US +3236143007,3236143103,CA 3236143104,3236167679,US 3236167680,3236175871,CA 3236175872,3236200447,US @@ -57037,38 +61111,22 @@ 3236958208,3236962303,AU 3236962304,3237021695,US 3237021696,3237023743,CA -3237023744,3237036031,US -3237036032,3237036799,CA -3237036800,3237037055,US -3237037056,3237039359,CA -3237039360,3237039615,US -3237039616,3237039935,CA -3237039936,3237040063,US -3237040064,3237040383,CA -3237040384,3237040511,US -3237040512,3237041663,CA -3237041664,3237041791,US -3237041792,3237043199,CA -3237043200,3237043455,US -3237043456,3237043967,CA +3237023744,3237038079,US +3237038080,3237038335,CA +3237038336,3237043967,US 3237043968,3237044223,CH -3237044224,3237045759,CA -3237045760,3237046015,US +3237044224,3237046015,US 3237046016,3237046271,RO -3237046272,3237047039,CA +3237046272,3237047039,US 3237047040,3237047295,FR 3237047296,3237047551,US 3237047552,3237047807,IE -3237047808,3237048319,CA -3237048320,3237048575,US -3237048576,3237050111,CA +3237047808,3237050111,US 3237050112,3237050367,GB -3237050368,3237051135,US -3237051136,3237051391,CA -3237051392,3237051903,US +3237050368,3237051903,US 3237051904,3237052159,TR -3237052160,3237052415,CA -3237052416,3237154815,US +3237052160,3237052287,CA +3237052288,3237154815,US 3237154816,3237155839,ES 3237155840,3237156863,AU 3237156864,3237163007,US @@ -57113,10 +61171,10 @@ 3237328384,3237328639,US 3237328640,3237328895,CA 3237328896,3237329151,US -3237329152,3237329407,AU +3237329152,3237329407,NZ 3237329408,3237330943,US 3237330944,3237331199,AU -3237331456,3237331967,US +3237331456,3237331711,US 3237331968,3237332223,AU 3237332224,3237335039,US 3237335040,3237335295,AU @@ -57143,9 +61201,11 @@ 3237553152,3237553407,GB 3237553408,3237553922,US 3237553923,3237553923,EU -3237553924,3237554434,US -3237554435,3237554435,AP -3237554436,3237568511,US +3237553924,3237554431,US +3237554432,3237554434,SG +3237554435,3237554435,US +3237554436,3237554463,SG +3237554464,3237568511,US 3237568512,3237572607,CA 3237572608,3237576703,US 3237576704,3237609471,CA @@ -57196,12 +61256,18 @@ 3237797888,3237801983,CA 3237806080,3237857535,US 3237858304,3237863423,CA -3237863424,3237868031,US -3237868032,3237868287,HK -3237868288,3237869823,US +3237863424,3237867519,US +3237867520,3237867775,HK +3237867776,3237868031,GB +3237868032,3237869311,US +3237869312,3237869439,KR +3237869440,3237869567,JP +3237869568,3237869823,AU 3237869824,3237869951,PH 3237869952,3237870079,VN -3237870080,3237870847,US +3237870080,3237870335,IS +3237870336,3237870591,SG +3237870592,3237870847,DE 3237870848,3237870975,KR 3237870976,3237871103,JP 3237871104,3237871231,PH @@ -57209,7 +61275,24 @@ 3237871360,3237871615,NZ 3237871616,3237896191,US 3237896192,3237900287,PR -3237900288,3238002687,US +3237900288,3237957631,US +3237957632,3237957887,VE +3237957888,3237958143,AG +3237958144,3237958399,PE +3237958400,3237958655,BS +3237958656,3237958911,PY +3237958912,3237959167,JM +3237959168,3237959423,GY +3237959424,3237959679,NI +3237959680,3237959935,EC +3237959936,3237960191,BB +3237960192,3237960447,SR +3237960448,3237960703,BZ +3237960704,3237960959,BO +3237960960,3237961215,DM +3237961216,3237961471,SV +3237961472,3237961727,HT +3237961728,3238002687,US 3238002688,3238008831,NL 3238008832,3238010879,PL 3238010880,3238017023,CH @@ -57421,7 +61504,8 @@ 3239063296,3239063551,UA 3239063552,3239075839,DE 3239075840,3239076095,MT -3239076096,3239076607,DE +3239076096,3239076351,DE +3239076352,3239076607,RU 3239076608,3239076863,PL 3239076864,3239077119,NL 3239077120,3239077375,UA @@ -57432,7 +61516,6 @@ 3239078656,3239078911,PL 3239078912,3239079167,GB 3239079168,3239079423,SI -3239079424,3239079679,FR 3239079680,3239079935,MD 3239079936,3239088127,DE 3239088640,3239088895,DK @@ -57444,7 +61527,6 @@ 3239090432,3239090687,ES 3239090688,3239090943,NL 3239090944,3239091199,AT -3239091200,3239091455,FR 3239091456,3239091711,BG 3239091712,3239091967,UA 3239091968,3239092223,FR @@ -57452,7 +61534,6 @@ 3239104512,3239105279,RU 3239105280,3239105535,CH 3239105536,3239105791,DE -3239105792,3239106047,RO 3239106048,3239106559,AT 3239106560,3239106815,ES 3239106816,3239107071,CH @@ -57468,7 +61549,7 @@ 3239111424,3239111679,DE 3239111936,3239112191,AT 3239112192,3239112447,IL -3239112448,3239112959,PL +3239112704,3239112959,PL 3239112960,3239113215,CH 3239113216,3239113471,AT 3239113472,3239113727,ES @@ -57480,14 +61561,16 @@ 3239116544,3239116799,PL 3239116800,3239117055,PT 3239117056,3239117311,SI -3239117312,3239119871,DE +3239117312,3239117823,DE +3239118336,3239118591,DE +3239118848,3239119871,DE 3239119872,3239120127,GB 3239120128,3239120383,CZ 3239120384,3239120639,PL 3239120896,3239121663,DE 3239121664,3239121919,FR -3239121920,3239127039,DE -3239127040,3239127295,PT +3239121920,3239123967,DE +3239124992,3239127039,DE 3239127296,3239127551,PL 3239127552,3239127807,IL 3239127808,3239128063,RU @@ -57514,7 +61597,6 @@ 3239136512,3239136767,DE 3239136768,3239137023,MD 3239137024,3239137279,LI -3239137280,3239138303,DE 3239138304,3239138559,PL 3239138560,3239138815,CH 3239138816,3239141375,DE @@ -57533,9 +61615,7 @@ 3239163904,3239164159,PL 3239164160,3239164671,DE 3239164672,3239164927,GB -3239165184,3239165439,DE 3239165952,3239166207,FR -3239166208,3239166463,DE 3239166464,3239166719,CH 3239166720,3239166975,RO 3239166976,3239167231,FR @@ -57570,7 +61650,8 @@ 3239176192,3239180287,DE 3239180288,3239181311,CZ 3239181312,3239181567,AT -3239181824,3239205887,DE +3239181824,3239182079,DE +3239182336,3239205887,DE 3239205888,3239206143,US 3239206144,3239264255,DE 3239264256,3239264767,NO @@ -57630,13 +61711,13 @@ 3239445760,3239446015,PL 3239446016,3239446271,RU 3239446272,3239446527,FR -3239446528,3239451647,DE +3239446528,3239449599,DE +3239450624,3239451647,DE 3239451648,3239451903,PL 3239451904,3239452159,DE 3239452160,3239452415,CY 3239452416,3239452671,HR 3239452672,3239464959,DE -3239464960,3239465215,IL 3239465216,3239465471,PL 3239465472,3239465727,AT 3239465728,3239465983,PL @@ -57654,21 +61735,17 @@ 3239469056,3239470591,DE 3239470592,3239470847,CH 3239470848,3239471103,BG -3239471104,3239471871,DE 3239471872,3239472127,FR 3239472128,3239474943,DE 3239474944,3239475199,ES 3239475200,3239477247,DE -3239479552,3239479807,DE 3239480320,3239480575,UA -3239480576,3239480831,RO 3239480832,3239481087,CH 3239481088,3239481343,FR 3239481344,3239486719,DE 3239486720,3239486975,ES 3239486976,3239487487,DE 3239487744,3239487999,PL -3239488000,3239488255,AT 3239488256,3239488511,CH 3239488512,3239488767,KW 3239488768,3239489023,RO @@ -57691,17 +61768,17 @@ 3239509504,3239509759,CH 3239509760,3239510015,DE 3239510016,3239510271,UA -3239510272,3239514111,DE +3239510272,3239511039,DE +3239512064,3239514111,DE 3239518208,3239521023,DE 3239521024,3239521279,AP -3239521280,3239522303,DE +3239521280,3239521791,DE 3239522304,3239522559,PL 3239522560,3239522815,SI 3239523072,3239523327,PL 3239523328,3239523583,BG 3239523584,3239523839,UA 3239523840,3239524095,PL -3239524096,3239524351,SE 3239524352,3239524607,DE 3239524608,3239524863,SE 3239524864,3239525119,UA @@ -57723,7 +61800,6 @@ 3239541760,3239542015,GB 3239542016,3239542271,PL 3239542272,3239542527,RU -3239542528,3239542783,FR 3239542784,3239544831,DE 3239544832,3239545087,GB 3239545088,3239545343,SI @@ -57741,7 +61817,6 @@ 3239554048,3239554303,SE 3239554560,3239554815,PL 3239554816,3239555071,UA -3239555072,3239556095,DE 3239556096,3239556351,SA 3239556352,3239556607,UA 3239556608,3239556863,HR @@ -57758,8 +61833,7 @@ 3239568896,3239574783,DE 3239575040,3239575295,DE 3239575296,3239575551,DK -3239575552,3239575807,RO -3239575808,3239578879,DE +3239575552,3239578879,DE 3239579136,3239579391,PL 3239579392,3239581695,DE 3239581696,3239581951,PL @@ -57782,9 +61856,7 @@ 3239628800,3239629823,DE 3239630848,3239631871,DE 3239631872,3239632895,UA -3239632896,3239633919,DE -3239633920,3239634943,FR -3239635968,3239636991,DE +3239632896,3239636991,DE 3239636992,3239638015,BG 3239638016,3239639039,PL 3239639040,3239639551,SI @@ -57822,7 +61894,6 @@ 3239690240,3239690495,ES 3239690496,3239690751,PL 3239691008,3239691263,FR -3239691264,3239691519,IT 3239691520,3239691775,FR 3239691776,3239691821,EU 3239691822,3239691822,GB @@ -57832,8 +61903,7 @@ 3239697408,3239697663,HR 3239697664,3239697919,RU 3239697920,3239698175,PL -3239698432,3239706367,DE -3239706368,3239706623,UA +3239698432,3239706623,DE 3239706880,3239707135,NL 3239707392,3239707647,UA 3239707648,3239707903,GB @@ -57851,7 +61921,6 @@ 3239711232,3239711487,BY 3239711488,3239711743,RU 3239711744,3239711999,UA -3239712256,3239712511,DE 3239712512,3239712767,GB 3239712768,3239713023,DE 3239713024,3239713279,PL @@ -57872,12 +61941,8 @@ 3239740928,3239741183,UA 3239741184,3239741439,RU 3239741440,3239759871,DE -3239759872,3239760127,RU 3239760128,3239760383,UA -3239760384,3239760895,PL -3239760896,3239761151,RU 3239761408,3239761663,RU -3239761664,3239761919,PL 3239761920,3239762175,BG 3239762176,3239762431,RU 3239762432,3239762687,DK @@ -57893,7 +61958,7 @@ 3239773952,3239774207,SA 3239774464,3239774719,ES 3239774976,3239775231,PT -3239775232,3239782399,DE +3239776256,3239782399,DE 3239782400,3239782655,AT 3239782656,3239782911,RU 3239782912,3239783167,GB @@ -57937,7 +62002,6 @@ 3239828992,3239829503,RU 3239830016,3239830527,CH 3239831040,3239831551,RU -3239832064,3239832575,UA 3239832576,3239834111,RU 3239834112,3239834623,UA 3239834624,3239835135,AT @@ -57945,8 +62009,7 @@ 3239836672,3239837183,DE 3239837184,3239837695,SE 3239837696,3239837951,PL -3239837952,3239838463,DE -3239838720,3239839231,DE +3239838976,3239839231,DE 3239839232,3239839487,RU 3239839488,3239839743,DE 3239839744,3239839999,SK @@ -57954,7 +62017,8 @@ 3239840512,3239840767,DE 3239840768,3239841023,AT 3239841024,3239841279,NL -3239841536,3239848447,DE +3239841536,3239846911,DE +3239847936,3239848447,DE 3239848448,3239848703,CH 3239848960,3239849215,RU 3239849216,3239849471,GB @@ -57972,7 +62036,6 @@ 3239861760,3239862015,SA 3239862016,3239862271,IT 3239862272,3239874559,DE -3239874560,3239874815,NL 3239874816,3239875071,DE 3239875072,3239875327,SI 3239875328,3239875583,DK @@ -58004,11 +62067,9 @@ 3239885824,3239886079,CH 3239886080,3239886335,PL 3239886336,3239886591,RU -3239886592,3239886847,FR 3239886848,3239888895,DE 3239888896,3239889151,UA 3239889152,3239889407,GB -3239889408,3239889663,CZ 3239889664,3239889919,FI 3239889920,3239890175,AT 3239890176,3239890431,FR @@ -58026,7 +62087,6 @@ 3239897600,3239897855,RU 3239897856,3239898111,FR 3239898112,3239898367,NO -3239898368,3239898623,GB 3239898624,3239898879,DE 3239898880,3239899135,RU 3239899136,3239901695,DE @@ -58034,11 +62094,11 @@ 3239901952,3239902207,DE 3239902464,3239902719,RU 3239902720,3239902975,EE -3239903232,3239904511,DE +3239903232,3239904255,DE 3239904512,3239904767,GB -3239904768,3239907327,DE +3239905024,3239907327,DE 3239907328,3239907583,UA -3239907584,3239908095,DE +3239907584,3239907839,DE 3239908096,3239908351,RU 3239908352,3239911423,DE 3239912960,3239913215,DE @@ -58052,15 +62112,13 @@ 3239916800,3239917055,KZ 3239917056,3239917311,DE 3239917312,3239917567,BG -3239917568,3239922687,DE +3239919616,3239922687,DE 3239922688,3239922724,LU 3239922725,3239922725,DE 3239922726,3239922943,LU -3239922944,3239935999,DE -3239936256,3239936511,FR -3239936512,3239938815,DE +3239922944,3239938815,DE 3239938816,3239939071,NL -3239939072,3239950335,DE +3239939072,3239949311,DE 3239950848,3239951103,DE 3239951104,3239951359,AT 3239951360,3239954431,DE @@ -58076,7 +62134,8 @@ 3239959808,3239960063,BE 3239960064,3239960319,FR 3239960320,3239960575,GB -3239960576,3239968511,DE +3239960576,3239966719,DE +3239967232,3239968255,DE 3239968512,3239968767,PL 3239968768,3239969023,NO 3239969536,3239971839,DE @@ -58091,7 +62150,6 @@ 3239979520,3239979775,DE 3239980032,3239996415,DE 3239996416,3239996671,GB -3239996672,3239996927,PL 3239996928,3239997183,BE 3239997184,3239997439,GB 3239997440,3240004863,DE @@ -58118,18 +62176,19 @@ 3240033792,3240034303,RO 3240034304,3240034559,RU 3240034560,3240035327,DE -3240035840,3240037375,DE +3240036096,3240037375,DE 3240037888,3240038143,AT -3240038400,3240083455,DE +3240038400,3240040447,DE +3240042496,3240083455,DE 3240083456,3240085503,RU 3240085504,3240087551,KZ -3240087552,3240098815,DE +3240087552,3240097791,DE 3240098816,3240099327,CH -3240099584,3240099839,DE -3240100096,3240100690,GB +3240100352,3240100690,GB 3240100691,3240100691,EU 3240100692,3240100863,GB -3240101376,3240102911,GB +3240101376,3240101887,GB +3240102144,3240102399,GB 3240102912,3240103935,UA 3240104192,3240104703,GB 3240104704,3240104959,NL @@ -58157,7 +62216,8 @@ 3240117248,3240118271,EU 3240118272,3240120319,ES 3240120320,3240120831,IR -3240120832,3240124927,GB +3240120832,3240121343,GB +3240122368,3240123391,GB 3240125440,3240125695,RO 3240125696,3240165375,GB 3240165376,3240165887,PL @@ -58227,7 +62287,6 @@ 3240205312,3240205823,GB 3240205824,3240206335,DE 3240206336,3240206847,RU -3240207360,3240207871,RO 3240207872,3240208127,RU 3240208128,3240208895,FR 3240208896,3240209407,GB @@ -58343,7 +62402,6 @@ 3240282112,3240282239,DE 3240282240,3240282367,UA 3240282368,3240282495,RO -3240282496,3240282623,RU 3240282624,3240282879,SE 3240282880,3240283007,UA 3240283008,3240283391,PL @@ -58356,11 +62414,8 @@ 3240287232,3240288255,PL 3240288256,3240296447,GB 3240296448,3240296703,RO -3240296704,3240296959,GB -3240297472,3240302847,GB +3240297472,3240300543,GB 3240302848,3240303103,UA -3240303104,3240303359,GB -3240303616,3240304639,GB 3240304640,3240305663,RU 3240305664,3240305919,PL 3240305920,3240306175,EU @@ -58390,7 +62445,8 @@ 3240325120,3240361983,GB 3240361984,3240362239,TR 3240362240,3240362495,DE -3240362496,3240370175,GB +3240362496,3240362751,GB +3240363008,3240370175,GB 3240370176,3240370431,CH 3240370432,3240370687,DE 3240370688,3240370943,GB @@ -58405,7 +62461,8 @@ 3240373248,3240373503,RO 3240373504,3240373759,FR 3240373760,3240374015,DE -3240374016,3240407039,GB +3240374016,3240374271,GB +3240378368,3240407039,GB 3240407040,3240407295,IL 3240407296,3240407551,NL 3240407552,3240407807,NO @@ -58421,11 +62478,13 @@ 3240419840,3240420095,AT 3240420608,3240420863,NL 3240420864,3240421375,GB -3240423424,3240436735,GB +3240423424,3240435711,GB +3240436480,3240436735,GB 3240436736,3240437759,DE -3240437760,3240454911,GB +3240438784,3240443903,GB +3240450048,3240454911,GB 3240454912,3240455167,IN -3240455680,3240460287,GB +3240456192,3240460287,GB 3240460288,3240461055,IL 3240461056,3240461567,DE 3240461568,3240461823,UA @@ -58451,16 +62510,20 @@ 3240467712,3240467967,RU 3240467968,3240468223,DE 3240468224,3240468479,CH -3240468480,3240487935,GB +3240468480,3240476671,GB +3240484864,3240486911,GB +3240487424,3240487935,GB 3240487936,3240488191,CH 3240488192,3240488447,GB 3240488448,3240488703,BG 3240488704,3240488959,NL 3240488960,3240493055,GB 3240493056,3240501247,SE -3240501248,3240505343,GB +3240503296,3240505343,GB 3240505344,3240505599,PL -3240505600,3240529919,GB +3240505600,3240505855,GB +3240506368,3240506623,GB +3240507392,3240529919,GB 3240534016,3240536640,GB 3240536641,3240536641,US 3240536642,3240550399,GB @@ -58489,11 +62552,13 @@ 3240589312,3240593407,SE 3240593408,3240594175,GB 3240594176,3240594431,DK -3240594432,3240608255,GB +3240594432,3240607743,GB 3240609792,3240611839,DE -3240611840,3240622079,GB +3240611840,3240613887,GB +3240615936,3240622079,GB 3240622080,3240622591,RU -3240622592,3240624127,GB +3240622592,3240623103,GB +3240623872,3240624127,GB 3240624128,3240689663,EE 3240689664,3240690175,GB 3240690176,3240690687,TR @@ -58505,7 +62570,6 @@ 3240693760,3240695807,BE 3240695808,3240697855,ES 3240698112,3240698367,LV -3240698368,3240698623,GB 3240698624,3240699135,SI 3240699136,3240699391,DE 3240699904,3240700159,LT @@ -58516,11 +62580,9 @@ 3240701184,3240701439,LV 3240701440,3240701695,ES 3240701952,3240702975,UA -3240702976,3240703999,DE 3240704000,3240705023,GR 3240705024,3240706047,UA 3240706048,3240707071,BG -3240707072,3240707839,NL 3240707840,3240709119,FR 3240709120,3240710143,RU 3240710144,3240710399,UA @@ -58570,11 +62632,10 @@ 3240739840,3240740095,DE 3240740096,3240740351,LT 3240740352,3240740607,IT -3240740608,3240741119,DE +3240740864,3240741119,DE 3240741120,3240741375,AT 3240741376,3240741631,IL 3240741632,3240741887,RU -3240741888,3240742143,LV 3240742144,3240742399,IT 3240742400,3240742655,RO 3240742656,3240742911,AT @@ -58588,7 +62649,6 @@ 3240746496,3240747007,FR 3240747008,3240747263,SE 3240747264,3240747519,TR -3240747520,3240747775,RU 3240747776,3240748031,ES 3240748032,3240748287,AT 3240748288,3240748543,GR @@ -58602,7 +62662,8 @@ 3240751104,3240752127,ES 3240752128,3240754175,RO 3240754176,3240755199,DE -3240755200,3240791551,IT +3240755200,3240787967,IT +3240788992,3240791551,IT 3240791552,3240791807,RU 3240791808,3240792063,ES 3240792064,3240792319,GB @@ -58618,11 +62679,9 @@ 3240795648,3240795903,CH 3240795904,3240796159,SE 3240796160,3240808959,IT -3240808960,3240809215,GB 3240809216,3240809471,PL 3240809472,3240809727,NL 3240809728,3240809983,FR -3240809984,3240810239,GR 3240810240,3240810495,SE 3240810496,3240810751,TR 3240811008,3240811263,PL @@ -58631,7 +62690,7 @@ 3240812032,3240812287,HU 3240812288,3240812543,KW 3240813568,3240814591,PL -3240814592,3240818687,IT +3240814592,3240816639,IT 3240818688,3240819711,NL 3240819712,3240819715,GB 3240819716,3240819716,EU @@ -58643,32 +62702,34 @@ 3240820864,3240820991,PL 3240820992,3240822783,IT 3240823808,3240824319,PL -3240824320,3240827135,IT +3240824320,3240825855,IT +3240826880,3240827135,IT 3240827136,3240827391,FR 3240827392,3240827647,BG 3240827648,3240827903,CH 3240828160,3240828415,DE -3240828416,3240840447,IT +3240828416,3240837119,IT +3240839424,3240839679,IT +3240840192,3240840447,IT 3240840448,3240840703,PL 3240840704,3240840959,RU 3240841216,3240843263,IT 3240843264,3240843775,NL 3240843776,3240844031,PL -3240844032,3240844543,NL +3240844288,3240844543,NL 3240844544,3240844799,CH 3240845056,3240845311,UA -3240845312,3240846847,IT +3240845312,3240845823,IT +3240846336,3240846847,IT 3240846848,3240847359,VA 3240847360,3240852735,IT 3240852736,3240852991,GB -3240852992,3240853247,IT 3240853248,3240853503,RU 3240853504,3240854527,VA 3240854528,3240855039,IT 3240855040,3240855295,RU -3240855296,3240857599,IT +3240855552,3240857599,IT 3240857600,3240857855,PL -3240857856,3240858623,IT 3240858624,3240858879,PL 3240859136,3240859391,NL 3240859392,3240859647,SE @@ -58700,7 +62761,8 @@ 3241018112,3241029119,AT 3241029120,3241029375,UA 3241029376,3241029631,PL -3241029632,3241032703,AT +3241029632,3241031679,AT +3241032192,3241032703,AT 3241032704,3241032959,RU 3241032960,3241033215,GB 3241033216,3241033727,DE @@ -58743,15 +62805,12 @@ 3241070336,3241070847,RU 3241070848,3241071103,AT 3241071104,3241071359,UA -3241071360,3241071615,RU 3241071616,3241071871,PL 3241071872,3241072127,RU -3241072128,3241072383,BE 3241072384,3241072639,DE 3241073664,3241073919,AT 3241073920,3241074175,GB -3241074176,3241076735,AT -3241076736,3241076991,GR +3241074432,3241076735,AT 3241077248,3241077759,AT 3241077760,3241078015,LV 3241078016,3241078271,PL @@ -58795,7 +62854,6 @@ 3241120512,3241120767,GB 3241120768,3241121023,RU 3241121024,3241121279,CH -3241121280,3241121535,FR 3241121536,3241121791,PL 3241121792,3241122047,DE 3241122048,3241122303,CH @@ -58818,27 +62876,29 @@ 3241131264,3241131519,UA 3241131520,3241131775,CH 3241131776,3241132031,DK -3241132032,3241145855,CH +3241132032,3241144319,CH 3241145856,3241146111,HR 3241146112,3241146367,PL 3241146368,3241146623,IL 3241146624,3241146879,RO 3241146880,3241148415,CH 3241148416,3241476095,FR -3241476096,3241481727,BE +3241476608,3241477631,BE +3241477632,3241477887,GB +3241478144,3241481727,BE 3241481728,3241481983,PT 3241481984,3241482239,DE 3241482240,3241484799,SE -3241484800,3241496575,BE +3241484800,3241485055,BE +3241485312,3241496575,BE 3241496576,3241496831,AT -3241496832,3241497343,BE 3241497344,3241497599,UA 3241497600,3241497855,SE 3241497856,3241498111,DK 3241498112,3241498367,BE 3241498624,3241498879,NO 3241498880,3241499135,UA -3241499136,3241499903,BE +3241499648,3241499903,BE 3241499904,3241500159,DE 3241500160,3241500671,GB 3241500672,3241501439,BE @@ -58849,9 +62909,11 @@ 3241503232,3241503487,RS 3241503488,3241508095,BE 3241508096,3241508351,NL -3241508352,3241541375,BE +3241508352,3241508607,BE +3241508864,3241541375,BE 3241541376,3241541631,PL -3241541632,3241699839,FR +3241541632,3241699327,FR +3241699584,3241699839,FR 3241699840,3241700095,SE 3241700096,3241723903,FR 3241724160,3241724415,FR @@ -58868,11 +62930,11 @@ 3241820160,3241821695,GB 3241821696,3241822207,GR 3241822208,3241824255,CZ -3241824256,3241843455,BE +3241824256,3241840639,BE +3241841664,3241842175,BE +3241842688,3241843455,BE 3241843456,3241843711,CH -3241843712,3241848063,BE -3241848064,3241851391,CH -3241851392,3241851903,GR +3241843712,3241848831,BE 3241851904,3241852927,GB 3241852928,3241854463,SK 3241854464,3241854975,GB @@ -58898,7 +62960,6 @@ 3241866240,3241866751,DE 3241866752,3241867007,UA 3241867008,3241867263,FR -3241867520,3241867775,PL 3241867776,3241868031,NO 3241868032,3241868287,RU 3241868288,3241868543,HR @@ -58932,14 +62993,13 @@ 3243376640,3243442175,GB 3243442176,3243507711,AT 3243507712,3243507967,GB -3243508224,3243509759,CZ +3243509248,3243509759,CZ 3243509760,3243510015,RU 3243510016,3243510271,NL 3243510272,3243510527,CZ 3243510784,3243511807,CZ 3243512064,3243512319,UA 3243512320,3243512575,FR -3243512576,3243512831,UA 3243512832,3243513087,DE 3243513088,3243513343,GR 3243513344,3243513855,UA @@ -58980,17 +63040,15 @@ 3243532032,3243532287,DE 3243532288,3243536383,CZ 3243536384,3243536639,AT -3243536896,3243537151,CZ 3243537408,3243537919,CZ -3243538432,3243540991,CZ -3243542528,3243543551,CZ +3243540480,3243540991,CZ 3243544064,3243544319,GB 3243544320,3243544575,NL 3243544576,3243552767,CZ 3243552768,3243553023,NL 3243553024,3243553279,FR 3243553280,3243553535,DE -3243553792,3243554303,DE +3243554048,3243554303,DE 3243554304,3243554559,PL 3243554560,3243554815,MD 3243554816,3243555071,LV @@ -59000,9 +63058,7 @@ 3243565056,3243569151,GB 3243570432,3243570687,CZ 3243570688,3243570943,PL -3243570944,3243571199,CZ 3243571456,3243571711,CZ -3243571712,3243571967,GB 3243571968,3243572223,GR 3243572224,3243572479,CZ 3243572736,3243572991,CZ @@ -59607,7 +63663,11 @@ 3245015040,3245016063,RU 3245016064,3245017087,RS 3245017088,3245018111,PL -3245018112,3245021183,RU +3245018112,3245019391,RU +3245019392,3245019462,SC +3245019463,3245019463,A1 +3245019464,3245019647,SC +3245019648,3245021183,RU 3245021184,3245022207,UA 3245022208,3245023231,NO 3245023232,3245024255,PL @@ -59638,7 +63698,6 @@ 3245057024,3245058047,PL 3245058048,3245061119,UA 3245061120,3245062143,RU -3245062144,3245063167,UA 3245063168,3245065215,RU 3245065216,3245066239,PL 3245066240,3245067263,UA @@ -59680,7 +63739,6 @@ 3245096960,3245099007,EU 3245099008,3245103103,GB 3245103104,3245105151,EU -3245105152,3245105663,GB 3245105664,3245106175,NL 3245106176,3245106687,AT 3245106688,3245107711,UA @@ -59712,7 +63770,6 @@ 3245125120,3245125631,ES 3245125632,3245125887,DE 3245125888,3245126143,PL -3245126144,3245126399,FR 3245126400,3245126655,DE 3245126656,3245126911,FR 3245126912,3245127167,DE @@ -59739,7 +63796,6 @@ 3245133312,3245133567,PL 3245134080,3245134335,UA 3245134336,3245134591,NL -3245134592,3245134847,IL 3245134848,3245135103,AT 3245135104,3245135359,TR 3245135360,3245135615,UG @@ -59781,7 +63837,6 @@ 3245164544,3245165055,BE 3245165056,3245165567,AT 3245165568,3245166079,RU -3245166080,3245166591,TZ 3245166592,3245166847,UA 3245166848,3245167103,GB 3245167104,3245167359,IL @@ -59813,6 +63868,7 @@ 3245178624,3245178879,PL 3245178880,3245179391,UA 3245179392,3245179903,LU +3245179904,3245180415,DE 3245180416,3245180927,TR 3245181440,3245181951,DE 3245181952,3245182463,AT @@ -59836,7 +63892,7 @@ 3245201920,3245202175,SA 3245202432,3245202687,GB 3245202944,3245203455,DE -3245203712,3245204223,PL +3245203712,3245203967,PL 3245204224,3245204479,SI 3245204480,3245204735,BE 3245204736,3245204991,ES @@ -59855,7 +63911,6 @@ 3245210112,3245210623,FR 3245210624,3245211135,HU 3245211136,3245211647,GB -3245212160,3245212671,NG 3245212672,3245213183,GB 3245213184,3245213695,DE 3245213696,3245214207,LV @@ -59876,7 +63931,6 @@ 3245230080,3245232127,UA 3245232128,3245232383,PL 3245232384,3245232639,BE -3245232640,3245232895,BG 3245232896,3245233151,IT 3245233152,3245233407,DK 3245233408,3245233452,CH @@ -59906,8 +63960,6 @@ 3245244928,3245245183,US 3245245440,3245245695,BG 3245245696,3245245951,DE -3245246208,3245246463,GB -3245246464,3245246719,AT 3245246720,3245246975,PL 3245246976,3245247231,GB 3245247232,3245247487,DE @@ -59941,7 +63993,6 @@ 3245260288,3245260799,BE 3245260800,3245261823,DE 3245261824,3245262847,DK -3245262848,3245263871,IT 3245263872,3245264895,DE 3245264896,3245266943,TR 3245266944,3245268991,BG @@ -60016,8 +64067,7 @@ 3245319424,3245319679,SE 3245319680,3245319935,PL 3245319936,3245320191,DE -3245320448,3245320959,DE -3245320960,3245321215,IE +3245320448,3245320703,DE 3245321216,3245321471,NL 3245321472,3245321727,UA 3245321984,3245322239,DE @@ -60026,7 +64076,6 @@ 3245325312,3245326335,UA 3245326336,3245326847,SI 3245326848,3245327359,BG -3245327360,3245327871,CH 3245327872,3245328383,DE 3245328384,3245328895,GB 3245328896,3245329407,CH @@ -60043,7 +64092,6 @@ 3245337856,3245338367,DE 3245338368,3245339647,UA 3245339648,3245340671,LV -3245340672,3245341695,UA 3245341696,3245342719,RU 3245342720,3245867007,GB 3245867008,3245916159,IE @@ -60097,7 +64145,6 @@ 3247064320,3247064575,CH 3247064576,3247064831,RU 3247064832,3247065087,SE -3247065088,3247065343,US 3247065344,3247065599,CH 3247065600,3247065855,SE 3247066112,3247066367,DK @@ -60137,7 +64184,6 @@ 3247076608,3247076863,DE 3247076864,3247077119,PL 3247077120,3247077375,DE -3247077888,3247078143,UA 3247078144,3247078399,AT 3247078400,3247078655,DK 3247078656,3247078911,HU @@ -60183,15 +64229,16 @@ 3247299365,3247300607,DE 3247300608,3247308799,NL 3247308800,3247309055,BG -3247309056,3247313663,FI +3247309056,3247309567,FI +3247309824,3247313663,FI 3247313664,3247313919,AM 3247313920,3247316479,FI 3247316480,3247316991,RU -3247316992,3247322111,FI +3247321600,3247322111,FI 3247322368,3247322623,DE 3247322624,3247323135,FI 3247323136,3247323647,RU -3247323648,3247324415,FI +3247324160,3247324415,FI 3247324416,3247324671,SE 3247324672,3247324927,CH 3247324928,3247333631,FI @@ -60211,17 +64258,14 @@ 3247339520,3247340543,FI 3247340544,3247340799,UA 3247340800,3247341055,CH -3247341056,3247341311,FI 3247341312,3247341567,DE -3247341568,3247345919,FI +3247343616,3247345663,FI 3247345920,3247346175,HU 3247346176,3247346943,FI 3247346944,3247347199,SI 3247347200,3247347455,FI 3247347456,3247347711,IL -3247347712,3247347967,FI 3247347968,3247348223,HU -3247348224,3247348479,FI 3247348992,3247349247,DE 3247349248,3247349503,FR 3247349504,3247349759,UA @@ -60241,7 +64285,7 @@ 3247365120,3247365375,GB 3247365376,3247365631,UA 3247365632,3247365887,SA -3247366144,3247370751,FI +3247366144,3247370495,FI 3247371008,3247371263,PL 3247371264,3247371519,SE 3247371520,3247371775,GB @@ -60251,11 +64295,14 @@ 3247372800,3247373055,RO 3247373056,3247373567,FI 3247374336,3247374591,RU -3247374592,3247380479,FI +3247375360,3247375871,FI +3247376384,3247378431,FI +3247379200,3247379455,FI 3247382528,3247382783,EU -3247382784,3247394047,FI +3247382784,3247390719,FI +3247392256,3247393791,FI 3247394048,3247394303,PL -3247394304,3247397887,FI +3247394560,3247397887,FI 3247397888,3247398143,RU 3247398144,3247399167,FI 3247399424,3247399679,RU @@ -60264,32 +64311,27 @@ 3247405056,3247405311,RO 3247405312,3247405567,PL 3247405568,3247405823,DE -3247405824,3247432191,FI +3247406080,3247431679,FI +3247431936,3247432191,FI 3247432192,3247432447,TR -3247432448,3247438079,FI +3247432448,3247437823,FI 3247438080,3247438335,IT -3247438336,3247439871,FI +3247438848,3247439871,FI 3247439872,3247702015,ES 3247702016,3247702271,RO 3247702528,3247703551,ES 3247703552,3247704063,FR -3247704832,3247705087,GB -3247705088,3247705855,ES 3247705856,3247706111,RU -3247706112,3247711743,ES +3247708160,3247711743,ES 3247711744,3247712255,IT -3247712768,3247713023,ES 3247713280,3247713535,RU 3247713536,3247713791,BE 3247713792,3247714047,SK 3247714304,3247716351,CH -3247717376,3247717631,ES -3247717888,3247718399,CH -3247718400,3247742975,ES +3247726592,3247742975,ES 3247742976,3247751167,DE 3247751168,3247769599,ES 3247769600,3247771647,DE -3247771648,3247775743,ES 3247775744,3247783935,DE 3247783936,3247792127,GB 3247792128,3247794438,FR @@ -60361,7 +64403,6 @@ 3247875328,3247875583,PL 3247875584,3247876095,DE 3247876352,3247876607,FR -3247876608,3247876863,ES 3247877120,3247877631,GR 3247877632,3247879167,AT 3247879168,3247882239,GB @@ -60380,7 +64421,8 @@ 3247909888,3247910911,DE 3247910912,3247912959,PL 3247912960,3247913983,UA -3247913984,3247915007,AT +3247913984,3247914495,DE +3247914496,3247915007,AT 3247915008,3247917055,PL 3247917056,3247918079,NL 3247918080,3247919103,PL @@ -60406,19 +64448,20 @@ 3248226304,3248357375,NO 3248357376,3248488447,DE 3248488448,3248488703,FR -3248488704,3248491519,NO +3248488704,3248490495,NO +3248490752,3248491007,NO 3248491520,3248492031,RU -3248492032,3248496895,NO +3248492544,3248496639,NO 3248496896,3248497151,IL 3248497152,3248498431,NO 3248498432,3248498687,DE 3248498688,3248504831,NO -3248513024,3248513279,NO 3248513280,3248513535,UA 3248513536,3248514047,AT -3248514048,3248521215,NO +3248514816,3248521215,NO 3248521984,3248522239,RU -3248522240,3248524287,NO +3248522240,3248522751,NO +3248523264,3248524287,NO 3248525312,3248525567,DE 3248526336,3248527359,NO 3248528384,3248528895,NO @@ -60426,13 +64469,11 @@ 3248529408,3248540671,NO 3248540672,3248541183,RU 3248541184,3248541695,SE -3248541696,3248545791,NO 3248545792,3248546815,UA 3248546816,3248547839,RU -3248547840,3248548863,NO +3248547840,3248548351,NO 3248549632,3248549887,SE -3248549888,3248553215,NO -3248553472,3248553727,NO +3248551936,3248553215,NO 3248553728,3248553983,RU 3248553984,3248554239,RO 3248554496,3248557055,NO @@ -60445,13 +64486,17 @@ 3248603392,3248603647,RU 3248603648,3248604159,NO 3248604928,3248619519,NO -3248619520,3248719871,DK +3248619520,3248624383,DK +3248624384,3248624639,US +3248624640,3248624895,DK +3248624896,3248625151,AP +3248625152,3248719871,DK 3248719872,3248720127,EU 3248720128,3248748543,DK 3248748544,3248748799,EU 3248748800,3248750591,DK 3248750592,3248750847,PT -3248750848,3248752639,PL +3248751616,3248752127,PL 3248752640,3248752895,DE 3248752896,3248753151,TR 3248753408,3248753663,GB @@ -60464,7 +64509,7 @@ 3248775168,3248783615,GB 3248783616,3248783871,PL 3248783872,3248784127,UA -3248784128,3248785407,DE +3248784128,3248784895,DE 3248785408,3248785535,SI 3248785536,3248785663,RO 3248785664,3248786943,SI @@ -60526,7 +64571,6 @@ 3249014272,3249014783,DE 3249014784,3249025023,LU 3249025536,3249025791,FR -3249025792,3249026559,LU 3249026560,3249026815,PL 3249026816,3249045503,LU 3249045504,3249078271,DE @@ -60647,7 +64691,7 @@ 3249521280,3249521343,UA 3249521344,3249537023,DE 3249537024,3249537279,PT -3249537280,3249537791,NL +3249537536,3249537791,NL 3249537792,3249538047,GB 3249538048,3249551359,NL 3249551360,3249552639,GB @@ -60657,7 +64701,8 @@ 3249574656,3249574911,UA 3249574912,3249590527,NL 3249590528,3249590783,FR -3249590784,3249600255,NL +3249590784,3249591295,NL +3249591808,3249600255,NL 3249600256,3249600511,AT 3249600512,3249601535,UA 3249601536,3249601791,RU @@ -60686,7 +64731,6 @@ 3249703680,3249703935,GB 3249703936,3249704191,FR 3249704192,3249704447,RO -3249704448,3249704703,DE 3249704704,3249704959,PL 3249704960,3249705983,UA 3249705984,3249706495,AT @@ -60707,7 +64751,6 @@ 3249711360,3249711615,DE 3249711872,3249712127,AT 3249712384,3249712639,GB -3249712640,3249712895,BE 3249712896,3249713151,DK 3249713152,3249715199,LV 3249715200,3249715455,AT @@ -60727,7 +64770,6 @@ 3249723136,3249723391,RU 3249723392,3249723647,IT 3249723648,3249723903,GB -3249723904,3249724159,TR 3249724160,3249724415,LU 3249724416,3249724671,IL 3249724672,3249724927,RU @@ -60804,7 +64846,7 @@ 3249961216,3249961471,SE 3249961472,3249961727,NL 3249961728,3249967103,SE -3249967104,3249967615,AT +3249967104,3249967615,IL 3249967616,3249967871,GB 3249967872,3249968127,SE 3249968128,3249969151,FR @@ -60906,7 +64948,8 @@ 3250277632,3250277887,DE 3250277888,3250278399,UA 3250278400,3250279423,RU -3250279424,3250323199,AT +3250279424,3250298879,AT +3250307072,3250323199,AT 3250323200,3250323455,RU 3250323456,3250323711,PL 3250324480,3250324991,GB @@ -60929,18 +64972,17 @@ 3250357904,3250357919,FR 3250357920,3250357927,PL 3250357928,3250357959,CY -3250357960,3250358015,GB +3250357960,3250357967,GB +3250357976,3250358015,GB 3250358016,3250358527,LB 3250358528,3250358783,HU -3250358784,3250359295,LB 3250359296,3250359807,HU 3250359808,3250362879,KW 3250362880,3250363391,DE 3250363392,3250363903,SE 3250363904,3250364415,DE 3250364416,3250372607,KW -3250372608,3250373375,HU -3250373376,3250373631,GB +3250372608,3250373631,HU 3250373632,3250374143,DE 3250374144,3250374655,PL 3250374656,3250374911,SA @@ -61010,7 +65052,6 @@ 3250588928,3250589183,GB 3250589184,3250589439,DE 3250589504,3250589567,HR -3250589568,3250589631,RU 3250589632,3250589695,NO 3250589696,3250593791,CH 3250593792,3250594815,GB @@ -61096,7 +65137,6 @@ 3250847744,3250978815,DE 3250978816,3251044351,HR 3251044352,3251109887,FI -3251110144,3251110655,BG 3251110656,3251110911,IT 3251110912,3251111167,FR 3251111168,3251111423,CH @@ -61136,7 +65176,7 @@ 3251127296,3251127807,UA 3251127808,3251128319,NL 3251128832,3251129343,SE -3251129344,3251129855,US +3251129344,3251129855,UA 3251129856,3251130367,CH 3251130368,3251130879,GB 3251130880,3251131391,PL @@ -61320,7 +65360,6 @@ 3251206144,3251206655,GB 3251206656,3251207167,CH 3251207168,3251207679,GB -3251207680,3251208191,RU 3251208192,3251209215,CY 3251209216,3251210239,GB 3251210240,3251211263,PL @@ -61489,13 +65528,7 @@ 3251367424,3251367935,DE 3251367936,3251372031,GB 3251372032,3251634175,IT -3251634176,3251806207,FI -3251806208,3251810047,BE -3251810048,3251812607,FI -3251812608,3251814143,BE -3251814144,3251815679,FI -3251815680,3251817471,BE -3251817472,3251896319,FI +3251634176,3251896319,FI 3251896320,3252166655,NO 3252166656,3252167679,SE 3252167680,3252176127,NL @@ -61577,8 +65610,7 @@ 3252342784,3252346367,DE 3252346368,3252346623,GB 3252346624,3252355071,GR -3252355072,3252355327,GB -3252355328,3252356351,LT +3252355072,3252356351,LT 3252356352,3252356863,EU 3252357120,3252358911,LT 3252358912,3252359167,DE @@ -61685,7 +65717,6 @@ 3252579328,3252579583,FR 3252579584,3252579839,RU 3252579840,3252580095,SE -3252580096,3252580351,UA 3252580352,3252584447,LI 3252584448,3252584703,FR 3252584704,3252584959,IL @@ -61701,7 +65732,7 @@ 3252587264,3252587519,AT 3252587520,3252587775,UA 3252587776,3252588031,SE -3252588032,3252600319,CH +3252588032,3252599807,CH 3252600320,3252600575,NL 3252600576,3252600831,RU 3252600832,3252616703,CH @@ -61978,8 +66009,7 @@ 3253704704,3253705215,UA 3253705728,3253706239,DE 3253706240,3253706751,RO -3253707264,3253708287,DE -3253708288,3253708799,RO +3253706752,3253708799,DE 3253708800,3253709311,DK 3253709312,3253709823,UA 3253709824,3253710335,RO @@ -62032,8 +66062,16 @@ 3253741680,3253741695,RU 3253741696,3253745151,GB 3253745152,3253745279,NO -3253745280,3253745919,GB -3253745920,3253746175,FR +3253745280,3253745983,GB +3253745984,3253745999,SE +3253746000,3253746007,DK +3253746008,3253746015,IE +3253746016,3253746023,AT +3253746024,3253746031,CH +3253746032,3253746039,FI +3253746040,3253746047,GB +3253746048,3253746111,IT +3253746112,3253746175,DE 3253746176,3253760511,GB 3253760512,3253760767,FR 3253760768,3253761407,GB @@ -62043,7 +66081,14 @@ 3253762816,3253762943,CH 3253762944,3253763071,GB 3253763072,3253763327,SE -3253763328,3253796863,GB +3253763328,3253765119,GB +3253765120,3253765183,ES +3253765184,3253765247,FR +3253765248,3253765279,GB +3253765280,3253765295,NL +3253765296,3253765311,BE +3253765312,3253765375,TR +3253765376,3253796863,GB 3253796864,3253862399,SE 3253862400,3253862655,GB 3253862656,3253882879,FR @@ -62131,7 +66176,6 @@ 3253964288,3253964799,PL 3253964800,3253965311,SE 3253965312,3253966335,PL -3253966336,3253966847,DE 3253966848,3253967359,UA 3253967360,3253967871,PL 3253967872,3253968895,UA @@ -62142,7 +66186,7 @@ 3253970688,3253970943,UA 3253970944,3253971967,RS 3253971968,3253972991,RU -3253972992,3253974783,GB +3253972992,3253974527,GB 3253974784,3253974847,NO 3253974848,3253974911,SE 3253974976,3253975039,SE @@ -62207,11 +66251,9 @@ 3254648832,3254649087,GB 3254649088,3254649855,AL 3254649856,3254650879,SE -3254650880,3254653439,CH 3254653440,3254654847,DE 3254654848,3254654975,DK -3254654976,3254655743,IT -3254655744,3254656255,GB +3254654976,3254655999,IT 3254656256,3254656511,BG 3254656512,3254656767,DE 3254656768,3254657023,GB @@ -62308,7 +66350,6 @@ 3254814720,3254814975,RU 3254814976,3254815231,CH 3254815232,3254815487,UA -3254815488,3254815743,GB 3254815744,3254815999,IT 3254816256,3254816511,TR 3254816512,3254816767,DE @@ -62351,7 +66392,6 @@ 3254828544,3254828799,RO 3254828800,3254829055,SI 3254829056,3254829311,NO -3254829312,3254829567,GB 3254829568,3254829823,NL 3254829824,3254830079,FR 3254830080,3254830335,IE @@ -62395,7 +66435,6 @@ 3254841344,3254841599,PL 3254841600,3254841855,IE 3254841856,3254842111,LV -3254842368,3254842623,PL 3254842624,3254842879,RU 3254842880,3254843135,SE 3254843136,3254843391,DE @@ -62475,7 +66514,8 @@ 3254908928,3254909951,RU 3254909952,3254910719,PL 3254910720,3254910975,HR -3254910976,3255120639,FR +3254910976,3255120127,FR +3255120384,3255120639,FR 3255120640,3255120895,DE 3255120896,3255123711,FR 3255123712,3255123967,DE @@ -62593,7 +66633,6 @@ 3255236864,3255237119,DE 3255237120,3255237375,AT 3255237888,3255238143,ES -3255238144,3255238399,GB 3255238400,3255238655,QA 3255238656,3255280018,BE 3255280019,3255280019,EU @@ -62709,7 +66748,6 @@ 3255413248,3255413503,LV 3255413504,3255413759,UZ 3255414528,3255414783,LV -3255414784,3255415807,BE 3255415808,3255416319,AT 3255416320,3255416831,DE 3255417856,3255418879,GB @@ -62754,7 +66792,6 @@ 3255544320,3255544575,DE 3255544576,3255544831,AT 3255544832,3255558143,CH -3255558144,3255558399,BE 3255558400,3255558655,UA 3255558656,3255563263,CH 3255563776,3255564031,CH @@ -62763,7 +66800,6 @@ 3255565312,3255565955,DE 3255565956,3255565956,EU 3255565957,3255566079,DE -3255566080,3255566335,CH 3255566336,3255570431,GB 3255570432,3255574527,CH 3255574528,3255578623,CZ @@ -62842,7 +66878,6 @@ 3256410624,3256411135,GR 3256411136,3256411647,FR 3256411648,3256412159,DE -3256412160,3256412671,GB 3256412672,3256413183,RO 3256413184,3256413695,UA 3256413696,3256414207,PL @@ -62890,7 +66925,7 @@ 3256640512,3256641535,UA 3256641536,3256642559,PL 3256642560,3256643583,SI -3256643584,3256644607,MD +3256643584,3256644607,NL 3256644608,3256645631,IT 3256645632,3256646655,SE 3256646656,3256647679,GB @@ -63051,7 +67086,6 @@ 3256975360,3256988671,GB 3256988672,3256988927,RU 3256988928,3256989183,UA -3256989184,3256989439,FR 3256989440,3256989695,GB 3256989696,3256989951,HU 3256989952,3256990207,PL @@ -63077,7 +67111,8 @@ 3257144320,3257144575,DE 3257144576,3257144831,GB 3257144832,3257145087,FR -3257145088,3257146367,GB +3257145088,3257145343,GB +3257146112,3257146367,GB 3257147392,3257180159,GB 3257180160,3257180415,TR 3257180416,3257180671,RU @@ -63086,7 +67121,6 @@ 3257181184,3257181439,SA 3257181440,3257181695,PL 3257181696,3257181951,FR -3257181952,3257182207,BG 3257182208,3257182463,PL 3257182464,3257186303,GB 3257188352,3257196543,GB @@ -63108,7 +67142,7 @@ 3257357568,3257357823,SI 3257357824,3257371903,DE 3257371904,3257372159,EU -3257372160,3257372671,GB +3257372416,3257372671,GB 3257372672,3257382911,DE 3257382912,3257383167,NL 3257383168,3257383679,DE @@ -63132,12 +67166,9 @@ 3257470976,3257471999,FI 3257472000,3257472511,SG 3257472512,3257475071,FI -3257475072,3257475327,ES -3257475328,3257475583,FI -3257475584,3257477119,DE -3257477120,3257477375,NL -3257477376,3257477887,SE -3257479168,3257481471,GB +3257476096,3257477119,DE +3257480192,3257480447,GB +3257481216,3257481471,GB 3257481472,3257481727,DE 3257481728,3257481983,FI 3257481984,3257482239,FR @@ -63151,9 +67182,7 @@ 3257542912,3257543423,IT 3257543424,3257543679,PT 3257543680,3257544191,RO -3257544192,3257544447,DE -3257544448,3257544575,DK -3257544576,3257544703,DE +3257544192,3257544703,DE 3257544704,3257544959,CH 3257544960,3257545215,DK 3257545216,3257546495,GR @@ -63163,8 +67192,8 @@ 3257546688,3257546719,DE 3257546720,3257546751,DK 3257546752,3257548799,IE -3257548800,3257554943,GB -3257554944,3257555455,CH +3257548800,3257555199,GB +3257555200,3257555455,CH 3257555456,3257556991,GB 3257557504,3257558015,LU 3257558016,3257559039,RO @@ -63245,7 +67274,7 @@ 3258023424,3258023679,TR 3258023680,3258023935,RU 3258023936,3258056703,DE -3258057216,3258057727,CZ +3258057216,3258057471,CZ 3258058240,3258058495,RU 3258058496,3258059007,RO 3258059008,3258059263,UA @@ -63271,7 +67300,6 @@ 3258069248,3258069503,PL 3258069504,3258069759,RO 3258069760,3258070015,UA -3258070016,3258070271,GB 3258070272,3258070527,PL 3258070528,3258071295,GB 3258071296,3258071551,DK @@ -63300,7 +67328,6 @@ 3258079488,3258079743,PL 3258079744,3258079999,GB 3258080000,3258080255,BE -3258080256,3258080511,FR 3258080512,3258080767,DE 3258081024,3258081279,FR 3258081280,3258081535,NL @@ -63355,7 +67382,6 @@ 3258099456,3258099711,UA 3258099712,3258099967,FI 3258099968,3258100223,UA -3258100480,3258100735,DK 3258100736,3258100991,CH 3258100992,3258101247,AT 3258101248,3258101503,RO @@ -63364,7 +67390,6 @@ 3258102016,3258102271,BE 3258102272,3258102527,CH 3258102528,3258102783,TR -3258102784,3258103039,PL 3258103040,3258103295,SE 3258103296,3258103551,DE 3258103552,3258103807,AE @@ -63380,7 +67405,7 @@ 3258111744,3258118399,CZ 3258118400,3258118655,UA 3258118656,3258119679,CZ -3258120192,3258121215,CZ +3258120192,3258120703,CZ 3258121216,3258121471,PL 3258121728,3258121983,UA 3258121984,3258122239,RU @@ -63391,7 +67416,8 @@ 3258249216,3258253311,NO 3258253312,3258272767,NL 3258272768,3258273791,FR -3258273792,3258297343,NL +3258273792,3258290175,NL +3258294272,3258297343,NL 3258297344,3258297599,BE 3258297600,3258298111,NL 3258298112,3258298367,GB @@ -63429,7 +67455,9 @@ 3258427648,3258427903,RO 3258427904,3258428159,DE 3258428416,3258449919,DE -3258449920,3258503935,CH +3258449920,3258486783,CH +3258486784,3258487807,LI +3258487808,3258503935,CH 3258503936,3258504191,PL 3258504192,3258504703,CH 3258504704,3258504959,DE @@ -63476,7 +67504,7 @@ 3258764288,3258764543,DE 3258764800,3258765055,BE 3258765056,3258765311,NL -3258765312,3258767615,GB +3258767360,3258767615,GB 3258767616,3258767871,CH 3258767872,3258769919,GB 3258769920,3258770431,PL @@ -63507,7 +67535,7 @@ 3258818048,3258818303,SE 3258818560,3258843135,GB 3258843136,3258843391,RU -3258843392,3258847231,GB +3258843648,3258847231,GB 3258848256,3258848767,GB 3258848768,3258849023,RO 3258849024,3258849279,DE @@ -63594,7 +67622,6 @@ 3259351552,3259352063,FR 3259352064,3259352575,CH 3259352576,3259353087,IE -3259353088,3259354111,NO 3259354112,3259354367,NL 3259354368,3259354623,DE 3259354880,3259355135,PL @@ -63623,7 +67650,7 @@ 3259543552,3259760639,GB 3259760640,3259814399,DE 3259814400,3259814655,AT -3259814656,3259821823,DE +3259814656,3259821055,DE 3259821824,3259822079,AT 3259822080,3259823103,DE 3259823104,3259823615,RO @@ -63642,7 +67669,7 @@ 3259961344,3259962367,FI 3259962368,3259963391,UA 3259963392,3259964415,PL -3259964416,3259965439,GB +3259964416,3259965439,EU 3259965440,3259966463,RU 3259967488,3259968511,RS 3259968512,3259969535,RU @@ -63729,7 +67756,7 @@ 3260678144,3260743679,IL 3260743680,3260809215,IT 3260809216,3260874751,PL -3260874752,3260893439,DK +3260891136,3260893439,DK 3260893440,3260894207,SE 3260894208,3260895231,AT 3260895232,3260898303,SE @@ -63744,9 +67771,10 @@ 3260906496,3260907519,PL 3260907520,3260915711,GB 3260915712,3260923903,UA -3260923904,3260938751,DE +3260923904,3260938751,IT 3260938752,3260939007,US -3260939008,3261071359,DE +3260939008,3260940287,IT +3260940288,3261071359,DE 3261071360,3261136895,AT 3261136896,3261150143,DE 3261150144,3261150207,US @@ -63764,7 +67792,8 @@ 3261239239,3261267967,FR 3261267968,3261280512,DE 3261280513,3261280513,EU -3261280514,3261297663,DE +3261280514,3261281023,DE +3261281280,3261297663,DE 3261297664,3261297919,RU 3261297920,3261298175,PL 3261298176,3261333503,DE @@ -63787,13 +67816,11 @@ 3261675520,3261675775,LV 3261675776,3261676031,IT 3261676800,3261677055,IT -3261677056,3261685759,GB +3261677568,3261685759,GB 3261685760,3261687807,DE 3261687808,3261689855,RO 3261689856,3261690351,GB -3261690352,3261690352,EU -3261690353,3261690354,SG -3261690355,3261690355,EU +3261690352,3261690355,EU 3261690356,3261690623,GB 3261690624,3261690879,AU 3261690880,3261691903,GB @@ -63873,16 +67900,16 @@ 3261857792,3261923327,CZ 3261923328,3261988863,NL 3261988864,3261989119,SE -3261989120,3261990399,FI +3261989120,3261989631,FI +3261990144,3261990399,FI 3261990400,3261990655,UA -3261990656,3261993471,FI +3261990656,3261990911,FI +3261992448,3261993215,FI 3261993472,3261993727,RU 3261993728,3261995263,FI 3261995264,3261995519,DE 3261995520,3261995775,PL -3261995776,3261996031,FI -3261996032,3261996287,NL -3261996288,3262005247,FI +3261995776,3262005247,FI 3262005248,3262005759,PL 3262005760,3262006015,RU 3262006016,3262006271,NL @@ -63901,15 +67928,14 @@ 3262017536,3262018559,FI 3262018560,3262018815,PL 3262018816,3262019071,FI -3262019328,3262021119,FI +3262020096,3262021119,FI 3262021120,3262021375,UA 3262021376,3262021631,PL 3262021632,3262021887,CH 3262021888,3262022143,UA -3262022144,3262022911,FI 3262022912,3262023167,DE 3262023680,3262023935,DK -3262023936,3262026239,FI +3262023936,3262025727,FI 3262027264,3262027519,TR 3262027520,3262027775,BE 3262027776,3262028287,RU @@ -63956,7 +67982,6 @@ 3262050816,3262051071,CH 3262051072,3262051583,GB 3262051584,3262051839,FR -3262052352,3262052607,UA 3262052608,3262052863,IL 3262052864,3262053119,GB 3262053120,3262053375,RU @@ -64026,7 +68051,9 @@ 3262224896,3262225151,AT 3262225152,3262227711,DE 3262227712,3262227967,RO -3262227968,3262283775,DE +3262227968,3262229247,DE +3262229248,3262229503,NL +3262229504,3262283775,DE 3262283776,3262284799,RU 3262284800,3262286847,UA 3262286848,3262287871,SE @@ -64096,7 +68123,6 @@ 3262460672,3262460927,AE 3262460928,3262461055,CY 3262461056,3262461183,DK -3262461184,3262461311,SN 3262461312,3262461439,NO 3262461440,3262461567,DE 3262461568,3262461695,GB @@ -64160,9 +68186,7 @@ 3262475480,3262475483,US 3262475484,3262475523,DE 3262475524,3262475527,US -3262475528,3262475555,DE -3262475556,3262475559,US -3262475560,3262476235,DE +3262475528,3262476235,DE 3262476236,3262476239,US 3262476240,3262476275,DE 3262476276,3262476279,CA @@ -64262,12 +68286,13 @@ 3262754816,3262832639,NL 3262832640,3262840319,DE 3262840320,3262906367,NL -3262906368,3262964991,CH +3262906368,3262954495,CH +3262954496,3262955519,LI +3262955520,3262964991,CH 3262964992,3262965247,DE 3262965248,3262971903,CH 3262971904,3263029247,IE 3263029248,3263030271,UA -3263030272,3263031295,GB 3263031296,3263032319,TR 3263032320,3263033343,RU 3263033344,3263033855,LV @@ -64350,7 +68375,11 @@ 3263102208,3263102463,RO 3263102464,3263102719,PL 3263102720,3263102975,GR -3263102976,3263121407,DE +3263102976,3263104030,DE +3263104031,3263104031,FR +3263104032,3263104040,DE +3263104041,3263104041,GB +3263104042,3263121407,DE 3263121408,3263121420,EU 3263121421,3263121421,BE 3263121422,3263121663,EU @@ -64399,7 +68428,9 @@ 3263647744,3263651839,LT 3263651840,3263666175,RU 3263666176,3263676415,AZ -3263676416,3263692799,RU +3263676416,3263678463,RU +3263678464,3263680511,DE +3263680512,3263692799,RU 3263692800,3263823871,FI 3263823872,3263826943,DE 3263826944,3263827199,AT @@ -64412,7 +68443,6 @@ 3263979520,3263987711,DE 3263987712,3264004095,ES 3264004096,3264012287,HU -3264012288,3264012543,AT 3264012544,3264013055,GB 3264013056,3264013311,TR 3264013312,3264013567,UA @@ -64423,7 +68453,6 @@ 3264014848,3264015103,IE 3264015104,3264015359,RO 3264015360,3264015615,DK -3264015616,3264015871,UA 3264015872,3264016127,PT 3264016128,3264016383,UA 3264016384,3264016639,SE @@ -64466,7 +68495,6 @@ 3264298752,3264299007,BG 3264299008,3264307199,DE 3264307200,3264311295,PL -3264311296,3264311551,FR 3264311808,3264312063,DE 3264312064,3264312319,EU 3264312320,3264312575,PL @@ -64556,14 +68584,12 @@ 3264386048,3264387071,IR 3264387072,3264388095,LB 3264389120,3264390143,RU -3264390144,3264391167,IR 3264391168,3264392191,SE 3264392192,3264393215,FR 3264393216,3264394239,DE 3264394240,3264395263,UA 3264395264,3264396287,AT 3264396288,3264397311,UA -3264397312,3264398335,GB 3264398336,3264399359,UA 3264399360,3264400383,RU 3264401408,3264402431,DE @@ -64576,7 +68602,8 @@ 3264409600,3264410623,RU 3264410624,3264411647,NO 3264411648,3264413695,PL -3264413696,3264431103,CH +3264413696,3264430079,CH +3264430592,3264431103,CH 3264431104,3264431615,LI 3264431616,3264431871,CH 3264432128,3264441343,CH @@ -64628,7 +68655,6 @@ 3264624640,3264624671,US 3264624672,3264626687,GB 3264626688,3264627711,EE -3264627712,3264628735,GR 3264628736,3264630783,UA 3264630784,3264631807,DE 3264631808,3264632831,RO @@ -64711,7 +68737,6 @@ 3264790528,3264806911,HR 3264806912,3264815103,GB 3264815104,3264825343,SE -3264825344,3264825599,NO 3264825856,3264826111,NL 3264826112,3264826367,GB 3264826880,3264827135,NL @@ -64730,7 +68755,6 @@ 3264831488,3264831743,CH 3264831744,3264831999,FR 3264832000,3264832255,IE -3264832256,3264832511,IT 3264832512,3264832767,DE 3264832768,3264833023,IL 3264833536,3264834047,DE @@ -64750,7 +68774,7 @@ 3264840192,3264840447,DE 3264840448,3264840703,IT 3264840704,3264840959,PT -3264840960,3264841471,PL +3264841216,3264841471,PL 3264841472,3264841727,LV 3264841728,3264844031,GB 3264844032,3264844287,BG @@ -64758,7 +68782,6 @@ 3264844800,3264845311,UA 3264845312,3264845951,DE 3264845952,3264846079,GB -3264846080,3264846207,UG 3264846208,3264846335,AE 3264846336,3264846463,GB 3264846464,3264846591,NO @@ -64806,7 +68829,7 @@ 3265015808,3265016063,EU 3265016064,3265018879,DE 3265018880,3265019903,HK -3265019904,3265045759,DE +3265036288,3265045759,DE 3265045760,3265046015,TR 3265046016,3265055231,DE 3265055232,3265055743,FR @@ -65061,7 +69084,9 @@ 3266617328,3266617343,GB 3266617344,3266634383,DE 3266634392,3266634399,EE -3266634400,3266641919,DE +3266634400,3266634431,DE +3266634464,3266634751,DE +3266635520,3266641919,DE 3266641920,3266707455,PL 3266707456,3266772991,DK 3266772992,3266781183,IT @@ -65119,7 +69144,6 @@ 3267080192,3267081215,AT 3267081216,3267082239,PL 3267082240,3267083263,DE -3267083264,3267084287,RO 3267084288,3267085311,FR 3267085312,3267086335,RU 3267086336,3267087359,PL @@ -65134,7 +69158,7 @@ 3267095552,3267096575,PL 3267096576,3267097599,DE 3267097600,3267098623,KZ -3267098624,3267099647,GB +3267098624,3267099647,EU 3267099648,3267100671,IT 3267100672,3267166207,FI 3267166208,3267231743,GB @@ -65294,8 +69318,8 @@ 3268236800,3268238335,EU 3268238336,3268238359,GB 3268238360,3268238367,EU -3268238368,3268238383,GB -3268238384,3268238471,EU +3268238368,3268238399,GB +3268238400,3268238471,EU 3268238472,3268238543,GB 3268238544,3268238551,EU 3268238552,3268238847,GB @@ -65481,7 +69505,6 @@ 3268741376,3268741631,LV 3268741888,3268742143,AT 3268742144,3268742399,RU -3268742400,3268742655,CZ 3268742656,3268742911,BE 3268742912,3268743167,NL 3268743168,3268743423,RO @@ -65708,9 +69731,13 @@ 3270152704,3270153727,FI 3270153728,3270166527,EU 3270166528,3270167551,NO -3270167552,3270235135,EU -3270235136,3270236159,NL -3270236160,3270246399,EU +3270167552,3270205439,EU +3270205440,3270207487,ES +3270207488,3270208511,EU +3270208512,3270209535,NL +3270209536,3270234111,EU +3270234112,3270242303,NL +3270242304,3270246399,EU 3270246400,3270377471,SE 3270377472,3270443007,GB 3270443008,3270508543,DK @@ -65724,14 +69751,14 @@ 3270644224,3270644735,NL 3270644736,3270645247,DE 3270645760,3270646271,IL -3270646272,3270647807,RU +3270646272,3270646783,RU +3270647296,3270647807,RU 3270647808,3270648063,TR 3270648064,3270648319,RU 3270648320,3270648575,CH 3270648576,3270648831,AT 3270648832,3270649087,SI 3270649088,3270649343,AT -3270649344,3270649599,DK 3270649600,3270649855,PL 3270649856,3270650111,DK 3270650112,3270650367,AT @@ -65763,7 +69790,7 @@ 3270901760,3270905855,IT 3270905856,3270906111,EU 3270906112,3270909951,IT -3270909952,3270911807,DE +3270909952,3270911743,DE 3270911840,3270911871,PL 3270911872,3270911935,DE 3270911936,3270911967,PL @@ -65806,8 +69833,7 @@ 3270973952,3270974463,FR 3270974464,3270974975,IT 3270974976,3270975487,NL -3270975488,3270975743,RU -3270975744,3270975999,UA +3270975488,3270975999,RU 3270976000,3270976255,FR 3270976256,3270976511,UA 3270976512,3270976767,HU @@ -65999,9 +70025,7 @@ 3272020992,3272024063,DK 3272024064,3272032255,IE 3272032256,3272040447,SE -3272040448,3272041885,FR -3272041886,3272041886,EU -3272041887,3272048639,FR +3272040448,3272048639,FR 3272048640,3272056831,NL 3272056832,3272065023,RU 3272065024,3272073727,GB @@ -66200,7 +70224,7 @@ 3272225920,3272226047,IT 3272226048,3272226815,FR 3272226816,3272227071,GB -3272227072,3272227327,FR +3272227072,3272227327,PT 3272227328,3272227359,US 3272227360,3272227511,GB 3272227512,3272227519,EU @@ -66247,7 +70271,6 @@ 3272268288,3272268543,UA 3272268800,3272269055,IL 3272269056,3272269311,GB -3272269312,3272269567,IL 3272269568,3272351743,GB 3272351744,3272352767,PL 3272352768,3272353791,UA @@ -66311,7 +70334,6 @@ 3272480512,3272480767,CH 3272480768,3272481023,DE 3272481024,3272481279,SE -3272481536,3272481791,FR 3272481792,3272482047,IT 3272482048,3272482303,NL 3272482304,3272482559,PL @@ -66454,7 +70476,7 @@ 3273036288,3273036799,BG 3273037312,3273037823,GB 3273038336,3273038847,GR -3273038848,3273039871,GB +3273039360,3273039871,GB 3273039872,3273048063,LT 3273048064,3273056255,IT 3273056256,3273064447,MD @@ -66539,8 +70561,8 @@ 3273331752,3273331791,GB 3273331792,3273331807,EU 3273331808,3273331823,GB -3273331824,3273331831,EU -3273331832,3273331887,GB +3273331824,3273331827,EU +3273331828,3273331887,GB 3273331888,3273331903,EU 3273331904,3273331967,GB 3273331968,3273332031,DE @@ -66557,7 +70579,10 @@ 3273334272,3273334783,DE 3273334784,3273335039,AE 3273335040,3273335295,DE -3273335296,3273335935,EU +3273335296,3273335423,GB +3273335424,3273335431,EU +3273335432,3273335439,GB +3273335440,3273335935,EU 3273335936,3273335999,DE 3273336000,3273336847,EU 3273336848,3273336863,DE @@ -66640,9 +70665,7 @@ 3273365768,3273365887,EU 3273365888,3273366015,FR 3273366016,3273366527,DE -3273366528,3273367295,EU -3273367296,3273367423,DE -3273367424,3273367551,EU +3273366528,3273367551,GB 3273367552,3273367567,DE 3273367568,3273368063,EU 3273368064,3273368575,DE @@ -66796,7 +70819,6 @@ 3273785344,3273801727,RU 3273801728,3273802239,DE 3273802752,3273803263,SA -3273803264,3273803775,ES 3273803776,3273804287,CH 3273804288,3273804799,UA 3273804800,3273805311,RO @@ -66837,8 +70859,6 @@ 3273873920,3273874431,GB 3273874432,3273875455,GR 3273875456,3273875711,PT -3273875712,3273875967,SE -3273875968,3273876223,DE 3273876224,3273876479,IT 3273876480,3273876991,SE 3273877248,3273877503,DE @@ -66898,7 +70918,7 @@ 3274167296,3274167807,BG 3274168320,3274168831,PL 3274168832,3274169343,DZ -3274169344,3274170367,DE +3274169856,3274170367,DE 3274170368,3274170879,TR 3274170880,3274171391,DE 3274171392,3274171903,RU @@ -66910,7 +70930,6 @@ 3274174208,3274174463,CZ 3274174464,3274175487,UA 3274175488,3274175999,BE -3274176000,3274176511,DE 3274176512,3274177023,UA 3274178048,3274178559,NL 3274178560,3274244095,GB @@ -66928,7 +70947,7 @@ 3274338816,3274339327,DE 3274339328,3274339839,RO 3274339840,3274340351,RU -3274340352,3274340863,IE +3274340352,3274340863,DE 3274340864,3274341375,RU 3274341376,3274341887,FR 3274341888,3274342399,UA @@ -67209,7 +71228,6 @@ 3274690304,3274690559,GB 3274690560,3274690815,GR 3274690816,3274691071,ES -3274691072,3274691327,DK 3274691328,3274691583,SI 3274691840,3274692095,SI 3274692096,3274692351,RO @@ -67326,7 +71344,6 @@ 3275120640,3275137023,SE 3275137536,3275138047,UA 3275138048,3275138559,DE -3275138560,3275139071,UA 3275139072,3275139583,PT 3275140096,3275140607,AT 3275140608,3275141119,NL @@ -67461,9 +71478,7 @@ 3275474952,3275474959,EU 3275474960,3275475039,GB 3275475040,3275475043,EU -3275475044,3275475071,GB -3275475072,3275475199,EU -3275475200,3275476223,GB +3275475044,3275476223,GB 3275476224,3275476287,EU 3275476288,3275476479,GB 3275476480,3275476655,EU @@ -67489,8 +71504,8 @@ 3275485376,3275485407,EU 3275485408,3275485423,GB 3275485424,3275485439,EU -3275485440,3275485823,GB -3275485824,3275488767,EU +3275485440,3275485759,GB +3275485760,3275488767,EU 3275488768,3275489279,CZ 3275489280,3275497471,GB 3275497472,3275505663,DE @@ -67806,7 +71821,6 @@ 3276076544,3276077055,DE 3276077568,3276078079,FR 3276078080,3276078591,RU -3276078592,3276079103,GB 3276079104,3276095487,NO 3276095488,3276096511,RU 3276096512,3276097535,IT @@ -67824,7 +71838,7 @@ 3276109824,3276110847,BG 3276110848,3276111871,PL 3276111872,3276112895,DK -3276112896,3276114943,UA +3276112896,3276113919,UA 3276115968,3276116991,NL 3276116992,3276118015,RU 3276118016,3276119039,GB @@ -67965,7 +71979,7 @@ 3276680704,3276681215,AT 3276681728,3276682239,BE 3276682240,3276682751,AT -3276683264,3276684287,UA +3276683776,3276684287,UA 3276684288,3276684799,RU 3276684800,3276685311,DE 3276685312,3276685823,RO @@ -67989,7 +72003,7 @@ 3276695040,3276695551,RU 3276695552,3276696063,UA 3276696064,3276696575,RO -3276696576,3276697087,EU +3276696576,3276697087,CZ 3276697088,3276697599,GB 3276697600,3276698111,UA 3276698112,3276699647,RU @@ -68043,7 +72057,7 @@ 3276858112,3276858367,KW 3276858368,3276858623,RU 3276858624,3276858879,PL -3276859136,3276859647,UA +3276859392,3276859647,UA 3276859648,3276859903,CH 3276859904,3276860159,AT 3276860160,3276860415,EU @@ -68055,7 +72069,9 @@ 3276866304,3276866559,EU 3276866560,3276866815,IT 3276866816,3276867071,EU -3276867072,3276873983,GB +3276867072,3276870911,GB +3276870912,3276871423,IT +3276871424,3276873983,GB 3276873984,3276874239,ES 3276874240,3276876383,GB 3276876384,3276876415,NL @@ -68073,7 +72089,11 @@ 3276893696,3276893951,IT 3276893952,3276898671,GB 3276898672,3276898687,CH -3276898688,3276903167,GB +3276898688,3276902141,GB +3276902142,3276902142,CH +3276902143,3276902655,GB +3276902656,3276902911,SE +3276902912,3276903167,GB 3276903168,3276903679,SE 3276903680,3276907341,GB 3276907342,3276907342,EU @@ -68084,13 +72104,17 @@ 3276908544,3276908799,SE 3276908800,3276909823,GB 3276909824,3276910079,SE -3276910080,3276911615,GB +3276910080,3276911167,GB +3276911168,3276911199,IT +3276911200,3276911615,GB 3276911616,3276911871,IT 3276911872,3276912207,GB 3276912208,3276912215,IT 3276912216,3276912383,GB 3276912384,3276912511,IT -3276912512,3276912879,GB +3276912512,3276912671,GB +3276912672,3276912687,IT +3276912688,3276912879,GB 3276912880,3276912895,IT 3276912896,3276917231,GB 3276917232,3276917247,FR @@ -68305,15 +72329,15 @@ 3277403312,3277403327,GB 3277403328,3277403359,FR 3277403360,3277403391,GB -3277403392,3277403439,FR -3277403440,3277403647,GB +3277403392,3277403455,FR +3277403456,3277403647,GB 3277403648,3277403807,ES 3277403808,3277404159,GB 3277404160,3277404415,DE 3277404416,3277404511,IT 3277404512,3277404527,GB -3277404528,3277404649,IT -3277404650,3277404671,GB +3277404528,3277404655,IT +3277404656,3277404671,GB 3277404672,3277404735,CH 3277404736,3277404927,GB 3277404928,3277404975,NL @@ -68410,7 +72434,8 @@ 3277717504,3277725695,YE 3277725696,3277733887,CH 3277733888,3277742079,DE -3277742080,3277750271,FI +3277742080,3277746175,FI +3277746176,3277750271,GB 3277750272,3277766655,IT 3277766656,3277774847,PL 3277774848,3277783039,RU @@ -68545,7 +72570,7 @@ 3278775296,3278775807,GB 3278775808,3278776319,IR 3278776320,3278776831,IL -3278776832,3278777343,ES +3278776832,3278777343,DE 3278777344,3278777855,SE 3278777856,3278778367,RU 3278778368,3278779391,PL @@ -68921,7 +72946,6 @@ 3280576512,3280576767,BY 3280576768,3280577279,PL 3280577280,3280577535,DE -3280577536,3280577791,IL 3280577792,3280578047,NL 3280578048,3280578303,RO 3280578304,3280578559,UA @@ -68947,7 +72971,6 @@ 3280583936,3280584191,PL 3280584192,3280584447,KW 3280584448,3280584703,DE -3280584704,3280585215,UA 3280585216,3280585727,DK 3280585728,3280586239,UA 3280586240,3280586751,DE @@ -69056,7 +73079,9 @@ 3280958920,3280958927,DE 3280958928,3280963375,GB 3280963376,3280963383,DE -3280963384,3280994559,GB +3280963384,3280991231,GB +3280991232,3280991743,DE +3280991744,3280994559,GB 3280994560,3280994815,RU 3280994816,3280995071,NL 3280995072,3280995327,DE @@ -69146,7 +73171,6 @@ 3281344768,3281345279,RU 3281345280,3281345535,SA 3281345536,3281345791,CH -3281345792,3281346047,RU 3281346048,3281346303,SI 3281346304,3281346559,PL 3281346560,3281346815,UA @@ -69421,7 +73445,6 @@ 3283486464,3283486719,UA 3283486720,3283486975,RU 3283486976,3283487231,PL -3283487232,3283487487,FR 3283487488,3283487743,DE 3283487744,3283487999,CH 3283488000,3283488255,NL @@ -69529,7 +73552,8 @@ 3283944448,3283945471,AT 3283945472,3283946495,UA 3283946496,3283947519,GB -3283947520,3283948543,UA +3283947520,3283947775,UA +3283947776,3283948543,RU 3283948544,3283949567,NL 3283949568,3283950591,SE 3283950592,3283951615,KZ @@ -69572,7 +73596,6 @@ 3283983872,3283984383,GB 3283984384,3283984895,SE 3283984896,3283985407,GR -3283985408,3283985919,RO 3283985920,3283986431,AT 3283986944,3283987455,AT 3283987456,3283987967,GB @@ -69641,7 +73664,8 @@ 3284016384,3284016639,CH 3284016640,3284017151,DK 3284017152,3284025343,GR -3284025344,3284030479,GB +3284025344,3284030471,GB +3284030472,3284030479,IL 3284030480,3284030495,FR 3284030496,3284033535,GB 3284033536,3284041727,RU @@ -69961,8 +73985,7 @@ 3285406720,3285407743,UA 3285407744,3285408767,RU 3285408768,3285409791,GB -3285409792,3285410815,UA -3285410816,3285412863,RU +3285409792,3285412863,RU 3285412864,3285413887,UA 3285413888,3285414911,RU 3285414912,3285415935,UA @@ -70076,7 +74099,6 @@ 3285763584,3285764095,DE 3285764096,3285764607,RU 3285765120,3285766143,UA -3285766144,3285766655,DE 3285766656,3285767679,UA 3285767680,3285768191,FR 3285768192,3285768703,RU @@ -70125,16 +74147,26 @@ 3285911552,3285912447,GB 3285912448,3285913647,EU 3285913648,3285913655,IE -3285913656,3285913687,GB -3285913688,3285917695,EU +3285913656,3285913703,GB +3285913704,3285913707,EU +3285913708,3285913711,FI +3285913712,3285917695,EU 3285917696,3285917703,GB -3285917704,3285919743,EU +3285917704,3285917711,EU +3285917712,3285917759,GB +3285917760,3285919743,EU 3285919744,3285921791,QA 3285921792,3285922047,EU 3285922048,3285922303,FR -3285922304,3285926431,EU +3285922304,3285924911,EU +3285924912,3285924919,CH +3285924920,3285925163,EU +3285925164,3285925171,CH +3285925172,3285926431,EU 3285926432,3285926463,CH -3285926464,3285928303,EU +3285926464,3285926591,EU +3285926592,3285926623,DE +3285926624,3285928303,EU 3285928304,3285928311,GB 3285928312,3285931527,EU 3285931528,3285931535,DE @@ -70231,7 +74263,6 @@ 3286345728,3286346751,IT 3286346752,3286347775,UA 3286347776,3286348799,PA -3286348800,3286349823,PL 3286349824,3286350847,SE 3286350848,3286351871,GB 3286351872,3286352895,CH @@ -70383,7 +74414,6 @@ 3286907648,3286907903,ES 3286907904,3286908159,CH 3286908160,3286908415,ES -3286908672,3286908927,PL 3286908928,3286909951,CH 3286909952,3286913023,UA 3286913024,3286913535,GB @@ -70423,7 +74453,6 @@ 3286932736,3286932991,AT 3286932992,3286933247,IL 3286933504,3286933759,DK -3286933760,3286934015,RO 3286934016,3286934271,BE 3286934272,3286934527,CH 3286934528,3286934783,PL @@ -70540,7 +74569,6 @@ 3287434240,3287434751,PL 3287434752,3287435263,GB 3287435264,3287435775,NL -3287435776,3287436287,GB 3287436288,3287436799,RS 3287436800,3287437311,RO 3287437312,3287437823,UA @@ -70605,7 +74633,7 @@ 3287467008,3287468031,SA 3287468032,3287469055,UA 3287469056,3287471103,DE -3287471104,3287472127,GB +3287471104,3287472127,EU 3287472128,3287472639,RU 3287472640,3287473151,UA 3287473152,3287474175,GB @@ -70648,7 +74676,6 @@ 3287636480,3287636991,IE 3287636992,3287637503,AT 3287637504,3287638015,PL -3287638528,3287639039,DE 3287639040,3287639551,GB 3287640064,3287640575,PL 3287640576,3287641087,SI @@ -70672,7 +74699,6 @@ 3287665152,3287665407,NO 3287665408,3287665919,PL 3287665920,3287666431,RU -3287666432,3287666687,DK 3287666688,3287666943,SI 3287666944,3287667199,CZ 3287667200,3287667455,DK @@ -70694,7 +74720,6 @@ 3287671296,3287671551,PL 3287671552,3287671807,TR 3287671808,3287672063,CH -3287672064,3287672319,LT 3287672320,3287672575,DE 3287672576,3287672831,NL 3287672832,3287673087,RU @@ -70740,7 +74765,7 @@ 3287728128,3287729407,IT 3287729664,3287729919,DK 3287729920,3287730175,HU -3287730176,3287732223,DE +3287731200,3287732223,DE 3287732224,3287734271,IT 3287734272,3287734527,PL 3287734528,3287734783,UA @@ -70959,9 +74984,10 @@ 3288485888,3288489983,MA 3288489984,3288514559,ZA 3288514560,3288522751,EG +3288522752,3288530943,ZA 3288530944,3288532991,JM 3288532992,3288534527,PR -3288534528,3288535039,MG +3288534528,3288535039,EG 3288535040,3288539135,CW 3288539136,3288540415,US 3288540416,3288540671,BR @@ -71045,10 +75071,11 @@ 3289020160,3289020415,UG 3289020416,3289020671,EG 3289020672,3289020927,ZA +3289020928,3289021439,CI 3289021440,3289024767,ZA 3289024768,3289025023,GH 3289025024,3289025535,UG -3289026048,3289027327,ZA +3289025536,3289027327,ZA 3289027328,3289027583,TZ 3289027584,3289027839,MZ 3289027840,3289041407,ZA @@ -71073,16 +75100,19 @@ 3289081856,3289082111,NG 3289082112,3289086975,ZA 3289086976,3289087231,SZ -3289087232,3289093631,ZA +3289087232,3289089791,ZA +3289089792,3289090047,MZ +3289090048,3289093631,ZA 3289093632,3289094143,NG -3289096192,3289100287,ZA +3289096192,3289100031,ZA +3289100032,3289100287,LS 3289102336,3289103359,NG 3289103360,3289103615,ZA +3289103616,3289103871,AO 3289103872,3289104383,KE 3289104384,3289114367,ZA 3289114368,3289114623,NG -3289114624,3289119231,ZA -3289119744,3289120511,ZA +3289114624,3289120511,ZA 3289120512,3289120767,TZ 3289120768,3289123327,PR 3289123328,3289123583,NA @@ -71097,10 +75127,16 @@ 3289186304,3289212159,ZA 3289212160,3289212415,MZ 3289214976,3289215231,NG -3289215232,3289229311,ZA +3289215232,3289217279,ZA +3289217280,3289217535,KE +3289218560,3289220351,ZA +3289220352,3289220607,TZ +3289220608,3289229311,ZA 3289229312,3289229567,SZ 3289229824,3289230591,ZA -3289233408,3289235199,ZA +3289233408,3289233919,ZA +3289233920,3289234175,TZ +3289234176,3289235199,ZA 3289235200,3289235455,KE 3289237504,3289243391,ZA 3289243392,3289243647,BI @@ -71138,27 +75174,7 @@ 3290031360,3290060287,ZA 3290060288,3290060543,SZ 3290060544,3290103807,ZA -3290103808,3290104319,JO -3290104320,3290104831,EG -3290104832,3290106879,VE -3290106880,3290107135,CL -3290107136,3290107391,US -3290107392,3290107647,CA -3290107648,3290108415,US -3290108416,3290108671,CA -3290108672,3290108927,US -3290108928,3290109183,GH -3290109184,3290109439,MU -3290109440,3290109695,ET -3290109696,3290110207,PR -3290110208,3290110463,US -3290110464,3290110719,ES -3290110720,3290110975,DO -3290110976,3290111487,US -3290111488,3290111743,MX -3290111744,3290116095,US -3290116096,3290118399,PE -3290118400,3290120191,US +3290103808,3290120191,CA 3290120192,3290128383,MU 3290128384,3290136575,ZW 3290136576,3290169343,NG @@ -71222,8 +75238,7 @@ 3291045888,3291078655,ZA 3291078656,3291086847,DZ 3291086848,3291103231,PR -3291103232,3291119615,ZA -3291152384,3291168767,ZA +3291103232,3291168767,ZA 3291168768,3291176959,TZ 3291176960,3291185151,ZW 3291185152,3291201535,UG @@ -71358,6 +75373,8 @@ 3291546112,3291546367,NA 3291546368,3291546623,BI 3291546624,3291546879,SZ +3291546880,3291547135,TZ +3291547136,3291547391,AO 3291742208,3292004351,US 3292004352,3292266495,SC 3292397568,3292528639,ZA @@ -71366,7 +75383,7 @@ 3300925440,3300929535,MG 3300933632,3300950015,MU 3300953088,3300954111,MU -3300982784,3301113855,ZA +3300966400,3301113855,ZA 3301113856,3301146623,NG 3301146624,3301175295,ZA 3301175296,3301177343,AF @@ -71404,7 +75421,8 @@ 3301507840,3301508095,EG 3301508608,3301509119,ZA 3301510144,3301511167,MW -3301511168,3301513215,ZW +3301511168,3301512191,ZW +3301512192,3301513215,MU 3301513216,3301515263,EG 3301515264,3301523455,GH 3301523456,3301531647,CI @@ -71481,7 +75499,6 @@ 3302551040,3302551551,MU 3302551552,3302552063,EG 3302552064,3302552575,KE -3302552576,3302552831,TZ 3302552832,3302553087,KE 3302553088,3302553343,EG 3302553344,3302553599,TZ @@ -71541,7 +75558,7 @@ 3302957824,3302958079,NA 3302958080,3302958335,BI 3302958336,3302958591,SZ -3302985728,3302987775,MU +3302958592,3302958847,DJ 3304062976,3304456191,SC 3304456192,3304521727,NG 3304521728,3304587263,SC @@ -71597,7 +75614,9 @@ 3315269632,3315286015,ZA 3315286016,3315286527,MU 3315286528,3315286783,KE -3315286784,3315294207,MU +3315286784,3315291135,MU +3315291136,3315292159,KE +3315292160,3315294207,MU 3315294208,3315302399,ZA 3315302400,3315318783,ML 3315318784,3315322879,LS @@ -71899,9 +75918,7 @@ 3322945536,3322951679,CN 3322951680,3322970111,US 3322970112,3323002879,CA -3323002880,3323003135,US -3323003136,3323003391,JP -3323003392,3323013887,US +3323002880,3323013887,US 3323013888,3323014143,CA 3323014144,3323017727,US 3323017728,3323017983,CA @@ -71930,7 +75947,13 @@ 3323207680,3323215871,CA 3323215872,3323224063,US 3323224064,3323232255,NL -3323232256,3323270420,US +3323232256,3323241727,US +3323241728,3323241983,CA +3323241984,3323244543,US +3323244544,3323244671,CA +3323244672,3323245319,US +3323245320,3323245327,CA +3323245328,3323270420,US 3323270421,3323270421,CH 3323270422,3323331583,US 3323331584,3323331839,CA @@ -71962,7 +75985,9 @@ 3323461120,3323461375,GB 3323461376,3323462655,US 3323462656,3323463167,BR -3323463168,3323659263,US +3323463168,3323477983,US +3323477984,3323478015,GB +3323478016,3323659263,US 3323659264,3323660543,NZ 3323660544,3323661311,US 3323661312,3323662335,CA @@ -71986,9 +76011,15 @@ 3323682960,3323684863,CA 3323684864,3323685375,US 3323685376,3323685887,CA -3323685888,3323687423,US -3323687424,3323688959,CA -3323688960,3323689471,US +3323685888,3323686399,US +3323686400,3323686911,CA +3323686912,3323687423,US +3323687424,3323687935,CA +3323687936,3323687999,US +3323688000,3323688959,CA +3323688960,3323689199,US +3323689200,3323689215,BY +3323689216,3323689471,US 3323689472,3323690495,CA 3323690496,3323741439,US 3323741440,3323741695,GB @@ -72110,7 +76141,9 @@ 3324706304,3324706559,CA 3324706560,3324732415,US 3324732416,3324732671,EU -3324732672,3324843775,US +3324732672,3324811047,US +3324811048,3324811055,AU +3324811056,3324843775,US 3324843776,3324843799,AU 3324843800,3324843801,AP 3324843802,3324844031,AU @@ -72130,7 +76163,7 @@ 3325129216,3325131775,US 3325131776,3325132031,AU 3325132032,3325132799,US -3325132800,3325133823,BR +3325132800,3325133823,CO 3325134336,3325136127,US 3325136128,3325136383,CA 3325136384,3325142015,US @@ -72140,7 +76173,9 @@ 3325145088,3325169663,US 3325169664,3325171711,BR 3325171712,3325190143,US -3325190144,3325202047,CA +3325190144,3325191687,CA +3325191688,3325191695,US +3325191696,3325202047,CA 3325202048,3325202079,US 3325202080,3325204479,CA 3325204480,3325205503,US @@ -72162,13 +76197,19 @@ 3325217940,3325217943,US 3325217944,3325218207,CA 3325218208,3325218239,US -3325218240,3325220635,CA +3325218240,3325218307,CA +3325218308,3325218311,ES +3325218312,3325220635,CA 3325220636,3325220636,US 3325220637,3325220863,CA 3325220864,3325220879,US 3325220880,3325221451,CA 3325221452,3325221455,US -3325221456,3325224671,CA +3325221456,3325221791,CA +3325221792,3325221795,FR +3325221796,3325223647,CA +3325223648,3325223663,DE +3325223664,3325224671,CA 3325224672,3325224675,US 3325224676,3325225671,CA 3325225672,3325225675,US @@ -72286,10 +76327,7 @@ 3325691904,3325693183,BR 3325693184,3325722623,US 3325722624,3325755391,CA -3325755392,3325886463,US -3325886464,3325886719,UM -3325887488,3325888511,US -3325890560,3325956095,US +3325755392,3325956095,US 3325956096,3325960191,CA 3325960192,3325976063,US 3325976064,3325976319,CA @@ -72341,7 +76379,9 @@ 3326734336,3326737663,CA 3326737664,3326737919,US 3326737920,3326738175,CA -3326738176,3326952191,US +3326738176,3326796863,US +3326796864,3326796927,GB +3326796928,3326952191,US 3326952192,3326952447,AS 3326952448,3326953983,US 3326953984,3326954495,AS @@ -72427,12 +76467,18 @@ 3328479232,3328481279,CA 3328481280,3328481791,US 3328481792,3328482303,CA -3328482304,3328515071,US +3328482304,3328483071,US +3328483072,3328483327,CA +3328483328,3328510064,US +3328510065,3328510077,AE +3328510078,3328515071,US 3328515072,3328516095,DM 3328516096,3328617983,US 3328617984,3328618239,CA 3328618240,3328629503,US -3328629504,3328629759,EU +3328629504,3328629631,EU +3328629632,3328629695,GB +3328629696,3328629759,EU 3328629760,3328630015,US 3328630016,3328630271,CA 3328630272,3328630783,US @@ -72489,7 +76535,9 @@ 3330771200,3330771711,CH 3330771712,3330778879,US 3330778880,3330779135,GB -3330779136,3330791423,US +3330779136,3330785279,US +3330785280,3330785791,CA +3330785792,3330791423,US 3330791424,3330791679,CA 3330791680,3330812927,US 3330812928,3330813951,CA @@ -72572,11 +76620,7 @@ 3331983104,3331983359,CA 3331983360,3331988479,US 3331988480,3331989503,CA -3331989504,3332002047,US -3332002048,3332002559,CA -3332002560,3332002815,US -3332002816,3332003583,CA -3332003584,3332003839,US +3331989504,3332003839,US 3332003840,3332005887,A2 3332005888,3332028415,US 3332028416,3332028927,CA @@ -72604,7 +76648,8 @@ 3332491264,3332492031,US 3332492032,3332500735,CA 3332500736,3332500991,US -3332500992,3332503039,CA +3332500992,3332501247,CA +3332501504,3332503039,CA 3332503040,3332503551,US 3332503552,3332505343,CA 3332505344,3332505855,US @@ -72680,7 +76725,9 @@ 3332988928,3332989951,US 3332989952,3332997119,CA 3332997120,3332997375,US -3332997376,3333012479,CA +3332997376,3333008383,CA +3333008384,3333008895,US +3333008896,3333012479,CA 3333012480,3333012991,US 3333012992,3333014015,CA 3333014016,3333014527,US @@ -72717,7 +76764,9 @@ 3333624320,3333624575,CA 3333624576,3333675775,US 3333675776,3333676031,CA -3333676032,3333701887,US +3333676032,3333677311,US +3333677312,3333677567,HK +3333677568,3333701887,US 3333701888,3333702143,GB 3333702144,3333702399,US 3333702400,3333702655,CH @@ -72869,7 +76918,11 @@ 3337957376,3337958399,CA 3337958400,3337960447,US 3337960448,3337961471,CA -3337961472,3337964031,US +3337961472,3337961727,US +3337961728,3337961983,CA +3337961984,3337963391,US +3337963392,3337963519,CA +3337963520,3337964031,US 3337964032,3337964543,A2 3337964544,3337969663,US 3337969664,3337973759,PR @@ -73021,7 +77074,7 @@ 3339094016,3339142655,US 3339142656,3339142911,NL 3339142912,3339146239,US -3339146496,3339147007,US +3339146752,3339147007,US 3339147008,3339147775,CA 3339147776,3339148031,MS 3339148032,3339153407,US @@ -73049,9 +77102,9 @@ 3339669504,3339671807,CA 3339672576,3339679487,US 3339679488,3339679743,CN -3339679744,3339728591,US -3339728592,3339728599,IN -3339728600,3339728895,US +3339679744,3339707391,US +3339707392,3339708415,BM +3339708416,3339728895,US 3339728896,3339729919,AG 3339729920,3339743231,US 3339743232,3339744255,CA @@ -73063,7 +77116,13 @@ 3339753472,3339754495,CA 3339754496,3339760639,US 3339760640,3339761663,CA -3339761664,3339923455,US +3339761664,3339766047,US +3339766048,3339766055,DE +3339766056,3339766183,US +3339766184,3339766191,AU +3339766192,3339767007,US +3339767008,3339767015,DE +3339767016,3339923455,US 3339923456,3339927551,CA 3339927552,3339934719,US 3339934720,3339935743,CA @@ -73114,9 +77173,13 @@ 3340694784,3340695039,CA 3340695040,3340857343,US 3340857344,3340858367,CA -3340859136,3340925815,US +3340859136,3340925567,US +3340925568,3340925575,DE +3340925576,3340925815,US 3340925816,3340925823,AU -3340925824,3341082623,US +3340925824,3340926295,US +3340926296,3340926303,DE +3340926304,3341082623,US 3341082624,3341084671,CA 3341084672,3341180927,US 3341180928,3341182975,CA @@ -73266,7 +77329,11 @@ 3343355904,3343364095,CA 3343364096,3343365631,US 3343365632,3343372543,CA -3343372800,3343380479,US +3343372800,3343378823,US +3343378824,3343378839,SE +3343378840,3343379079,US +3343379080,3343379087,SE +3343379088,3343380479,US 3343380480,3343384575,CA 3343384576,3343460863,US 3343460864,3343461375,CA @@ -73290,9 +77357,12 @@ 3344158720,3344166911,US 3344166912,3344168959,CA 3344168960,3344171263,US -3344171264,3344236543,CA +3344171264,3344195583,CA +3344195584,3344203775,US +3344203776,3344236543,CA 3344236544,3344237055,US -3344237056,3344242175,CA +3344237056,3344238591,CA +3344240640,3344242175,CA 3344242176,3344242687,US 3344242688,3344255999,CA 3344256000,3344261631,US @@ -73328,7 +77398,9 @@ 3344637952,3344649215,US 3344649216,3344650239,PR 3344650240,3344652287,CA -3344652288,3344658431,US +3344652288,3344654335,US +3344654336,3344656383,VG +3344656384,3344658431,US 3344658432,3344660479,CA 3344660480,3344670719,US 3344670720,3344671743,GP @@ -73338,7 +77410,9 @@ 3344677424,3344678911,CA 3344678912,3344681983,US 3344681984,3344685055,CA -3344685056,3344694271,US +3344685056,3344691199,US +3344691200,3344693247,CA +3344693248,3344694271,US 3344694272,3344695295,CA 3344695296,3344937471,US 3344937472,3344937983,EG @@ -73363,7 +77437,7 @@ 3345315328,3345315583,US 3345315584,3345315839,TW 3345315840,3345321471,US -3345321472,3345321727,CA +3345321472,3345321727,GB 3345321728,3345327103,US 3345327104,3345328127,CA 3345328128,3345333247,US @@ -73446,7 +77520,8 @@ 3346241536,3346243327,CA 3346243328,3346282495,US 3346282496,3346284543,PR -3346284544,3346323455,US +3346284544,3346319359,US +3346321408,3346323455,US 3346323456,3346325503,CA 3346325504,3346327551,US 3346327552,3346328575,CA @@ -73465,7 +77540,7 @@ 3346525184,3346528255,US 3346528256,3346529279,PR 3346529280,3346530303,CA -3346530304,3346591487,US +3346530304,3346591231,US 3346591488,3346591743,CA 3346591744,3346663167,US 3346663168,3346663423,CA @@ -73514,7 +77589,13 @@ 3349608448,3349609471,US 3349609472,3349610239,CA 3349610240,3349614591,US -3349614592,3349616127,CA +3349614592,3349614655,CA +3349614656,3349614671,US +3349614672,3349614783,CA +3349614784,3349614847,US +3349614848,3349615551,CA +3349615552,3349615615,US +3349615616,3349616127,CA 3349616128,3349616639,US 3349616640,3349617663,CA 3349617664,3349637119,US @@ -73658,9 +77739,7 @@ 3351336960,3351339007,CA 3351339008,3351357439,US 3351357440,3351359487,CA -3351359488,3351364607,US -3351364608,3351365119,AU -3351365120,3351372799,US +3351359488,3351372799,US 3351372800,3351373823,BM 3351373824,3351380223,US 3351380224,3351380479,CA @@ -73758,12 +77837,13 @@ 3351441152,3351441407,CA 3351441408,3351441919,US 3351441920,3351442175,CA -3351442176,3351483391,US +3351442176,3351474687,US +3351475200,3351475711,US +3351475712,3351475967,IS +3351475968,3351483391,US 3351483392,3351484415,CA 3351484416,3351485439,US -3351485440,3351485695,CA -3351485696,3351486463,US -3351486464,3351488511,CA +3351485440,3351488511,CA 3351488512,3351494911,US 3351494912,3351495679,SG 3351495680,3351495935,US @@ -73798,9 +77878,14 @@ 3351895808,3351904255,US 3351904256,3351927551,CA 3351927552,3351927807,US -3351927808,3351959551,CA +3351927808,3351933951,CA +3351933952,3351939071,US +3351939072,3351959551,CA 3351959552,3351961599,US -3351961600,3351969791,CA +3351961600,3351965695,CA +3351965696,3351969279,US +3351969280,3351969535,CA +3351969536,3351969791,US 3351969792,3352035327,IL 3352035328,3352036351,CA 3352036352,3352046591,US @@ -73833,7 +77918,9 @@ 3353653504,3353653759,GB 3353653760,3353722367,US 3353722368,3353722623,GB -3353722624,3353729023,US +3353722624,3353726975,US +3353726976,3353727231,IN +3353727232,3353729023,US 3353729024,3353729279,HK 3353729280,3353730047,US 3353730048,3353731071,CA @@ -73943,21 +78030,24 @@ 3355448832,3355449343,SX 3355449344,3355450367,CU 3355450368,3355451391,EC -3355451392,3355455487,BR -3355457536,3355459071,BR +3355451392,3355459327,BR 3355459328,3355459583,EC 3355459584,3355459839,PA 3355459840,3355460095,VE 3355460096,3355460351,CL -3355460608,3355461631,BR -3355461632,3355463423,EC +3355460352,3355460607,BR +3355460608,3355460863,UY +3355460864,3355461887,BR +3355461888,3355463423,EC 3355463424,3355463935,AR 3355463936,3355464191,BR 3355464192,3355464447,CL 3355464448,3355464959,MX 3355464960,3355465727,BR 3355465728,3355465983,UY +3355466240,3355466751,MX 3355466752,3355467007,BR +3355467008,3355467263,MX 3355467264,3355467519,US 3355467520,3355467775,MX 3355467776,3355468799,AR @@ -74029,13 +78119,16 @@ 3355557888,3355559935,CO 3355559936,3355561983,PY 3355561984,3355564031,SR +3355564032,3355566079,BR 3355566080,3355574271,AR 3355574272,3355576319,CL 3355576320,3355578367,VE 3355578368,3355582463,CL 3355582464,3355590655,UY 3355590656,3355592703,CO -3355592704,3355604991,CL +3355592704,3355599871,CL +3355599872,3355600895,BR +3355600896,3355604991,CL 3355604992,3355607039,AR 3355607040,3355615231,HT 3355615232,3355623423,SR @@ -74079,8 +78172,10 @@ 3355773696,3355773951,PR 3355773952,3355774975,CU 3355774976,3355779071,VE +3355779072,3355781119,BR 3355781120,3355783167,VE 3355783168,3355785215,AR +3355785216,3355787263,CR 3355787264,3355803647,AR 3355803648,3355820031,VE 3355820032,3355836415,AR @@ -74091,8 +78186,7 @@ 3355843584,3355844863,EC 3355844864,3355845119,CL 3355845120,3355845375,EC -3355845376,3355845631,BR -3355846144,3355848703,BR +3355845376,3355848703,BR 3355849728,3355849983,PA 3355849984,3355850495,CL 3355850496,3355850751,NI @@ -74101,8 +78195,9 @@ 3355856640,3355856895,PA 3355856896,3355858943,EC 3355860992,3355869183,CL -3355870208,3355870719,BR +3355869184,3355870719,BR 3355870720,3355871231,CR +3355871232,3355873279,BR 3355873280,3355875327,BQ 3355875328,3355876351,MX 3355876352,3355877375,VE @@ -74118,6 +78213,8 @@ 3355918336,3355923455,EC 3355923456,3355924479,UY 3355924480,3355926527,TT +3355926528,3355930623,PA +3355930624,3355934719,BR 3355934720,3355939839,AR 3355939840,3355940863,SR 3355940864,3355942911,AR @@ -74134,7 +78231,7 @@ 3356041216,3356049407,CR 3356049408,3356049663,CL 3356049664,3356050175,BR -3356050432,3356050687,BR +3356050432,3356051455,BR 3356051456,3356051711,CO 3356051712,3356051967,CL 3356051968,3356052223,GT @@ -74149,13 +78246,14 @@ 3356060672,3356061695,CL 3356061696,3356062463,BR 3356062464,3356062719,JM -3356062720,3356063743,BR +3356062720,3356062975,BR +3356062976,3356063231,CR +3356063232,3356063743,BR 3356064000,3356064255,BR 3356064256,3356064511,CL 3356064768,3356065791,BR 3356065792,3356066047,CL -3356066048,3356067071,BR -3356068352,3356069119,BR +3356066048,3356069119,BR 3356069120,3356069631,CL 3356069888,3356070143,BR 3356070144,3356070655,CL @@ -74163,7 +78261,7 @@ 3356070912,3356071423,BR 3356071424,3356072447,CL 3356073216,3356073471,AR -3356073472,3356073983,BR +3356073472,3356075007,BR 3356075008,3356076287,BO 3356076288,3356078079,BR 3356078080,3356078335,EC @@ -74202,6 +78300,7 @@ 3356097792,3356098303,AR 3356098304,3356098559,GT 3356098560,3356099583,CL +3356099584,3356100607,BR 3356100608,3356102399,CL 3356102400,3356102655,PA 3356102656,3356105727,CL @@ -74211,7 +78310,7 @@ 3356114944,3356123135,PE 3356123136,3356131839,AR 3356131840,3356132351,PE -3356133376,3356134143,BR +3356132352,3356134143,BR 3356134144,3356134655,AR 3356134912,3356135167,DO 3356135168,3356135423,MX @@ -74402,8 +78501,19 @@ 3356557312,3356819455,BR 3356819456,3356884991,CO 3356884992,3356950527,CL -3356950528,3357016063,MX -3357016064,3357048831,CO +3356950528,3356967935,MX +3356967936,3356968959,BR +3356968960,3356996607,MX +3356996608,3356997631,BR +3356997632,3357007871,MX +3357007872,3357011967,BR +3357011968,3357016063,MX +3357016064,3357018623,CO +3357019136,3357020159,CL +3357020160,3357032447,CO +3357032448,3357040639,BR +3357040640,3357048831,CO +3357048832,3357057023,EC 3357057024,3357065215,PE 3357065216,3357073407,EC 3357073408,3357077503,CL @@ -74502,7 +78612,9 @@ 3357454592,3357454847,NI 3357454848,3357455103,HN 3357455104,3357455359,SV -3357455360,3357456639,GT +3357455360,3357455871,GT +3357455872,3357456127,NI +3357456128,3357456639,GT 3357456640,3357456895,HN 3357456896,3357457711,GT 3357457712,3357457727,CR @@ -74589,7 +78701,30 @@ 3357561856,3357581311,AR 3357581312,3357589503,CL 3357589504,3357605887,BZ -3357605888,3357736959,MX +3357605888,3357606911,MX +3357606912,3357607167,AR +3357607168,3357613055,MX +3357613056,3357613311,AR +3357613312,3357623039,MX +3357623040,3357623295,AR +3357623296,3357628415,MX +3357628416,3357630463,BR +3357630464,3357638655,MX +3357638656,3357640703,BR +3357640704,3357644799,MX +3357644800,3357646847,BR +3357646848,3357647871,MX +3357647872,3357648895,BR +3357648896,3357671423,MX +3357671424,3357671679,CO +3357671680,3357712383,MX +3357712384,3357713407,BR +3357713408,3357715199,MX +3357715200,3357715455,CO +3357715456,3357726719,MX +3357726720,3357727743,BR +3357727744,3357728767,MX +3357728768,3357736959,BR 3357736960,3357745151,VE 3357745152,3357753343,CO 3357753344,3357757487,VE @@ -74599,11 +78734,14 @@ 3357775872,3357776127,US 3357776128,3357776383,UY 3357776384,3357776895,US +3357776896,3357777919,CL 3357777920,3357786111,GT 3357786112,3357802495,VE 3357802496,3357868031,MX 3357868032,3357933567,PE -3357933568,3358064639,MX +3357933568,3358015487,MX +3358015488,3358023679,BR +3358023680,3358064639,MX 3358064640,3358130175,UY 3358130176,3358131199,EC 3358131200,3358131327,AR @@ -74622,7 +78760,8 @@ 3358132992,3358133119,EC 3358133120,3358133247,AR 3358133248,3358133759,VE -3358133760,3358142975,AR +3358133760,3358142719,AR +3358142720,3358142975,US 3358142976,3358143231,CO 3358143232,3358143487,AR 3358143488,3358143999,US @@ -74635,8 +78774,8 @@ 3358150016,3358150143,CO 3358150144,3358150423,AR 3358150424,3358150431,CO -3358150432,3358150495,AR -3358150496,3358150655,CO +3358150432,3358150479,AR +3358150480,3358150655,CO 3358150656,3358150911,EC 3358150912,3358151263,AR 3358151264,3358151271,EC @@ -74767,6 +78906,7 @@ 3358654464,3358658559,AR 3358658560,3358660607,CL 3358660608,3358662655,AR +3358662656,3358666751,BR 3358666752,3358695423,AR 3358695424,3358703615,GT 3358703616,3358715903,AR @@ -74787,7 +78927,17 @@ 3358777344,3358779391,CR 3358779392,3358781439,EC 3358781440,3358851071,AR -3358851072,3358982143,MX +3358851072,3358855167,MX +3358855168,3358859263,BR +3358859264,3358887935,MX +3358887936,3358892031,HN +3358892032,3358918655,MX +3358918656,3358924799,BR +3358924800,3358965759,MX +3358965760,3358966783,BR +3358966784,3358967039,MX +3358967040,3358973951,BR +3358973952,3358982143,MX 3358982144,3359047679,CL 3359047680,3359080447,AR 3359080448,3359096831,CU @@ -74808,7 +78958,9 @@ 3359315968,3359318015,HN 3359318016,3359356927,AR 3359356928,3359358975,VE -3359358976,3359375359,AR +3359358976,3359363071,AR +3359363072,3359367167,PA +3359367168,3359375359,AR 3359375360,3359440895,PE 3359440896,3359461951,AR 3359461952,3359462015,HN @@ -74844,14 +78996,17 @@ 3359586304,3359588351,CL 3359588352,3359596543,AR 3359596544,3359598591,CL -3359600640,3359621119,AR +3359598592,3359599615,EC +3359599616,3359621119,AR 3359621120,3359637503,EC 3359637504,3359789583,MX 3359789584,3359789599,US 3359789600,3359797247,MX +3359797248,3359801343,BR 3359801344,3359899647,MX 3359899648,3359916031,CL 3359916032,3359932415,AR +3359932416,3359948799,MX 3359948800,3359989759,AR 3359989760,3359997951,CO 3359997952,3360006143,AR @@ -74862,6 +79017,9 @@ 3360116736,3360118783,BO 3360118784,3360120831,AR 3360120832,3360124927,CO +3360124928,3360125951,VE +3360125952,3360127999,BR +3360128000,3360129023,HN 3360129024,3360145407,VE 3360145408,3360153599,CL 3360153600,3360157695,AR @@ -74870,7 +79028,7 @@ 3360161792,3360251903,CL 3360251904,3360253951,BO 3360253952,3360255999,SV -3360258048,3360260095,CL +3360256000,3360260095,CL 3360260096,3360276479,AR 3360276480,3360278527,VE 3360278528,3360280575,EC @@ -74887,11 +79045,18 @@ 3360366592,3360382975,CO 3360382976,3360399359,VE 3360399360,3360403455,BO +3360403456,3360405503,BR 3360405504,3360407551,HN 3360407552,3360423935,PA 3360423936,3360456447,MX 3360456448,3360456703,US -3360456704,3360686079,MX +3360456704,3360534527,MX +3360534528,3360536575,BR +3360536576,3360537599,CL +3360537600,3360538623,EC +3360538624,3360667647,MX +3360667648,3360669695,BR +3360669696,3360686079,MX 3360686080,3360705535,AR 3360705536,3360706047,US 3360706048,3360706815,AR @@ -74918,7 +79083,9 @@ 3360772352,3360772479,BO 3360772480,3360781839,AR 3360781840,3360781847,DO -3360781848,3360782167,AR +3360781848,3360781943,AR +3360781944,3360781947,MX +3360781948,3360782167,AR 3360782168,3360782175,MX 3360782176,3360788479,AR 3360788480,3360790527,CL @@ -74979,7 +79146,15 @@ 3361587200,3361599487,EC 3361599488,3361601535,UY 3361601536,3361603583,EC -3361603584,3361734655,MX +3361603584,3361665023,MX +3361665024,3361667071,BR +3361667072,3361668095,GT +3361668096,3361669119,BR +3361669120,3361713151,MX +3361713152,3361716223,BR +3361716224,3361717247,CL +3361717248,3361726463,BR +3361726464,3361734655,MX 3361734656,3362258943,BR 3362258944,3362324479,CL 3362324480,3362324735,AR @@ -75026,7 +79201,7 @@ 3362476288,3362476543,AR 3362476544,3362477055,CR 3362477056,3362478079,BQ -3362478080,3362480127,AR +3362478080,3362484223,AR 3362486272,3362488319,HN 3362488320,3362504703,PE 3362504704,3362506751,VE @@ -75079,6 +79254,7 @@ 3362903552,3362904063,MX 3362904064,3362914303,HT 3362914304,3362930687,CO +3362930688,3362934783,CL 3362934784,3362936831,AR 3362936832,3362938879,CL 3362938880,3362942975,AR @@ -75152,12 +79328,165 @@ 3363684352,3363708927,EC 3363708928,3363713023,CL 3363713024,3363713279,EC +3363713280,3363714047,CL +3363714048,3363717119,PE 3363717120,3363733503,CL 3363733504,3363831807,AR -3363831808,3378511871,BR +3363831808,3367763967,BR +3367763968,3367774207,MX +3367774208,3367776255,BR +3367776256,3367788543,MX +3367788544,3367796735,BR +3367796736,3367804927,MX +3367804928,3367840767,BR +3367840768,3367841791,HN +3367841792,3368052991,BR +3368052992,3368053247,PE +3368053760,3368086015,BR +3368086528,3368087551,CR +3368087552,3370188799,BR +3370188800,3370196991,MX +3370196992,3370487807,BR +3370487808,3370488831,CR +3370488832,3370489855,AR +3370489856,3370490879,VE +3370490880,3370506239,BR +3370506240,3370507263,VE +3370507264,3370514943,BR +3370515456,3370516479,AR +3370516480,3378511871,BR 3378511872,3380506879,MX 3380506880,3380507135,BR -3380507136,3383754751,MX +3380507136,3380744191,MX +3380744192,3380745215,CW +3380745216,3380746239,BR +3380746240,3380747263,PE +3380747264,3380748287,BR +3380748288,3380761087,MX +3380761088,3380761599,VE +3380761600,3380764671,BR +3380764672,3380811775,MX +3380811776,3380813823,BR +3380813824,3380815103,MX +3380815104,3380815359,CR +3380815872,3380816127,MX +3380816128,3380816383,BO +3380816896,3380817151,MX +3380817920,3380822527,MX +3380823040,3380824063,BR +3380824064,3380826111,MX +3380826112,3380828159,BR +3380828160,3380828671,MX +3380829184,3380830207,BR +3380830208,3380836607,MX +3380836608,3380836863,PE +3380837376,3380840447,MX +3380840448,3380843519,BR +3380843520,3380844543,PA +3380844544,3380853759,BR +3380853760,3380854783,CO +3380854784,3380858879,MX +3380858880,3380860927,BR +3380860928,3380861951,CO +3380861952,3380862975,PE +3380862976,3380865023,BR +3380865024,3380867071,MX +3380867072,3380869119,BR +3380869120,3381350399,MX +3381350400,3381351423,AR +3381351424,3381354495,BR +3381354496,3381373951,MX +3381373952,3381374975,BR +3381374976,3381377023,MX +3381377024,3381379071,BR +3381379072,3381385215,MX +3381385216,3381387263,BR +3381387264,3381448703,MX +3381448704,3381452799,BR +3381452800,3381453823,AR +3381453824,3381455871,BR +3381455872,3381456895,CO +3381456896,3381460991,BR +3381460992,3381944319,MX +3381944320,3381946367,BR +3381946368,3381947391,CL +3381947392,3381952511,BR +3381952512,3381960703,MX +3381960704,3381962751,BR +3381962752,3381963775,HN +3381963776,3381968895,BR +3381968896,3381972991,MX +3381972992,3381974015,BR +3381974016,3381975039,CL +3381975040,3381979135,BR +3381979136,3381980159,CR +3381980160,3381985279,BR +3381985280,3382009855,MX +3382009856,3382018047,BR +3382018048,3382053887,MX +3382053888,3382057983,BR +3382057984,3382059007,CL +3382059008,3382063103,MX +3382063104,3382066175,BR +3382066176,3382067199,PE +3382067200,3382071295,MX +3382071296,3382072319,BR +3382072320,3382073343,SV +3382073344,3382075391,BR +3382075392,3382076415,CO +3382076416,3382077439,BR +3382077440,3382078463,HT +3382078464,3382083583,BR +3382083584,3382087679,MX +3382087680,3382091775,BR +3382091776,3382099967,BO +3382099968,3382558719,MX +3382558720,3382575103,BR +3382575104,3382577151,MX +3382577152,3382579199,BR +3382579200,3382580223,MX +3382580224,3382583295,BR +3382583296,3382585343,MX +3382585344,3382587391,BR +3382587392,3382588415,HN +3382588416,3382589439,PE +3382589440,3382591487,BR +3382591488,3382602751,MX +3382602752,3382603775,BR +3382603776,3382605823,MX +3382605824,3382607871,AR +3382607872,3382642687,MX +3382642688,3382644735,AR +3382644736,3382646783,MX +3382646784,3382648831,BR +3382648832,3382651903,MX +3382651904,3382652927,BR +3382652928,3382653951,MX +3382653952,3382654975,BR +3382654976,3382657023,AR +3382657024,3382659071,MX +3382659072,3382661119,BR +3382661120,3382662143,MX +3382662144,3382665215,BR +3382665216,3382669311,MX +3382669312,3382670335,GT +3382670336,3382672383,BR +3382672384,3382677503,MX +3382677504,3382681599,BR +3382681600,3382683647,MX +3382683648,3382685695,CL +3382685696,3382686719,MX +3382686720,3382689791,BR +3382689792,3382695935,MX +3382695936,3382696959,AR +3382696960,3382697983,EC +3382697984,3382704127,MX +3382704128,3382706175,BR +3382706176,3382853631,MX +3382853632,3382870015,BR +3382870016,3383701503,MX +3383701504,3383705599,BR +3383705600,3383754751,MX 3383754752,3384147967,AR 3384147968,3384154879,US 3384154880,3384155135,HN @@ -75209,7 +79538,11 @@ 3386605568,3386613759,CL 3386613760,3386621951,AR 3386621952,3386630143,CO -3386630144,3386638335,UY +3386630144,3386632191,UY +3386632192,3386634239,CL +3386634240,3386636287,CO +3386636288,3386637311,BR +3386637312,3386638335,UY 3386638336,3386640895,SX 3386640896,3386641151,US 3386641152,3386642431,SX @@ -75240,6 +79573,8 @@ 3386753024,3386761215,CL 3386761216,3386769407,PA 3386769408,3386773503,VE +3386773504,3386774527,AR +3386774528,3386777599,BR 3386777600,3386781695,CW 3386781696,3386783743,PY 3386783744,3386784767,AR @@ -75382,11 +79717,7 @@ 3389197824,3389198079,ID 3389198080,3389198335,IN 3389198336,3389202431,KR -3389202432,3389203455,NZ -3389203456,3389203967,AU -3389203968,3389204223,NZ -3389204224,3389204479,AU -3389204480,3389210623,NZ +3389202432,3389210623,AU 3389210624,3389210879,IN 3389210880,3389211135,AU 3389211136,3389211391,IN @@ -75480,9 +79811,7 @@ 3389407744,3389408255,CN 3389408256,3389409279,JP 3389409280,3389409791,CN -3389409792,3389411327,AU -3389411328,3389411583,IN -3389411584,3389412351,AU +3389409792,3389412351,AU 3389412352,3389412607,NZ 3389412608,3389412863,PH 3389412864,3389413119,AU @@ -75572,16 +79901,16 @@ 3389595648,3389595903,CN 3389595904,3389596159,AU 3389596160,3389596671,CN -3389596672,3389597695,MY +3389596672,3389597439,SG +3389597440,3389597695,MY 3389597696,3389599743,MN 3389599744,3389600255,CN 3389600256,3389600511,AU 3389600512,3389601791,CN 3389601792,3389602047,AU 3389602048,3389602815,CN -3389603840,3389604351,AU +3389604096,3389604351,AU 3389604352,3389604863,SG -3389604864,3389605119,HK 3389605120,3389605375,ID 3389605376,3389605631,AU 3389605632,3389605887,SG @@ -75610,7 +79939,7 @@ 3389661184,3389669375,ID 3389669376,3389673471,CN 3389673472,3389677567,AU -3389677568,3389681663,JP +3389677568,3389685759,JP 3389685760,3389718527,AU 3389718528,3389784063,JP 3389784064,3389784319,NZ @@ -75619,8 +79948,8 @@ 3389785088,3389786111,HK 3389786112,3389788159,JP 3389788160,3389788415,IN -3389788416,3389789183,CN -3389789184,3389789695,TH +3389788416,3389788927,CN +3389788928,3389789695,US 3389789696,3389790719,AU 3389790720,3389790975,BN 3389790976,3389791231,JP @@ -75665,7 +79994,7 @@ 3389919232,3389931519,NZ 3389931520,3389932031,CN 3389932032,3389932287,AU -3389932288,3389932799,HK +3389932288,3389932799,JP 3389932800,3389933055,CN 3389933056,3389933567,PK 3389933568,3389933823,IN @@ -75772,7 +80101,7 @@ 3390337024,3390337279,GU 3390337280,3390337535,NZ 3390337536,3390337791,CN -3390337792,3390338303,SG +3390337792,3390338303,JP 3390338304,3390338559,CN 3390338560,3390338815,HK 3390338816,3390339071,KR @@ -75799,7 +80128,7 @@ 3390409984,3390410495,CN 3390410496,3390410751,NZ 3390410752,3390411007,TH -3390411008,3390411519,SG +3390411008,3390411519,JP 3390411520,3390412031,CN 3390412032,3390412287,TH 3390412288,3390413567,CN @@ -75895,8 +80224,7 @@ 3391664128,3391668223,BD 3391668224,3391676415,HK 3391676416,3391684607,SG -3391684608,3391685631,IN -3391685632,3391686655,AU +3391684608,3391686655,IN 3391686656,3391687167,CN 3391687168,3391687423,IN 3391687424,3391688191,CN @@ -75916,83 +80244,10 @@ 3391725568,3391733759,TH 3391733760,3391734015,CN 3391734016,3391734783,AU +3391735808,3391736831,JP 3391736832,3391737855,IN 3391737856,3391741951,JP -3391741952,3391742207,HK -3391742208,3391742211,IN -3391742212,3391742223,HK -3391742224,3391742227,IN -3391742228,3391742231,HK -3391742232,3391742243,IN -3391742244,3391742287,HK -3391742288,3391742291,IN -3391742292,3391742319,HK -3391742320,3391742323,IN -3391742324,3391742327,HK -3391742328,3391742331,IN -3391742332,3391742335,HK -3391742336,3391742343,IN -3391742344,3391742347,HK -3391742348,3391742351,IN -3391742352,3391742399,HK -3391742400,3391742403,IN -3391742404,3391742423,HK -3391742424,3391742427,IN -3391742428,3391742443,HK -3391742444,3391742447,IN -3391742448,3391742471,HK -3391742472,3391742475,IN -3391742476,3391742523,HK -3391742524,3391742531,IN -3391742532,3391742571,HK -3391742572,3391742575,IN -3391742576,3391742591,HK -3391742592,3391742595,IN -3391742596,3391742687,HK -3391742688,3391742691,IN -3391742692,3391742719,HK -3391742720,3391742727,IN -3391742728,3391742731,HK -3391742732,3391742735,IN -3391742736,3391742847,HK -3391742848,3391742879,IN -3391742880,3391742903,HK -3391742904,3391742919,IN -3391742920,3391742927,HK -3391742928,3391742935,IN -3391742936,3391742943,HK -3391742944,3391742951,IN -3391742952,3391742983,HK -3391742984,3391742991,IN -3391742992,3391743135,HK -3391743136,3391743151,IN -3391743152,3391743175,HK -3391743176,3391743199,IN -3391743200,3391743359,HK -3391743360,3391743391,IN -3391743392,3391743743,HK -3391743744,3391743759,IN -3391743760,3391744039,HK -3391744040,3391744063,IN -3391744064,3391744111,HK -3391744112,3391744119,IN -3391744120,3391744271,HK -3391744272,3391744367,IN -3391744368,3391744383,HK -3391744384,3391744447,IN -3391744448,3391744511,HK -3391744512,3391744519,IN -3391744520,3391744535,HK -3391744536,3391744543,IN -3391744544,3391744791,HK -3391744792,3391744799,IN -3391744800,3391744823,HK -3391744824,3391744831,IN -3391744832,3391745055,HK -3391745056,3391745087,IN -3391745088,3391745279,HK -3391745280,3391745295,IN -3391745296,3391746047,HK +3391741952,3391746047,IN 3391746048,3391750143,CN 3391750144,3391766783,SG 3391766784,3391767039,AP @@ -76029,7 +80284,9 @@ 3391852544,3391856639,CN 3391856640,3391864831,ID 3391864832,3391866879,TW -3391866880,3391873023,US +3391866880,3391868927,US +3391868928,3391870975,SG +3391870976,3391873023,US 3391873024,3391877119,AU 3391877120,3391879167,JP 3391879168,3391881215,ID @@ -76201,7 +80458,6 @@ 3392440832,3392441343,BD 3392441344,3392441855,ID 3392441856,3392442111,AU -3392442368,3392442623,HK 3392442624,3392442879,AU 3392442880,3392443391,ID 3392443392,3392443647,IN @@ -76225,7 +80481,7 @@ 3392479232,3392487423,AU 3392487424,3392499711,IN 3392499712,3392503807,JP -3392503808,3392511999,HK +3392503808,3392507903,HK 3392512000,3392516095,BD 3392516096,3392520191,NZ 3392520192,3392524287,AU @@ -76286,7 +80542,6 @@ 3392830464,3392830719,ID 3392830720,3392830975,IN 3392830976,3392831231,TH -3392831232,3392831487,IN 3392831488,3392832511,PG 3392832512,3392833535,IN 3392833536,3392835583,AU @@ -76440,7 +80695,10 @@ 3393306624,3393314815,HK 3393314816,3393318911,ID 3393318912,3393320959,SG -3393320960,3393388543,HK +3393320960,3393363967,HK +3393372160,3393374975,HK +3393374976,3393375743,SG +3393375744,3393388543,HK 3393388544,3393389567,CN 3393389568,3393390591,IN 3393390592,3393392639,ID @@ -76492,7 +80750,7 @@ 3393620992,3393621247,JP 3393621248,3393622015,AU 3393622016,3393626111,PK -3393626112,3393630207,HK +3393626112,3393630207,CN 3393630208,3393634303,JP 3393634304,3393638399,CN 3393638400,3393650687,JP @@ -76565,9 +80823,11 @@ 3393867776,3393871871,CN 3393871872,3393874943,HK 3393874944,3393875967,AU -3393875968,3393878271,HK -3393878272,3393878527,IN -3393878528,3393880063,HK +3393875968,3393876991,HK +3393876992,3393878015,SG +3393878016,3393879039,IN +3393879040,3393879551,JP +3393879552,3393880063,HK 3393880064,3393896447,AU 3393896448,3393906687,NZ 3393908736,3393910783,BD @@ -76611,7 +80871,9 @@ 3394078720,3394078975,AU 3394078976,3394079231,IN 3394079232,3394079743,PH -3394079744,3394092543,HK +3394079744,3394087471,HK +3394087472,3394087487,CN +3394087488,3394092543,HK 3394092544,3394092799,AP 3394092800,3394111487,HK 3394111488,3394113535,CN @@ -76697,8 +80959,7 @@ 3394500608,3394501631,SG 3394501632,3394502655,CN 3394502656,3394503679,HK -3394503680,3394506751,CN -3394506752,3394507263,HK +3394503680,3394507263,CN 3394507264,3394507775,JP 3394508544,3394508799,PH 3394508800,3394510847,CN @@ -76749,7 +81010,6 @@ 3394756608,3394760703,JP 3394760704,3394764799,ID 3394764800,3394772991,HK -3394772992,3394775039,PK 3394777088,3394781183,JP 3394781184,3394789375,MP 3394789376,3394797567,HK @@ -76760,18 +81020,28 @@ 3394830336,3394831359,HK 3394831360,3394832383,NZ 3394832384,3394834431,CN -3394834432,3394835967,HK +3394834432,3394834687,HK +3394834688,3394834943,JP +3394834944,3394834959,HK +3394834960,3394834975,JP +3394834976,3394834983,HK +3394834984,3394834991,SG +3394834992,3394835199,HK +3394835200,3394835455,JP +3394835456,3394835583,SG +3394835584,3394835711,JP +3394835712,3394835967,CN 3394835968,3394836223,AP -3394836224,3394836479,HK +3394836224,3394836239,JP +3394836240,3394836247,AS +3394836248,3394836415,JP +3394836416,3394836479,HK 3394836480,3394838527,BT -3394838528,3394844671,NZ -3394844672,3394845695,AU -3394845696,3394846207,NZ -3394846208,3394846719,AU +3394838528,3394846719,NZ 3394846720,3394850815,IN 3394850816,3394854911,JP 3394855936,3394856959,AU -3394856960,3394859007,IN +3394856960,3394857983,IN 3394859008,3394860031,JP 3394860032,3394860543,ID 3394860544,3394860799,IN @@ -76970,7 +81240,7 @@ 3397177344,3397181439,JP 3397181440,3397185535,PW 3397185536,3397187583,AU -3397187584,3397189631,IN +3397187584,3397189631,AP 3397189632,3397201919,AU 3397201920,3397206015,JP 3397206016,3397210111,BD @@ -77006,44 +81276,9 @@ 3397279744,3397283839,AU 3397283840,3397285887,KR 3397285888,3397287935,BD -3397287936,3397296175,SG -3397296176,3397296191,HK -3397296192,3397296271,SG -3397296272,3397296279,HK -3397296280,3397296479,SG -3397296480,3397297263,HK -3397297264,3397297271,SG -3397297272,3397297295,HK -3397297296,3397297311,SG -3397297312,3397297407,HK -3397297408,3397297439,SG -3397297440,3397297919,HK -3397297920,3397297983,SG -3397297984,3397298015,HK -3397298016,3397298071,SG -3397298072,3397298079,HK -3397298080,3397298431,SG -3397298432,3397298495,HK -3397298496,3397298511,SG -3397298512,3397298559,HK -3397298560,3397298943,SG -3397298944,3397298959,HK -3397298960,3397299047,SG -3397299048,3397299055,HK -3397299056,3397299183,SG -3397299184,3397299191,HK -3397299192,3397299359,SG +3397287936,3397299359,SG 3397299360,3397299375,IN -3397299376,3397299455,SG -3397299456,3397299483,HK -3397299484,3397299487,SG -3397299488,3397299599,HK -3397299600,3397299603,SG -3397299604,3397304211,HK -3397304212,3397304215,SG -3397304216,3397304299,HK -3397304300,3397304303,SG -3397304304,3397304319,HK +3397299376,3397304319,SG 3397304320,3397308415,NZ 3397308416,3397312511,HK 3397312512,3397320703,JP @@ -77181,9 +81416,19 @@ 3397812224,3397816319,CN 3397816320,3397832703,IN 3397836800,3397844991,AU -3397844992,3397869823,JP +3397844992,3397857791,JP +3397857792,3397858047,AU +3397858048,3397862143,JP +3397862144,3397862399,PH +3397862400,3397869823,JP 3397869824,3397870079,AU -3397870080,3397910527,JP +3397870080,3397878527,JP +3397878528,3397878783,TW +3397878784,3397881855,JP +3397881856,3397882111,HK +3397882112,3397887999,JP +3397888000,3397888768,IN +3397888769,3397910527,JP 3397910528,3397914111,SG 3397914112,3397914367,AP 3397914368,3397918719,SG @@ -77284,19 +81529,29 @@ 3398619136,3398621183,AU 3398621184,3398623231,HK 3398623232,3398631423,ID -3398631424,3398637119,JP +3398631424,3398631935,AP +3398631936,3398632191,JP +3398632192,3398634439,AP +3398634440,3398634447,KR +3398634448,3398636543,AP +3398636544,3398636575,HK +3398636576,3398637119,AP 3398637120,3398637183,HK -3398637184,3398637823,JP +3398637184,3398637823,AP 3398637824,3398638079,PH -3398638080,3398641407,JP +3398638080,3398639903,AP +3398639904,3398639907,MY +3398639908,3398640671,AP +3398640672,3398640695,SG +3398640696,3398641407,AP 3398641408,3398641663,MY -3398641664,3398641919,JP +3398641664,3398641919,AP 3398641920,3398642175,AU -3398642176,3398642431,JP +3398642176,3398642431,AP 3398642432,3398642943,AU -3398642944,3398643199,JP +3398642944,3398643199,AP 3398643200,3398643455,AU -3398643456,3398647807,JP +3398643456,3398647807,AP 3398647808,3398668287,AU 3398668288,3398672383,CN 3398672384,3398680575,PK @@ -77387,7 +81642,9 @@ 3399286784,3399303167,JP 3399303168,3399311359,IN 3399311360,3399319551,JP -3399319552,3399335935,SG +3399319552,3399332351,SG +3399332352,3399332863,AU +3399332864,3399335935,SG 3399335936,3399344127,CN 3399344128,3399352319,JP 3399352320,3399389183,ID @@ -77497,16 +81754,19 @@ 3399942144,3399945983,HK 3399945984,3399946239,AU 3399946240,3399950335,HK -3399950336,3399954175,US -3399954176,3399954431,AU -3399954432,3399974911,US -3399974912,3399983744,MY +3399950336,3399954943,AU +3399954944,3399974911,US +3399974912,3399979007,HK +3399979008,3399983744,US 3399983745,3399983745,SG -3399983746,3399995391,MY +3399983746,3399991295,US +3399991296,3399995391,IN 3399995392,3399999487,KR 3399999488,3400000255,SG 3400000256,3400000511,AU -3400000512,3400004607,SG +3400000512,3400002303,SG +3400002304,3400002367,HK +3400002368,3400004607,SG 3400004608,3400004863,AU 3400004864,3400005119,SG 3400005120,3400005375,AU @@ -77643,7 +81903,9 @@ 3400647936,3400648191,AU 3400648192,3400648815,SG 3400648816,3400648831,HK -3400648832,3400650239,SG +3400648832,3400649943,SG +3400649944,3400649951,HK +3400649952,3400650239,SG 3400650240,3400654847,AU 3400654848,3400663039,IN 3400663040,3400683519,MY @@ -77771,7 +82033,9 @@ 3405820160,3405820415,CN 3405820416,3405832191,AU 3405832192,3405832447,CN -3405832448,3405841407,AU +3405832448,3405839359,AU +3405839360,3405840383,HK +3405840384,3405841407,AU 3405841408,3405842431,CN 3405842432,3405844991,AU 3405844992,3405845247,CN @@ -77818,7 +82082,7 @@ 3405960704,3405961215,CN 3405961216,3405963775,AU 3405963776,3405964287,CN -3405964288,3405964543,AU +3405964288,3405964543,JP 3405964544,3405964799,CN 3405964800,3405966335,AU 3405966336,3405966847,CN @@ -77848,7 +82112,9 @@ 3406008064,3406008319,CN 3406008320,3406070783,AU 3406070784,3406071551,CN -3406071552,3406075647,AU +3406071552,3406071807,AU +3406071808,3406073855,US +3406073856,3406075647,AU 3406075648,3406076927,CN 3406076928,3406077951,AU 3406077952,3406078207,TH @@ -77950,7 +82216,8 @@ 3406299392,3406301183,AU 3406301184,3406301439,CN 3406301440,3406305023,AU -3406305024,3406307327,CN +3406305024,3406305279,CN +3406305280,3406307327,HK 3406307328,3406317055,AU 3406317056,3406317311,CN 3406317312,3406320127,AU @@ -78016,7 +82283,9 @@ 3406405120,3406405375,CN 3406405376,3406409727,AU 3406409728,3406411775,NZ -3406411776,3406434303,AU +3406411776,3406413311,AU +3406413312,3406413823,JP +3406413824,3406434303,AU 3406434304,3406436351,MY 3406436352,3406438911,AU 3406438912,3406439167,CN @@ -78076,15 +82345,20 @@ 3406566400,3406566911,ID 3406566912,3406567423,AU 3406567424,3406567679,CN -3406567680,3406575871,AU +3406567680,3406572031,AU +3406572032,3406572287,JP +3406572288,3406575871,AU 3406575872,3406576127,CN 3406576128,3406577919,AU 3406577920,3406578431,CN 3406578432,3406579199,AU 3406579200,3406579711,CN 3406579712,3406583295,AU -3406583552,3406585855,CN -3406585856,3406586879,AU +3406583552,3406583807,CN +3406583808,3406585855,HK +3406585856,3406586111,AU +3406586112,3406586367,JP +3406586368,3406586879,AU 3406586880,3406587391,CN 3406587392,3406587647,AU 3406587648,3406587903,CN @@ -78097,7 +82371,8 @@ 3406594816,3406596351,AU 3406596352,3406596607,CN 3406596608,3406611455,AU -3406611456,3406614527,CN +3406611456,3406612479,CN +3406612480,3406614527,HK 3406614528,3406615295,AU 3406615296,3406615551,CN 3406615552,3406617343,AU @@ -78120,7 +82395,8 @@ 3406637312,3406638079,AU 3406638080,3406638591,CN 3406638592,3406647295,AU -3406647296,3406649855,CN +3406647296,3406649343,HK +3406649344,3406649855,CN 3406649856,3406650367,AU 3406650368,3406651391,CN 3406651392,3406664191,AU @@ -78159,7 +82435,8 @@ 3406737408,3406737663,ID 3406737664,3406739199,AU 3406739200,3406739455,ID -3406739456,3406741759,CN +3406739456,3406741503,HK +3406741504,3406741759,CN 3406741760,3406742015,AU 3406742016,3406742527,CN 3406742528,3406746623,AU @@ -78174,7 +82451,9 @@ 3406757888,3406761983,CN 3406761984,3406763007,AU 3406763008,3406763775,CN -3406763776,3406780159,AU +3406763776,3406775295,AU +3406775296,3406775551,JP +3406775552,3406780159,AU 3406780160,3406780927,CN 3406780928,3406784767,AU 3406784768,3406785023,CN @@ -78247,7 +82526,9 @@ 3406911488,3406911999,CN 3406912000,3406923775,AU 3406923776,3406924031,CN -3406924032,3406930943,AU +3406924032,3406930431,AU +3406930432,3406930687,JP +3406930688,3406930943,AU 3406930944,3406931199,CN 3406931200,3406936831,AU 3406936832,3406937087,CN @@ -78481,7 +82762,9 @@ 3407261696,3407263743,CN 3407263744,3407266303,AU 3407266304,3407266559,CN -3407266560,3407278591,AU +3407266560,3407268863,AU +3407268864,3407269119,US +3407269120,3407278591,AU 3407278592,3407279103,CN 3407279104,3407279359,AU 3407279360,3407279871,CN @@ -78562,7 +82845,9 @@ 3407377408,3407377663,CN 3407377664,3407378943,AU 3407378944,3407379455,CN -3407379456,3407384831,AU +3407379456,3407382271,AU +3407382272,3407382527,JP +3407382528,3407384831,AU 3407384832,3407385087,CN 3407385088,3407386623,AU 3407386624,3407387135,CN @@ -78675,7 +82960,8 @@ 3407522304,3407522559,CN 3407522560,3407523071,AU 3407523072,3407523327,CN -3407523328,3407523839,AU +3407523328,3407523583,AU +3407523584,3407523839,JP 3407523840,3407524095,CN 3407524096,3407526143,AU 3407526144,3407526399,CN @@ -78714,7 +83000,9 @@ 3407558144,3407560959,AU 3407560960,3407561471,CN 3407561472,3407561727,NZ -3407561728,3407565055,AU +3407561728,3407561983,AU +3407561984,3407562239,JP +3407562240,3407565055,AU 3407565056,3407565311,CN 3407565312,3407566847,AU 3407566848,3407567103,CN @@ -79084,7 +83372,7 @@ 3408017408,3408017919,CN 3408017920,3408020223,AU 3408020224,3408020479,CN -3408020480,3408020735,AU +3408020480,3408020735,JP 3408020736,3408020991,CN 3408020992,3408022527,AU 3408022528,3408022783,CN @@ -79285,7 +83573,9 @@ 3409574144,3409574399,CN 3409574400,3409575167,AU 3409575168,3409575935,CN -3409575936,3409838335,AU +3409575936,3409707007,AU +3409707008,3409772543,HK +3409772544,3409838335,AU 3409838336,3409838591,MY 3409838592,3409838847,CN 3409838848,3409871615,AU @@ -79400,11 +83690,12 @@ 3411149824,3411150847,IN 3411150848,3411152895,HK 3411152896,3411154943,CN +3411154944,3411156991,JP 3411156992,3411161087,PH 3411161088,3411165183,PK 3411165184,3411173375,MY 3411173376,3411177471,AU -3411181568,3411189759,JP +3411177472,3411189759,JP 3411189760,3411197951,AU 3411197952,3411202047,BD 3411202048,3411204607,AU @@ -79450,7 +83741,9 @@ 3411335680,3411337215,HK 3411337216,3411341311,AU 3411341312,3411345407,KR -3411345408,3411410943,HK +3411345408,3411354879,HK +3411354880,3411355647,SG +3411355648,3411410943,HK 3411410944,3411443711,CN 3411443712,3411460095,HK 3411460096,3411464191,NZ @@ -79491,15 +83784,9 @@ 3411644928,3411645951,ID 3411645952,3411646207,SG 3411646208,3411647487,IN -3411647488,3411648767,AU -3411648768,3411649023,NZ -3411649024,3411649279,AU -3411649280,3411649535,NZ -3411649536,3411649791,AU -3411649792,3411650303,NZ -3411650304,3411654399,AU -3411654400,3411654655,NZ -3411654656,3411673087,AU +3411647488,3411648511,AU +3411648512,3411656703,NZ +3411656704,3411673087,AU 3411673088,3411674111,CN 3411674112,3411674623,IN 3411674624,3411675135,HK @@ -79544,7 +83831,12 @@ 3411860224,3411861503,JP 3411861504,3411869695,AU 3411869696,3411943423,CN -3411943424,3411951615,NZ +3411943424,3411946495,NZ +3411946496,3411947007,AU +3411947008,3411948031,NZ +3411948032,3411948543,AU +3411948544,3411950591,NZ +3411950592,3411951615,AU 3411951616,3411967999,LK 3411968000,3411984383,AU 3411984384,3412000767,IN @@ -79557,7 +83849,10 @@ 3412213760,3412221951,AU 3412221952,3412230143,IN 3412230144,3412246527,HK -3412246528,3412254719,AU +3412246528,3412249903,AU +3412249904,3412249919,SG +3412249920,3412253695,AU +3412253696,3412254719,JP 3412254720,3412262911,NR 3412262912,3412264959,JP 3412264960,3412271103,CN @@ -79602,14 +83897,11 @@ 3412381696,3412385791,NZ 3412385792,3412393983,AU 3412393984,3412426751,IN -3412426752,3412431487,HK -3412431488,3412431551,TH -3412431552,3412433679,HK -3412433680,3412433695,TH -3412433696,3412433759,HK +3412426752,3412433759,TH 3412433760,3412433775,ID -3412433776,3412433783,TH -3412433784,3412434943,HK +3412433776,3412433791,TH +3412433792,3412433823,HK +3412433824,3412434943,TH 3412434944,3412443135,PK 3412443136,3412451327,SG 3412451328,3412526079,AU @@ -79620,7 +83912,9 @@ 3412598784,3412602879,CN 3412602880,3412606975,NC 3412606976,3412615167,PH -3412615168,3412656127,JP +3412615168,3412631551,JP +3412631552,3412639743,KR +3412639744,3412656127,JP 3412656128,3412672511,HK 3412672512,3412675071,JP 3412675072,3412675327,US @@ -79658,7 +83952,7 @@ 3413041152,3413043199,JP 3413043200,3413043967,CN 3413043968,3413044223,AU -3413044224,3413045247,HK +3413044224,3413045247,AP 3413045248,3413047295,IN 3413047296,3413098495,AU 3413098496,3413102591,JP @@ -79682,8 +83976,8 @@ 3413180416,3413213183,TH 3413213184,3413229567,VN 3413229568,3413245951,AU -3413245952,3413262335,SG -3413262336,3413270527,PH +3413245952,3413262335,MY +3413262336,3413263359,PH 3413270528,3413278719,TH 3413278720,3413295103,NZ 3413295104,3413303295,JP @@ -79787,7 +84081,9 @@ 3413950464,3413966847,IN 3413966848,3414040063,SG 3414040064,3414040319,AP -3414040320,3414067199,SG +3414040320,3414050303,SG +3414050304,3414050559,US +3414050560,3414067199,SG 3414067200,3414067455,AP 3414067456,3414155519,SG 3414155520,3414155775,PH @@ -79855,11 +84151,13 @@ 3414670592,3414670847,SG 3414670848,3414671359,MY 3414671360,3415080959,JP -3415080960,3415083007,SG -3415083008,3415083023,AU -3415083024,3415084031,SG +3415080960,3415082239,MY +3415082240,3415083007,SG +3415083008,3415083519,AU +3415083520,3415084031,SG 3415084032,3415084159,CN -3415084160,3415089151,SG +3415084160,3415088127,SG +3415088128,3415089151,HK 3415089152,3415097343,MY 3415097344,3415103487,ID 3415103488,3415113727,HK @@ -79914,8 +84212,7 @@ 3415564288,3415568383,JP 3415568384,3415572479,KR 3415572480,3415605247,SG -3415605248,3415736319,TH -3415736320,3415752703,SG +3415605248,3415752703,TH 3415752704,3415760895,CN 3415760896,3415769087,NZ 3415769088,3415777279,CN @@ -79957,7 +84254,7 @@ 3416262656,3416264703,AU 3416264704,3416268799,JP 3416268800,3416272895,HK -3416272896,3416274943,MN +3416274688,3416274943,MN 3416274944,3416276991,ID 3416276992,3416285183,HK 3416285184,3416287231,VN @@ -79978,7 +84275,7 @@ 3416327168,3416328191,HK 3416328192,3416330239,AU 3416330240,3416334335,ID -3416334336,3416342527,MY +3416334336,3416342527,SG 3416342528,3416371199,AU 3416371200,3416371711,PH 3416371712,3416371967,VN @@ -79995,7 +84292,11 @@ 3416375296,3416383487,CN 3416383488,3416391679,HK 3416391680,3416457215,VN -3416457216,3416475391,JP +3416457216,3416474583,JP +3416474584,3416474599,AU +3416474600,3416474639,JP +3416474640,3416474647,NZ +3416474648,3416475391,JP 3416475392,3416475647,NZ 3416475648,3416482047,JP 3416482048,3416482303,SG @@ -80006,7 +84307,11 @@ 3416514560,3416522751,IN 3416522752,3416588287,AU 3416588288,3416653823,JP -3416653824,3416686591,AU +3416653824,3416667135,AU +3416667136,3416667647,US +3416667648,3416667775,AU +3416667776,3416668159,US +3416668160,3416686591,AU 3416686592,3416694783,SG 3416694784,3416702975,CN 3416702976,3416707071,ID @@ -80016,7 +84321,7 @@ 3416709632,3416710143,AU 3416710144,3416711167,HK 3416711168,3416719359,AU -3416719360,3416727551,PH +3416719360,3416723455,PH 3416727552,3416735743,JP 3416735744,3416752127,PH 3416752128,3416784895,NZ @@ -80032,8 +84337,28 @@ 3416856576,3416858623,BD 3416858624,3416862719,HK 3416862720,3416864767,MN -3416864768,3416866815,HK -3416866816,3416883199,SG +3416864768,3416864895,JP +3416864896,3416865023,SG +3416865024,3416865151,HK +3416865152,3416865279,SG +3416865280,3416865287,JP +3416865288,3416865295,HK +3416865296,3416865303,AU +3416865304,3416865311,HK +3416865312,3416865327,SG +3416865328,3416865343,HK +3416865344,3416865359,JP +3416865360,3416865407,HK +3416865408,3416865599,JP +3416865600,3416865655,HK +3416865656,3416865791,JP +3416865792,3416865919,SG +3416865920,3416866055,HK +3416866056,3416866071,SG +3416866072,3416866079,HK +3416866080,3416866095,SG +3416866096,3416866559,HK +3416866560,3416883199,SG 3416883200,3416915967,HK 3416915968,3416920063,AU 3416920064,3416921087,TH @@ -80239,7 +84564,9 @@ 3418292992,3418293503,HK 3418293760,3418294015,AU 3418294272,3418296319,VN -3418296320,3418300415,HK +3418296320,3418298367,CN +3418298368,3418299391,HK +3418299392,3418300415,CN 3418300416,3418300927,BD 3418300928,3418301439,IN 3418301440,3418302463,AU @@ -80267,7 +84594,9 @@ 3418399232,3418399247,PH 3418399248,3418400255,AP 3418400256,3418400511,AU -3418400512,3418403583,AP +3418400512,3418401455,AP +3418401456,3418401459,TW +3418401460,3418403583,AP 3418403584,3418403839,AU 3418403840,3418406911,AP 3418406912,3418423295,IN @@ -80278,7 +84607,9 @@ 3418472448,3418480639,AU 3418480640,3418488831,CN 3418488832,3418505215,AU -3418505216,3418513407,JP +3418505216,3418512319,JP +3418512320,3418512335,AU +3418512336,3418513407,JP 3418513408,3418517503,IN 3418517504,3418519551,MN 3418519552,3418521599,CN @@ -80300,7 +84631,11 @@ 3418643456,3418644479,AU 3418644480,3418649343,JP 3418649344,3418649599,AP -3418649600,3418652671,JP +3418649600,3418650807,JP +3418650808,3418650808,HK +3418650809,3418650823,JP +3418650824,3418650839,HK +3418650840,3418652671,JP 3418652672,3418750975,IN 3418750976,3418816511,HK 3418816512,3418947583,IN @@ -80321,7 +84656,7 @@ 3418996736,3419013119,IN 3419013120,3419062271,AU 3419062272,3419070463,JP -3419070464,3419072511,HK +3419070464,3419072511,A2 3419073024,3419073279,SG 3419073280,3419073535,FJ 3419073536,3419074559,CN @@ -80454,18 +84789,22 @@ 3420061696,3420127231,HK 3420127232,3420323839,AU 3420323840,3420332031,TW -3420332032,3420367359,AU +3420332032,3420337439,AU +3420337440,3420337471,SG +3420337472,3420366959,AU +3420366960,3420366975,KR +3420366976,3420367359,AU 3420367360,3420367615,AP 3420367616,3420369007,AU 3420369008,3420369023,HK 3420369024,3420370559,AU 3420370560,3420370575,JP 3420370576,3420372991,AU -3420372992,3420374527,CN +3420372992,3420374527,HK 3420374528,3420374783,ID -3420374784,3420375551,CN +3420374784,3420375551,HK 3420375552,3420375807,ID -3420375808,3420377087,CN +3420375808,3420377087,HK 3420377088,3420389375,JP 3420389376,3420393471,US 3420393472,3420395519,CN @@ -80512,9 +84851,11 @@ 3423182848,3423184895,CA 3423184896,3423204095,US 3423204096,3423204351,CA -3423204352,3423221759,US -3423221760,3423222783,CA -3423222784,3423258623,US +3423204352,3423222271,US +3423222272,3423222527,CA +3423222528,3423248383,US +3423248384,3423249407,CA +3423249408,3423258623,US 3423258624,3423260671,CA 3423260672,3423264831,US 3423264832,3423264863,NG @@ -80525,8 +84866,7 @@ 3423269888,3423285247,US 3423285248,3423287295,CA 3423287296,3423288319,VG -3423288320,3423301631,US -3423302656,3423303679,US +3423288320,3423303679,US 3423303680,3423304703,CA 3423304704,3423311871,US 3423311872,3423313151,VI @@ -80541,8 +84881,9 @@ 3423416320,3423417343,CA 3423417344,3423430655,US 3423430656,3423431167,TC -3423431168,3423469567,US -3423471616,3423473663,US +3423431168,3423468543,US +3423468544,3423469567,CA +3423469568,3423473663,US 3423473664,3423474687,CA 3423474688,3423479807,US 3423479808,3423480063,A2 @@ -80552,9 +84893,10 @@ 3423480988,3423480988,US 3423480989,3423481343,NG 3423481344,3423481855,A2 -3423481856,3423489023,US +3423481856,3423487999,US +3423488000,3423489023,CA 3423489024,3423490047,A1 -3423491072,3423493631,US +3423490048,3423493631,US 3423493632,3423493887,RU 3423493888,3423533055,US 3423533056,3423535103,AI @@ -80614,8 +84956,7 @@ 3424378880,3424379135,PR 3424379136,3424412415,US 3424412416,3424412671,CA -3424412672,3424413695,US -3424415744,3424493823,US +3424412672,3424493823,US 3424493824,3424494079,CA 3424494080,3424507135,US 3424507136,3424507391,CA @@ -80645,7 +84986,18 @@ 3426400256,3426400511,CA 3426400512,3426415871,US 3426415872,3426416127,GB -3426416128,3426617855,US +3426416128,3426418687,US +3426418688,3426420479,GB +3426420480,3426420735,US +3426420736,3426435071,GB +3426435072,3426439167,SG +3426439168,3426441215,AU +3426441216,3426441727,HK +3426441728,3426445823,US +3426445824,3426446335,DE +3426446336,3426482687,US +3426482688,3426484223,CA +3426484224,3426617855,US 3426617856,3426618367,CA 3426618368,3426679039,US 3426679040,3426679295,ES @@ -80837,7 +85189,9 @@ 3428299520,3428299775,MU 3428299776,3428302079,US 3428302080,3428302335,CA -3428302336,3428318975,US +3428302336,3428306175,US +3428306176,3428306431,PE +3428306432,3428318975,US 3428318976,3428319231,CA 3428319232,3428399359,US 3428399360,3428399615,CA @@ -80936,9 +85290,7 @@ 3428753408,3428958207,US 3428958208,3428962303,CO 3428962304,3429171199,US -3429171200,3429183487,CA -3429183488,3429183743,A2 -3429183744,3429189631,CA +3429171200,3429189631,CA 3429189632,3429189887,A2 3429189888,3429236735,CA 3429236736,3429381887,US @@ -81090,8 +85442,8 @@ 3432133888,3432134143,GB 3432134144,3432205311,US 3432205312,3432206335,CA -3432206336,3432253439,US -3432253440,3432253951,CA +3432206336,3432253695,US +3432253696,3432253951,CA 3432253952,3432265983,US 3432265984,3432267263,DE 3432267264,3432280063,US @@ -81236,7 +85588,7 @@ 3437336064,3437336319,US 3437336320,3437341695,CA 3437341696,3437341951,US -3437341952,3437343231,CA +3437342208,3437343231,CA 3437343232,3437343487,US 3437343488,3437350911,CA 3437350912,3437351423,US @@ -81471,9 +85823,7 @@ 3449254144,3449254911,US 3449254912,3449273599,CA 3449273600,3449273855,US -3449273856,3449278975,CA -3449278976,3449279487,US -3449279488,3449290495,CA +3449273856,3449290495,CA 3449290496,3449575423,US 3449575424,3449575679,AU 3449575680,3449582848,US @@ -81508,7 +85858,13 @@ 3449994240,3449994495,MX 3449994496,3450085375,US 3450085376,3450085631,A1 -3450085632,3450217215,US +3450085632,3450086143,US +3450086144,3450086655,CH +3450086656,3450088191,US +3450088192,3450088447,CH +3450088448,3450093055,US +3450093056,3450093311,CH +3450093312,3450217215,US 3450217216,3450217471,LC 3450217472,3450254079,US 3450254080,3450254335,CA @@ -81517,7 +85873,9 @@ 3450272768,3450275327,US 3450275328,3450275583,GB 3450275584,3450275839,FR -3450275840,3450612479,US +3450275840,3450345359,US +3450345360,3450345367,DE +3450345368,3450612479,US 3450612480,3450612735,CA 3450612736,3450685183,US 3450685184,3450685439,CA @@ -81638,10 +85996,132 @@ 3452678400,3452682239,BE 3452682240,3452715007,US 3452715008,3452723199,CA -3452723200,3452764159,US -3452764160,3452810239,CA -3452810240,3452810751,US -3452810752,3452895231,CA +3452723200,3452764671,US +3452764672,3452765183,CA +3452765184,3452765439,US +3452765440,3452765951,CA +3452765952,3452766207,US +3452766208,3452766463,CA +3452766464,3452766975,US +3452766976,3452767487,CA +3452767488,3452767743,US +3452767744,3452767999,CA +3452768000,3452768607,US +3452768608,3452768639,CA +3452768640,3452769023,US +3452769024,3452769535,CA +3452769536,3452769791,US +3452769792,3452770047,CA +3452770048,3452770303,US +3452770304,3452770559,CA +3452770560,3452770815,US +3452770816,3452771071,CA +3452771072,3452771327,US +3452771328,3452771583,CA +3452771584,3452771839,US +3452771840,3452773119,CA +3452773120,3452773375,US +3452773376,3452773887,CA +3452773888,3452774143,US +3452774144,3452774911,CA +3452774912,3452775167,US +3452775168,3452775935,CA +3452775936,3452776191,US +3452776192,3452776703,CA +3452776704,3452776959,US +3452776960,3452777471,CA +3452777472,3452777727,US +3452777728,3452779007,CA +3452779008,3452779263,US +3452779264,3452779519,CA +3452779520,3452780031,US +3452780032,3452780543,CA +3452780544,3452781055,US +3452781056,3452781567,CA +3452781568,3452781823,US +3452781824,3452782079,CA +3452782080,3452782335,US +3452782336,3452783359,CA +3452783360,3452783871,US +3452783872,3452784639,CA +3452784640,3452784895,US +3452784896,3452785151,CA +3452785152,3452785407,US +3452785408,3452785919,CA +3452785920,3452786175,US +3452786176,3452787455,CA +3452787456,3452787711,US +3452787712,3452789503,CA +3452789504,3452789759,US +3452789760,3452790271,CA +3452790272,3452791551,US +3452791552,3452793087,CA +3452793088,3452793343,US +3452793344,3452793599,CA +3452793600,3452793855,US +3452793856,3452795135,CA +3452795136,3452795391,US +3452795392,3452796159,CA +3452796160,3452796415,US +3452796416,3452797183,CA +3452797184,3452797439,US +3452797440,3452798719,CA +3452798720,3452798975,US +3452798976,3452799487,CA +3452799488,3452799743,US +3452799744,3452801535,CA +3452801536,3452801791,US +3452801792,3452802559,CA +3452802560,3452802815,US +3452802816,3452803327,CA +3452803328,3452803583,US +3452803584,3452806143,CA +3452806144,3452806911,US +3452806912,3452807167,CA +3452807168,3452807423,US +3452807424,3452807679,CA +3452807680,3452807935,US +3452807936,3452808191,CA +3452808192,3452808447,US +3452808448,3452809727,CA +3452809728,3452809983,US +3452809984,3452810239,CA +3452810240,3452811007,US +3452811008,3452811519,CA +3452811520,3452811775,US +3452811776,3452812287,CA +3452812288,3452812543,US +3452812544,3452813311,CA +3452813312,3452813567,US +3452813568,3452814079,CA +3452814080,3452814335,US +3452814336,3452816127,CA +3452816128,3452816511,US +3452816512,3452816527,CA +3452816528,3452816895,US +3452816896,3452817663,CA +3452817664,3452817919,US +3452817920,3452818431,CA +3452818432,3452818687,US +3452818688,3452818943,CA +3452818944,3452819199,US +3452819200,3452819711,CA +3452819712,3452820479,US +3452820480,3452820735,CA +3452820736,3452820991,US +3452820992,3452821503,CA +3452821504,3452822271,US +3452822272,3452822527,CA +3452822528,3452822783,US +3452822784,3452824063,CA +3452824064,3452824319,US +3452824320,3452824575,CA +3452824576,3452824831,US +3452824832,3452825599,CA +3452825600,3452825855,US +3452825856,3452828927,CA +3452828928,3452829439,US +3452829440,3452895231,CA 3452895232,3452895487,US 3452895488,3452902399,CA 3452902400,3452902655,US @@ -81758,9 +86238,9 @@ 3454003014,3454003014,ES 3454003015,3454004997,US 3454004998,3454004998,GB -3454004999,3454292479,US -3454292480,3454292735,GB -3454292736,3454436351,US +3454004999,3454287871,US +3454287872,3454296063,GB +3454296064,3454436351,US 3454436352,3454436607,GU 3454436608,3454497791,US 3454497792,3454498815,MX @@ -82001,6 +86481,8 @@ 3458813952,3458818047,CA 3458818048,3458820095,US 3458820096,3458820351,CA +3458820352,3458820863,US +3458820864,3458821119,JM 3458822144,3459055615,US 3459055616,3459121151,CA 3459121152,3459186687,US @@ -82044,14 +86526,7 @@ 3459327488,3459327999,CO 3459328000,3459329023,CL 3459329024,3459330047,VE -3459330048,3459330559,CL -3459330560,3459331071,US -3459331072,3459331583,MX -3459331584,3459332607,PA -3459332608,3459333119,US -3459333120,3459333631,PW -3459333632,3459333887,MR -3459333888,3459334399,US +3459330048,3459334399,US 3459334400,3459334655,CA 3459334656,3459335423,US 3459335424,3459335679,VE @@ -82083,9 +86558,7 @@ 3459342592,3459342847,BY 3459342848,3459343103,VE 3459343104,3459343359,BR -3459343360,3459343487,US -3459343488,3459343551,CA -3459343552,3459343615,US +3459343360,3459343615,CA 3459343616,3459344127,OM 3459344128,3459345663,US 3459345664,3459345919,OM @@ -82135,7 +86608,6 @@ 3459455744,3459456511,CA 3459456512,3459456767,US 3459456768,3459457279,CA -3459457280,3459457535,US 3459457536,3459457791,CA 3459457792,3459458047,PR 3459458048,3459512319,US @@ -82322,7 +86794,12 @@ 3461356544,3461357567,AS 3461357568,3461408767,US 3461410816,3461414911,CA -3461414912,3461513727,US +3461414912,3461462015,US +3461462016,3461462271,AU +3461462272,3461462527,NL +3461462528,3461462783,US +3461462784,3461463039,SG +3461463040,3461513727,US 3461513728,3461513983,BF 3461513984,3461514495,US 3461514496,3461514751,QA @@ -82500,7 +86977,9 @@ 3464631296,3464650751,CA 3464650752,3464664063,US 3464664064,3464691711,CA -3464691712,3464769535,US +3464691712,3464740863,US +3464740864,3464744959,PH +3464744960,3464769535,US 3464769536,3464773631,CA 3464773632,3464774079,US 3464774080,3464774111,ES @@ -82530,7 +87009,15 @@ 3466067968,3466068223,CA 3466068224,3466068991,US 3466068992,3466069247,CA -3466069248,3466073055,US +3466069248,3466069343,US +3466069344,3466069375,CA +3466069376,3466069447,US +3466069448,3466069455,CA +3466069456,3466072431,US +3466072432,3466072439,CA +3466072440,3466072775,US +3466072776,3466072783,CA +3466072784,3466073055,US 3466073056,3466073087,CA 3466073088,3466158079,US 3466158080,3466166271,PA @@ -82727,7 +87214,9 @@ 3470148096,3470148351,CA 3470148352,3470148607,US 3470148608,3470148863,CA -3470148864,3470151935,US +3470148864,3470151807,US +3470151808,3470151871,CA +3470151872,3470151935,US 3470151936,3470152191,EG 3470152192,3470188111,US 3470188112,3470188115,CA @@ -82743,7 +87232,9 @@ 3470558208,3470559231,HK 3470559232,3470573567,US 3470573568,3470575615,CA -3470575616,3470646591,US +3470575616,3470610431,US +3470610432,3470614527,AR +3470614528,3470646591,US 3470646592,3470646599,CN 3470646600,3470651391,US 3470651392,3470655487,CA @@ -82759,7 +87250,7 @@ 3470749952,3470750207,CA 3470750208,3470752767,US 3470752768,3470753023,CO -3470753024,3470754303,US +3470753024,3470754047,US 3470754304,3470754559,PE 3470754560,3470755839,US 3470755840,3470756095,MU @@ -82803,7 +87294,8 @@ 3473039360,3473040639,BM 3473040640,3473040895,US 3473040896,3473041407,BM -3473041408,3473067007,US +3473041408,3473043455,US +3473047552,3473067007,US 3473067008,3473068031,CA 3473068032,3473276927,US 3473276928,3473342463,CA @@ -82849,17 +87341,11 @@ 3475670848,3475671039,AG 3475671040,3475681279,US 3475681280,3475685375,HN -3475685376,3475881983,US -3475881984,3475882767,CA +3475685376,3475882767,US 3475882768,3475882783,FR -3475882784,3475882799,CA +3475882784,3475882799,US 3475882800,3475882815,FR -3475882816,3475884031,CA -3475884032,3475884287,US -3475884288,3475888127,CA -3475888128,3475888383,US -3475888384,3475890175,CA -3475890176,3475896319,US +3475882816,3475896319,US 3475896320,3475896575,FR 3475896576,3475896831,EU 3475896832,3475897471,US @@ -82889,16 +87375,16 @@ 3476946944,3477312511,US 3477312512,3477312767,A1 3477312768,3477542143,US -3477542144,3477542207,IN -3477542208,3477542271,US -3477542272,3477542399,IN +3477542144,3477542399,IN 3477542400,3478114303,US 3478114304,3478118399,PE 3478118400,3478192127,US 3478192128,3478257663,CA 3478257664,3478274823,US 3478274824,3478274831,GB -3478274832,3478372351,US +3478274832,3478288671,US +3478288672,3478288703,GB +3478288704,3478372351,US 3478372352,3478380543,MX 3478380544,3479207935,US 3479207936,3479240703,CA @@ -83135,9 +87621,7 @@ 3482043904,3482044927,CA 3482044928,3482045183,US 3482045184,3482045695,CA -3482045696,3482046207,US -3482046208,3482046463,CA -3482046464,3482046975,US +3482045696,3482046975,US 3482046976,3482047487,CA 3482047488,3482047743,US 3482047744,3482047999,CA @@ -83272,9 +87756,7 @@ 3485462528,3485464575,VC 3485464576,3485466623,LC 3485466624,3485597695,US -3485597696,3485671583,CA -3485671584,3485671615,US -3485671616,3485672543,CA +3485597696,3485672543,CA 3485672544,3485672551,US 3485672552,3485695999,CA 3485696000,3485721056,US @@ -83561,7 +88043,25 @@ 3488956416,3488989183,US 3488989184,3489005567,CA 3489005568,3489136639,US -3489136640,3489267711,MX +3489136640,3489153535,MX +3489153536,3489154047,HN +3489154048,3489155583,MX +3489155584,3489156607,AR +3489156608,3489157119,MX +3489157632,3489158399,MX +3489158400,3489158655,AR +3489159168,3489160191,MX +3489160192,3489161215,AR +3489161216,3489162495,MX +3489162496,3489162751,GT +3489163264,3489167615,MX +3489167616,3489167871,PE +3489167872,3489168127,MX +3489168128,3489168383,PE +3489168384,3489169407,AR +3489169408,3489185791,MX +3489185792,3489193983,CL +3489193984,3489267711,MX 3489267712,3489341439,US 3489341440,3489345535,CA 3489345536,3489398783,US @@ -83635,7 +88135,9 @@ 3492868608,3492868863,MX 3492868864,3492869631,US 3492869632,3492869887,BR -3492869888,3492886527,US +3492869888,3492877954,US +3492877955,3492877955,CA +3492877956,3492886527,US 3492886528,3492886559,GB 3492886560,3492886591,US 3492886592,3492886783,GB @@ -83705,16 +88207,9 @@ 3493081600,3493082623,PY 3493082624,3493089023,US 3493089024,3493089279,CM -3493089280,3493136639,US -3493136640,3493136895,GB -3493136896,3493137663,US -3493137664,3493137919,CH -3493137920,3493139967,US -3493139968,3493140223,JM +3493089280,3493140223,US 3493140224,3493140479,DE -3493140480,3493142271,US -3493142272,3493142527,ID -3493142528,3493244927,US +3493140480,3493244927,US 3493244928,3493249023,PR 3493249024,3493866495,US 3493866496,3493867519,VG @@ -83726,8 +88221,7 @@ 3493901024,3493901031,HK 3493901032,3493901311,US 3493901312,3493901567,AE -3493901568,3493928959,US -3493931008,3493936127,US +3493901568,3493936127,US 3493936128,3493937151,CA 3493937152,3493939455,US 3493939456,3493939711,CA @@ -83750,7 +88244,7 @@ 3494010880,3494014975,US 3494014976,3494017023,CA 3494017024,3494043647,US -3494044672,3494045695,CA +3494043648,3494045695,CA 3494045696,3494049791,US 3494049792,3494051839,CA 3494051840,3494075391,US @@ -83773,13 +88267,15 @@ 3494168576,3494170623,CA 3494170624,3494181631,US 3494181632,3494181887,SN -3494182912,3494184959,US +3494181888,3494184959,US 3494184960,3494187007,CA 3494187008,3494191359,US 3494191360,3494191615,DE 3494191616,3494191871,GB 3494191872,3494192127,NL -3494192128,3494197247,US +3494192128,3494192383,US +3494192384,3494192639,JP +3494192640,3494197247,US 3494197248,3494198271,CA 3494198272,3494244351,US 3494244352,3494246399,CA @@ -83843,7 +88339,8 @@ 3494605824,3494606847,CA 3494606848,3494610943,US 3494610944,3494611967,CA -3494611968,3494624255,US +3494611968,3494615039,US +3494617088,3494624255,US 3494624256,3494625279,CA 3494625280,3494627327,US 3494627328,3494628351,BM @@ -83861,7 +88358,9 @@ 3494727680,3494729727,CA 3494729728,3494730751,US 3494730752,3494731775,CA -3494731776,3494747135,US +3494731776,3494743039,US +3494743040,3494744063,CA +3494744064,3494747135,US 3494747136,3494748159,CA 3494748160,3494757375,US 3494757376,3494758399,CA @@ -83887,8 +88386,7 @@ 3494862848,3494863871,DM 3494863872,3494866943,US 3494866944,3494867967,CA -3494867968,3494868991,US -3494870016,3494874111,US +3494867968,3494874111,US 3494874112,3494874367,ES 3494874368,3494893567,US 3494893568,3494894591,CA @@ -83945,7 +88443,7 @@ 3495251968,3495254015,CA 3495254016,3495260159,US 3495260160,3495261183,CA -3495262208,3495285759,US +3495261184,3495285759,US 3495286784,3495288831,CA 3495288832,3495331839,US 3495331840,3495332863,A2 @@ -83980,8 +88478,7 @@ 3495478272,3495479295,CA 3495479296,3495505919,US 3495505920,3495507967,CA -3495507968,3495508991,US -3495510016,3495515135,US +3495507968,3495515135,US 3495515136,3495516159,CA 3495516160,3495526399,US 3495526400,3495527423,CA @@ -83989,9 +88486,7 @@ 3495542784,3495544063,A2 3495544064,3495544319,NG 3495544320,3495544831,A2 -3495544832,3495550207,US -3495550208,3495550463,CA -3495550464,3495551999,US +3495544832,3495551999,US 3495552000,3495553023,BM 3495553024,3495579647,US 3495579648,3495581695,CA @@ -84623,7 +89118,9 @@ 3509583616,3509583871,CA 3509583872,3509731327,US 3509731328,3509739519,CA -3509739520,3509846015,US +3509739520,3509828095,US +3509828096,3509828159,CA +3509828160,3509846015,US 3509846016,3509977087,CA 3509977088,3509993471,US 3509993472,3509997567,CA @@ -84785,7 +89282,7 @@ 3512247040,3512247295,NG 3512247296,3512248319,US 3512248320,3512248831,CO -3512248832,3512249087,US +3512248832,3512249087,CL 3512249088,3512249343,CO 3512249344,3512256511,IL 3512256512,3512258559,CL @@ -84871,25 +89368,9 @@ 3512593792,3512593919,US 3512593920,3512594175,AP 3512594176,3512594431,MY -3512594432,3512595199,US -3512595200,3512595455,TW -3512595456,3512596223,US -3512596224,3512596479,JP -3512596480,3512596991,US -3512596992,3512597247,TH -3512597248,3512597759,US -3512597760,3512598015,JP -3512598016,3512598271,US -3512598272,3512598527,PH -3512598528,3512647679,US +3512594432,3512647679,US 3512647680,3512655871,TT -3512655872,3512696831,US -3512696832,3512701951,SE -3512701952,3512702975,US -3512702976,3512703231,SE -3512703232,3512703359,US -3512703360,3512705023,SE -3512705024,3512844287,US +3512655872,3512844287,US 3512844288,3512852479,CA 3512852480,3512931583,US 3512931584,3512931839,CA @@ -84907,9 +89388,7 @@ 3513475072,3513483263,CA 3513499648,3513501183,US 3513501184,3513501439,PH -3513501440,3513506559,US -3513506560,3513506815,CA -3513506816,3513670911,US +3513501440,3513670911,US 3513670912,3513671167,A2 3513671168,3513778175,US 3513778176,3513794559,CA @@ -84943,7 +89422,9 @@ 3514592256,3514593279,SV 3514593280,3514596863,US 3514596864,3514597375,SV -3514597376,3514826751,US +3514597376,3514732071,US +3514732072,3514732075,UA +3514732076,3514826751,US 3514826752,3514843135,CA 3514843136,3514993919,US 3514993920,3514993983,GB @@ -84992,7 +89473,9 @@ 3516366848,3516370943,CA 3516370944,3516514303,US 3516514304,3516530687,CA -3516530688,3516899327,US +3516530688,3516643083,US +3516643084,3516643087,PR +3516643088,3516899327,US 3516899328,3516899839,A2 3516899840,3516900095,NG 3516900096,3516900351,A2 @@ -85026,7 +89509,9 @@ 3517383168,3517383423,US 3517383424,3517384703,CA 3517384704,3517385215,US -3517385216,3517387263,CA +3517385216,3517385727,CA +3517385728,3517385983,US +3517385984,3517387263,CA 3517387264,3517387519,US 3517387520,3517387775,CA 3517387776,3517388287,US @@ -85175,7 +89660,9 @@ 3517597696,3517597951,IE 3517597952,3517598207,DE 3517598208,3517598463,IE -3517598464,3517599359,SE +3517598464,3517599263,SE +3517599264,3517599295,US +3517599296,3517599359,SE 3517599360,3517599615,US 3517599616,3517600767,SE 3517600768,3517601279,US @@ -85291,10 +89778,7 @@ 3520020480,3520031487,CA 3520031488,3520031743,US 3520031744,3520036863,CA -3520036864,3520086271,US -3520086272,3520086527,CA -3520086528,3520135167,US -3520167936,3520356351,US +3520036864,3520356351,US 3520356352,3520364543,ZA 3520364544,3520369096,US 3520369097,3520369097,A1 @@ -85315,7 +89799,8 @@ 3520954368,3520987903,US 3520987904,3520987935,A1 3520987936,3520994815,US -3520994816,3520995327,ES +3520994816,3520995071,GB +3520995072,3520995327,ES 3520995328,3520999423,US 3520999424,3521003519,CA 3521003520,3521028095,US @@ -85376,9 +89861,9 @@ 3522123520,3522123775,GB 3522123776,3522125055,US 3522125056,3522125311,GB -3522125312,3522130253,US -3522130254,3522130254,UA -3522130255,3522174975,US +3522125312,3522132395,US +3522132396,3522132396,BR +3522132397,3522174975,US 3522174976,3522179071,BM 3522179072,3522195455,US 3522195456,3522199551,CA @@ -85437,7 +89922,9 @@ 3523682304,3523686399,NZ 3523686400,3523690495,AU 3523690496,3523698687,IN -3523698688,3523707903,JP +3523698688,3523700735,JP +3523700736,3523701759,HK +3523701760,3523707903,JP 3523707904,3523708159,AU 3523708160,3523709183,JP 3523709184,3523709951,CN @@ -85469,22 +89956,7 @@ 3524745728,3524745983,GU 3524745984,3524747263,MP 3524747264,3524755455,PH -3524755456,3524756223,AU -3524756224,3524756479,SG -3524756480,3524756991,AU -3524756992,3524757247,SG -3524757248,3524758015,AU -3524758016,3524758271,SG -3524758272,3524758527,AU -3524758528,3524758783,SG -3524758784,3524759039,AU -3524759040,3524759295,SG -3524759296,3524759551,AU -3524759552,3524760575,SG -3524760576,3524761343,AU -3524761344,3524761599,SG -3524761600,3524761855,AU -3524761856,3524763647,SG +3524755456,3524763647,AU 3524763648,3524788223,PH 3524788224,3524853759,SG 3524853760,3526361087,CN @@ -85526,7 +89998,7 @@ 3528404992,3528407039,NZ 3528407040,3528409087,AU 3528409088,3528425471,CN -3528441856,3528445951,JP +3528425472,3528445951,JP 3528445952,3528450047,ID 3528450048,3528458239,CN 3528458240,3528474623,AP @@ -85560,22 +90032,23 @@ 3532929536,3533765631,JP 3533765632,3533765887,CN 3533765888,3534749695,JP -3534749696,3534758043,HK -3534758044,3534758143,AU +3534749696,3534757887,HK +3534757888,3534758143,AU 3534758144,3534758147,JP -3534758148,3534758911,HK +3534758148,3534758911,AU 3534758912,3534758927,PH -3534758928,3534758975,HK +3534758928,3534758975,AU 3534758976,3534759039,PH -3534759040,3534759167,HK +3534759040,3534759167,AU 3534759168,3534759183,JP -3534759184,3534760703,HK +3534759184,3534760703,AU 3534760704,3534760711,NZ -3534760712,3534761471,HK -3534761472,3534761535,AU -3534761536,3534763775,HK +3534760712,3534761983,AU +3534761984,3534763775,HK 3534763776,3534764031,AP -3534764032,3534867711,HK +3534764032,3534863443,HK +3534863444,3534863444,CN +3534863445,3534867711,HK 3534867712,3534867967,AP 3534867968,3534880767,HK 3534880768,3535273983,KR @@ -85684,7 +90157,9 @@ 3557015552,3557023743,DE 3557023744,3557027327,GB 3557027328,3557027583,NL -3557027584,3557031935,GB +3557027584,3557028415,GB +3557028416,3557028479,BE +3557028480,3557031935,GB 3557031936,3557040127,IT 3557040128,3557048319,NO 3557048320,3557056511,CH @@ -85693,7 +90168,9 @@ 3557072896,3557081087,DE 3557081088,3557089279,NL 3557089280,3557105663,DE -3557105664,3557113855,BG +3557105664,3557111807,BG +3557111808,3557112831,GB +3557112832,3557113855,BG 3557113856,3557130239,RU 3557130240,3557138431,BG 3557138432,3557146623,RU @@ -85787,7 +90264,9 @@ 3557860832,3557860847,FI 3557860848,3557861983,SE 3557861984,3557862015,FI -3557862016,3557864311,SE +3557862016,3557863295,SE +3557863296,3557863327,FI +3557863328,3557864311,SE 3557864312,3557864319,FI 3557864320,3557867519,SE 3557867520,3557875711,RU @@ -85853,9 +90332,13 @@ 3558203392,3558211583,ES 3558211584,3558219775,GB 3558219776,3558227967,ES -3558227968,3558234623,RU +3558227968,3558232063,RU +3558232064,3558234111,ES +3558234112,3558234623,RU 3558234624,3558234879,UA -3558234880,3558236159,RU +3558234880,3558235647,RU +3558235648,3558235903,LB +3558235904,3558236159,RU 3558236160,3558244351,GB 3558244352,3558252543,IT 3558252544,3558260735,KE @@ -86038,7 +90521,9 @@ 3559448576,3559456767,ES 3559456768,3559473151,RU 3559473152,3559489535,CH -3559489536,3559505919,GB +3559489536,3559491759,GB +3559491760,3559491767,NL +3559491768,3559505919,GB 3559505920,3559514111,CH 3559514112,3559522303,AT 3559522304,3559530495,GB @@ -86084,11 +90569,13 @@ 3559874560,3559882751,LT 3559882752,3559890943,AZ 3559890944,3559899135,CH -3559899136,3559899903,UA -3559899904,3559899967,EE +3559899136,3559899647,UA +3559899648,3559899967,EE 3559899968,3559900223,UA 3559900224,3559900287,EE -3559900288,3559903231,UA +3559900288,3559902719,UA +3559902720,3559902975,EE +3559902976,3559903231,UA 3559903232,3559907327,EE 3559907328,3559915519,FR 3559915520,3559923711,IT @@ -86507,7 +90994,9 @@ 3562479616,3562487807,DE 3562487808,3562495999,GB 3562496000,3562504191,BE -3562504192,3562512383,DE +3562504192,3562507071,DE +3562507072,3562507199,AT +3562507200,3562512383,DE 3562512384,3562519551,UA 3562519552,3562520575,BG 3562528768,3562536959,PL @@ -86664,7 +91153,9 @@ 3563847680,3563848447,NL 3563848448,3563848703,EU 3563848704,3563848847,NL -3563848848,3563848855,EU +3563848848,3563848848,EU +3563848849,3563848849,NL +3563848850,3563848855,EU 3563848856,3563855871,NL 3563855872,3563864063,AT 3563864064,3563872255,GB @@ -86690,9 +91181,7 @@ 3564019712,3564023807,GB 3564023808,3564024831,IT 3564024832,3564027903,GB -3564027904,3564036095,DE -3564036096,3564043263,A2 -3564043264,3564044287,DE +3564027904,3564044287,DE 3564044288,3564052479,CZ 3564052480,3564060671,GB 3564060672,3564068863,RU @@ -86755,7 +91244,9 @@ 3564571696,3564571703,DE 3564571704,3564572427,GB 3564572428,3564572431,ES -3564572432,3564576767,GB +3564572432,3564572527,GB +3564572528,3564572531,DK +3564572532,3564576767,GB 3564584960,3564593151,SA 3564593152,3564601343,RU 3564601344,3564609535,EE @@ -86786,7 +91277,9 @@ 3564736536,3564736543,DE 3564736544,3564739345,GB 3564739346,3564739346,DE -3564739347,3564740607,GB +3564739347,3564739367,GB +3564739368,3564739375,DE +3564739376,3564740607,GB 3564740608,3564748799,FR 3564748800,3564756991,GB 3564756992,3564765183,ES @@ -86832,7 +91325,9 @@ 3564895744,3564896255,GB 3564896256,3564904447,RU 3564904448,3564912639,DE -3564912640,3564920831,BG +3564912640,3564915711,NL +3564915712,3564915967,BG +3564915968,3564920831,NL 3564920832,3564922111,DE 3564922112,3564929023,US 3564929024,3564937215,AT @@ -87038,12 +91533,10 @@ 3565767632,3565767679,EU 3565767680,3565767999,GB 3565768000,3565768207,EU -3565768208,3565768271,GB -3565768272,3565768279,EU -3565768280,3565768295,GB -3565768296,3565768311,EU -3565768312,3565768335,GB -3565768336,3565768447,EU +3565768208,3565768223,GB +3565768224,3565768239,EU +3565768240,3565768247,GB +3565768248,3565768447,EU 3565768448,3565768575,GB 3565768576,3565768703,EU 3565768704,3565768983,GB @@ -87236,7 +91729,9 @@ 3567403008,3567419391,IT 3567419392,3567427583,SA 3567427584,3567435775,SE -3567435776,3567456407,GB +3567435776,3567453695,GB +3567453696,3567453951,ES +3567453952,3567456407,GB 3567456408,3567456415,ES 3567456416,3567458305,GB 3567458306,3567458306,ES @@ -87250,7 +91745,9 @@ 3567499008,3567499135,ES 3567499136,3567503359,GB 3567503360,3567504383,ES -3567504384,3567511487,GB +3567504384,3567505151,GB +3567505152,3567505407,ES +3567505408,3567511487,GB 3567511488,3567511495,ES 3567511496,3567516671,GB 3567516672,3567517695,ES @@ -87287,7 +91784,15 @@ 3567620096,3567620351,IN 3567620352,3567626239,A2 3567626240,3567626751,TZ -3567626752,3567647487,A2 +3567626752,3567627263,A2 +3567627264,3567628287,LU +3567628288,3567629311,GB +3567629312,3567630335,A2 +3567630336,3567634431,LU +3567634432,3567635455,GB +3567635456,3567636479,A2 +3567636480,3567646719,LU +3567646720,3567647487,A2 3567647488,3567648767,GB 3567648768,3567665151,BE 3567665152,3567673343,ES @@ -87296,9 +91801,14 @@ 3567714304,3567715327,GB 3567715328,3567715583,EU 3567715584,3567715839,GB -3567715840,3567718399,EU -3567718400,3567719423,US -3567719424,3567779839,EU +3567715840,3567716351,EU +3567716352,3567717375,GB +3567717376,3567718399,EU +3567718400,3567718655,US +3567718656,3567718911,GB +3567718912,3567719423,US +3567719424,3567719679,GB +3567719680,3567779839,EU 3567779840,3567845375,DE 3567845376,3567861759,GB 3567861760,3567878143,NO @@ -87898,7 +92408,9 @@ 3576245248,3576245503,FR 3576245504,3576251135,GB 3576251136,3576251391,FR -3576251392,3576252415,GB +3576251392,3576251711,GB +3576251712,3576251775,FR +3576251776,3576252415,GB 3576252416,3576252671,FR 3576252672,3576253807,GB 3576253808,3576253815,FR @@ -88214,7 +92726,10 @@ 3582091264,3582099455,QA 3582099456,3582107647,GB 3582107648,3582115839,NL -3582115840,3582116863,SE +3582115840,3582115903,EE +3582115904,3582115935,SE +3582115936,3582115967,EE +3582115968,3582116863,SE 3582116864,3582117887,EE 3582117888,3582120447,LT 3582120448,3582120959,SE @@ -88814,7 +93329,11 @@ 3586476304,3586490367,HU 3586490368,3586506751,LT 3586506752,3586523135,NL -3586523136,3586555903,DE +3586523136,3586544267,DE +3586544268,3586544271,DK +3586544272,3586544383,DE +3586544384,3586544511,DK +3586544512,3586555903,DE 3586555904,3586572287,IT 3586572288,3586588671,RS 3586588672,3586596863,IT @@ -88891,14 +93410,13 @@ 3587178496,3587186687,AT 3587186688,3587186943,DE 3587186944,3587187199,GB -3587187200,3587187455,A2 +3587187200,3587187455,DE 3587187456,3587187711,GB -3587187712,3587188223,A2 +3587187712,3587188223,DE 3587188224,3587188479,AM -3587188480,3587192831,A2 -3587192832,3587193087,DE +3587188480,3587193087,DE 3587193088,3587193599,GB -3587193600,3587194879,A2 +3587193600,3587194879,DE 3587194880,3587211263,GB 3587211264,3587219455,AT 3587219456,3587227647,RU @@ -89082,7 +93600,9 @@ 3589021696,3589029887,SA 3589029888,3589030119,GB 3589030120,3589030127,NL -3589030128,3589034239,GB +3589030128,3589031055,GB +3589031056,3589031056,NL +3589031057,3589034239,GB 3589034240,3589034495,EU 3589034496,3589037055,GB 3589037056,3589037311,EU @@ -89106,7 +93626,9 @@ 3589341184,3589373951,PL 3589373952,3589390335,DE 3589390336,3589423103,RU -3589423104,3589431039,GB +3589423104,3589430591,GB +3589430592,3589430655,ES +3589430656,3589431039,GB 3589431040,3589431295,ES 3589431296,3589432831,GB 3589432832,3589433087,CH @@ -89180,8 +93702,8 @@ 3590127616,3590143999,GB 3590144000,3590156287,SI 3590156288,3590157311,HR -3590157312,3590159359,RS -3590159360,3590160383,SI +3590157312,3590158335,RS +3590158336,3590160383,SI 3590160384,3590176767,GB 3590176768,3590193151,HU 3590193152,3590201343,IT @@ -89250,39 +93772,36 @@ 3624255488,3624257535,ZA 3624257536,3624271871,US 3624271872,3624272383,SY -3624272384,3624272639,CA +3624272384,3624272639,US 3624272640,3624272895,DZ -3624272896,3624275967,CA -3624275968,3624276223,US -3624276224,3624281087,CA +3624272896,3624281087,US 3624281088,3624281343,HT -3624281344,3624283135,CA -3624283136,3624284159,US -3624284160,3624286193,CA +3624281344,3624284671,US +3624284672,3624284927,CA +3624284928,3624286193,US 3624286194,3624286194,ZA -3624286195,3624288255,CA +3624286195,3624287743,US +3624287744,3624287999,CA +3624288000,3624288255,US 3624288256,3624290303,IN 3624290304,3624292351,CA 3624292352,3624292607,MF -3624292608,3624292863,US -3624292864,3624294143,CA -3624294144,3624294399,US -3624294400,3624294911,CA -3624294912,3624295167,US -3624295168,3624295935,CA +3624292608,3624295423,US +3624295424,3624295679,CA +3624295680,3624295935,US 3624295936,3624296191,LY -3624296192,3624297215,CA -3624297216,3624297471,US +3624296192,3624296447,US +3624296448,3624296703,CA +3624296704,3624297471,US 3624297472,3624298495,CO 3624298496,3624299519,PH -3624299520,3624300031,CA +3624299520,3624300031,US 3624300032,3624300287,LY -3624300288,3624302847,CA +3624300288,3624302847,US 3624302848,3624303103,MY -3624303104,3624303359,CA -3624303360,3624303615,US -3624303616,3624304639,CA -3624304640,3624321023,US +3624303104,3624303871,US +3624303872,3624304127,CA +3624304128,3624321023,US 3624321024,3624325119,CA 3624325120,3624357887,US 3624357888,3624358143,KN @@ -89308,7 +93827,9 @@ 3624377904,3624377911,GB 3624377912,3624386559,US 3624386560,3624394751,CA -3624394752,3624435711,US +3624394752,3624402943,US +3624402944,3624407039,JP +3624407040,3624435711,US 3624435712,3624443391,CA 3624443392,3624443903,US 3624443904,3624452095,CA @@ -89322,7 +93843,9 @@ 3624546816,3624547327,US 3624547328,3624547583,A2 3624547584,3624547839,US -3624547840,3624550143,A2 +3624547840,3624548095,A2 +3624548096,3624548351,US +3624548352,3624550143,A2 3624550144,3624587263,US 3624587264,3624591359,JM 3624591360,3624714239,US @@ -89395,7 +93918,9 @@ 3627044864,3627048959,CA 3627048960,3627065343,US 3627065344,3627069439,CA -3627069440,3627299071,US +3627069440,3627220223,US +3627220224,3627220479,CA +3627220480,3627299071,US 3627299072,3627299327,IN 3627299328,3627507711,US 3627507712,3627511807,CA @@ -89407,9 +93932,7 @@ 3627679744,3627712511,CA 3627712512,3627753471,US 3627753472,3627753727,AR -3627753728,3627759359,US -3627759360,3627759615,NL -3627759616,3627760639,US +3627753728,3627760639,US 3627760640,3627760895,EU 3627760896,3627802623,US 3627802624,3627810815,CA @@ -89460,8 +93983,7 @@ 3628628992,3628629247,GT 3628629248,3628629503,US 3628629504,3628631807,VE -3628631808,3628633855,US -3628633856,3628634111,CO +3628631808,3628634111,CO 3628634112,3628636159,AR 3628636160,3628636671,VE 3628636672,3628636927,US @@ -89480,10 +94002,7 @@ 3628654592,3628654847,US 3628654848,3628655103,CR 3628655104,3628655359,VE -3628655360,3628656383,CO -3628656384,3628656639,EC -3628656640,3628657407,CO -3628657408,3628657663,US +3628655360,3628657663,CO 3628657664,3628657919,VE 3628657920,3628658175,BS 3628658176,3628679167,US @@ -89522,8 +94041,18 @@ 3629789952,3629790207,CA 3629790208,3629839103,US 3629839104,3629839359,CA -3629839360,3630039039,US -3630039040,3630039551,CA +3629839360,3630039047,US +3630039048,3630039055,CA +3630039056,3630039079,US +3630039080,3630039087,CA +3630039088,3630039119,US +3630039120,3630039135,CA +3630039136,3630039159,US +3630039160,3630039167,CA +3630039168,3630039183,US +3630039184,3630039199,CA +3630039200,3630039295,US +3630039296,3630039551,CA 3630039552,3630040063,US 3630040064,3630040319,CA 3630040320,3630040431,US @@ -89531,8 +94060,8 @@ 3630040448,3630040575,US 3630040576,3630040831,CA 3630040832,3630041343,US -3630041344,3630041855,CA -3630041856,3630043135,US +3630041344,3630041599,CA +3630041600,3630043135,US 3630043136,3630043391,CA 3630043392,3630044671,US 3630044672,3630046207,CA @@ -89572,23 +94101,15 @@ 3630062848,3630063871,CA 3630063872,3630063935,US 3630063936,3630063951,CA -3630063952,3630064895,US -3630064896,3630065151,CA -3630065152,3630066175,US -3630066176,3630067967,CA -3630067968,3630068479,US -3630068480,3630068735,CA -3630068736,3630068991,US +3630063952,3630066431,US +3630066432,3630067967,CA +3630067968,3630068991,US 3630068992,3630069247,CA 3630069248,3630069503,US 3630069504,3630069759,CA -3630069760,3630070015,US -3630070016,3630071039,CA -3630071040,3630071295,US +3630069760,3630071295,US 3630071296,3630071551,CA -3630071552,3630072255,US -3630072256,3630072287,CA -3630072288,3630072575,US +3630071552,3630072575,US 3630072576,3630074111,CA 3630074112,3630074879,US 3630074880,3630075135,CA @@ -89651,31 +94172,17 @@ 3630108160,3630108415,CA 3630108416,3630141951,US 3630141952,3630142207,CA -3630142208,3630142463,US -3630142464,3630143487,CA -3630143488,3630143743,US -3630143744,3630145023,CA -3630145024,3630145535,US -3630145536,3630145791,CA -3630145792,3630146047,US -3630146048,3630146815,CA -3630146816,3630147071,US -3630147072,3630147583,CA -3630147584,3630148095,US +3630142208,3630143999,US +3630144000,3630144255,CA +3630144256,3630148095,US 3630148096,3630148607,CA 3630148608,3630148863,US 3630148864,3630149119,CA -3630149120,3630149631,US -3630149632,3630150143,CA -3630150144,3630150399,US -3630150400,3630151423,CA -3630151424,3630151679,US -3630151680,3630153215,CA -3630153216,3630153727,US -3630153728,3630154239,CA -3630154240,3630155007,US -3630155008,3630155263,CA -3630155264,3630155775,US +3630149120,3630151679,US +3630151680,3630152191,CA +3630152192,3630152703,US +3630152704,3630153215,CA +3630153216,3630155775,US 3630155776,3630158079,CA 3630158080,3630158295,US 3630158296,3630158303,CA @@ -89845,7 +94352,9 @@ 3633818624,3633819135,CA 3633819136,3633820671,US 3633820672,3633820927,A1 -3633820928,3633881087,US +3633820928,3633823743,US +3633823744,3633827839,HK +3633827840,3633881087,US 3633881088,3633885183,CW 3633885184,3633889279,US 3633889280,3633893375,CA @@ -90077,9 +94586,7 @@ 3636158976,3636159743,CA 3636159744,3636160511,US 3636160512,3636160767,CA -3636160768,3636161023,US -3636161024,3636161279,CA -3636161280,3636162047,US +3636160768,3636162047,US 3636162048,3636162559,CA 3636162560,3636163583,US 3636163584,3636164095,CA @@ -90115,7 +94622,9 @@ 3636909312,3636913919,US 3636913920,3636914687,CA 3636914688,3636918015,US -3636918016,3636919039,CA +3636918016,3636918271,CA +3636918272,3636918527,US +3636918528,3636919039,CA 3636919040,3637072895,US 3637072896,3637073151,CY 3637073152,3637075967,US @@ -90314,7 +94823,6 @@ 3641196544,3641200639,SA 3641200640,3641204735,RU 3641204736,3641208831,NL -3641208832,3641212927,JO 3641212928,3641221119,NO 3641221120,3641229311,PL 3641229312,3641237503,CH @@ -90354,7 +94862,8 @@ 3641393152,3641397247,KZ 3641397248,3641401343,IT 3641401344,3641409535,ES -3641409536,3641417727,PL +3641409536,3641413631,PL +3641413632,3641417727,DE 3641417728,3641421823,GE 3641421824,3641425919,TJ 3641425920,3641430015,DE @@ -90513,7 +95022,7 @@ 3642048512,3642056703,A2 3642056704,3642060799,RU 3642060800,3642064895,KE -3642064896,3642068991,SE +3642064896,3642068991,IT 3642068992,3642073087,AL 3642073088,3642077183,LV 3642077184,3642085375,NL @@ -90634,7 +95143,9 @@ 3642544128,3642552319,RU 3642552320,3642554198,UA 3642554199,3642554199,RU -3642554200,3642556415,UA +3642554200,3642554367,UA +3642554368,3642554623,LT +3642554624,3642556415,UA 3642556416,3642560511,CZ 3642560512,3642561535,KG 3642561536,3642561791,US @@ -90720,7 +95231,15 @@ 3644928000,3644932095,GI 3644932096,3644936191,IT 3644936192,3644940287,RU -3644940288,3644948479,HU +3644940288,3644942847,HU +3644942848,3644943103,BG +3644943104,3644943359,HU +3644943360,3644943615,BG +3644943616,3644946175,HU +3644946176,3644946687,BG +3644946688,3644946943,HU +3644946944,3644947967,BG +3644947968,3644948479,HU 3644948480,3644952575,DE 3644952576,3644960767,GB 3644960768,3644964863,TR @@ -90800,7 +95319,9 @@ 3645276160,3645280255,DE 3645280256,3645284351,IT 3645284352,3645288447,DE -3645288448,3645292543,FR +3645288448,3645288895,FR +3645288896,3645288959,LU +3645288960,3645292543,FR 3645292544,3645296639,DE 3645296640,3645297407,NL 3645297408,3645297663,EU @@ -91016,11 +95537,15 @@ 3647969280,3647971327,DE 3647971328,3647972351,GB 3647972352,3647973375,IT -3647973376,3647973615,DE +3647973376,3647973399,DE +3647973400,3647973407,IT +3647973408,3647973615,DE 3647973616,3647973623,IT 3647973624,3647973711,DE 3647973712,3647973719,IT -3647973720,3647974055,DE +3647973720,3647974007,DE +3647974008,3647974015,IT +3647974016,3647974055,DE 3647974056,3647974063,IT 3647974064,3647975423,DE 3647975424,3647976447,ES @@ -91048,7 +95573,9 @@ 3647988736,3647989759,BE 3647989760,3647995903,DE 3647995904,3648004095,RU -3648004096,3648008191,GB +3648004096,3648007167,GB +3648007168,3648007679,US +3648007680,3648008191,GB 3648008192,3648016383,FR 3648016384,3648020479,GB 3648020480,3648024575,IT @@ -91214,7 +95741,8 @@ 3649847818,3649855487,DE 3649855488,3649856511,GB 3649856512,3649857535,US -3649857536,3649858047,JP +3649857536,3649857791,JP +3649857792,3649858047,IN 3649858048,3649859071,GB 3649859072,3649859583,US 3649859584,3649863679,SE @@ -91326,7 +95854,6 @@ 3650375680,3650379775,NL 3650379776,3650381823,DE 3650381824,3650387967,IT -3650387968,3650392063,DE 3650392064,3650396159,NO 3650396160,3650404351,NL 3650404352,3650412543,RU @@ -91379,9 +95906,13 @@ 3650609181,3650609181,LB 3650609182,3650610175,DE 3650610176,3650611711,RU -3650611712,3650611866,LB +3650611712,3650611835,LB +3650611836,3650611836,RU +3650611837,3650611866,LB 3650611867,3650611867,RU -3650611868,3650611967,LB +3650611868,3650611947,LB +3650611948,3650611948,RU +3650611949,3650611967,LB 3650611968,3650613247,RU 3650613248,3650617343,DE 3650617344,3650682879,FI @@ -91419,7 +95950,9 @@ 3651108864,3651141631,EE 3651141632,3651152895,DE 3651152896,3651153919,GB -3651153920,3651207167,DE +3651153920,3651168255,DE +3651168256,3651169023,ES +3651169024,3651207167,DE 3651207168,3651207199,GB 3651207200,3651207223,EU 3651207224,3651207295,GB @@ -91544,8 +96077,7 @@ 3651937024,3651938047,FR 3651938048,3651940351,DE 3651940352,3651941119,FR -3651941120,3651943423,DE -3651943424,3651944447,FR +3651941120,3651944447,DE 3651944448,3651948543,ES 3651948544,3651952639,FO 3651952640,3651953663,IR @@ -91687,8 +96219,7 @@ 3653652480,3653656575,RU 3653656576,3653660671,GB 3653660672,3653664767,CZ -3653664768,3653665791,NL -3653665792,3653666815,DE +3653664768,3653666815,DE 3653666816,3653667839,NL 3653667840,3653668863,DE 3653668864,3653672959,SE @@ -91729,7 +96260,17 @@ 3659628544,3659661311,JP 3659661312,3659792383,TW 3659792384,3660054527,KR -3660054528,3660578815,JP +3660054528,3660096767,JP +3660096768,3660097023,US +3660097024,3660097535,JP +3660097536,3660097791,US +3660097792,3660099583,JP +3660099584,3660099839,US +3660099840,3660102143,JP +3660102144,3660102399,US +3660102400,3660102655,JP +3660102656,3660102911,US +3660102912,3660578815,JP 3660578816,3661103103,KR 3661103104,3663986687,CN 3663986688,3663987711,AU @@ -91911,16 +96452,10 @@ 3706978304,3707109375,AU 3707109376,3707174911,HK 3707174912,3707207679,JP -3707208704,3707209727,WS -3707209728,3707215871,CN +3707207680,3707215871,CN 3707215872,3707217919,BD 3707217920,3707219967,ID -3707219968,3707220479,NZ -3707220480,3707220735,AU -3707220736,3707220991,NZ -3707220992,3707221247,AU -3707221248,3707221759,NZ -3707221760,3707222015,AU +3707219968,3707222015,AU 3707222016,3707224063,JP 3707224064,3707240447,LK 3707240448,3707568127,CN @@ -92055,7 +96590,7 @@ 3743219712,3743252479,JP 3743252480,3743264767,NC 3743264768,3743268863,JP -3743268864,3743277055,IN +3743268864,3743272959,IN 3743277056,3743281151,PK 3743281152,3743282175,AU 3743282176,3743283199,JP @@ -92116,7 +96651,9 @@ 3757834240,3757867007,AU 3757867008,3757875519,CN 3757875520,3757875583,HK -3757875584,3757899775,CN +3757875584,3757880063,CN +3757880064,3757883391,HK +3757883392,3757899775,CN 3757899776,3757965311,KR 3757965312,3758063615,CN 3758063616,3758079999,HK diff --git a/installer/resources/geoipv6.dat.gz b/installer/resources/geoipv6.dat.gz index 9579a568d4..446a9e2cf9 100644 Binary files a/installer/resources/geoipv6.dat.gz and b/installer/resources/geoipv6.dat.gz differ diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt index 5276539243..662b4995c6 100644 --- a/installer/resources/hosts.txt +++ b/installer/resources/hosts.txt @@ -357,3 +357,4 @@ anoncoin.i2p=vA4OWvaW6ChyRACDUSq0SiWBB88SBd-3sBAPphzAsUGfQeZMvcmCLM1KuZ9kRLPZnzA jisko.i2p=YSXAtZN7atC3kAoMLFr6vRcEYf3oUpBonrePtfzt6ydtXIqt501dUqwDXVzKP2Hkmg2Zg9HCdMy8a1JCUZLS-T9sPgYn44FEnWg4j2QFFRafpSTLrdDXMK1CpyQhZUYJr4mzg3MEY37cBGSlodFlAgm-J2sgcog7SEpoZrLJ3wNZU8aisQZlUjvn83McMEnLH-AmcTyO3feLaTX7BJE6L6OB67MBieUH0-uNeolHIne1GzcHBuC-0F~wW6pd1eDFDdoQV81VMWAPnkCPzdIW-rmF0C7nvSqzgBpeoywBmIsZwzRKpWO029vknOcioj5HCkvUT~iZeYqSyoLXcdJjM3c5ZPz0AnPss6wuhhSQTqcIqvF0r42ET6-XerwuWJVlDilKjDmzFZ6sj7ZvNiOs2vwQqyNM00geSWgWs50MEqQU1oE2~05fj9qtBw~kXVn1NqAs0~477mnvNlObTHI72USk8OBQDdEKO-OjzL6T67w5Nn3XXe-UYHXqCBvbgAjgAAAA hiddengate.i2p=2BJrMAUHLQBc0CoRnkVpFfkx9dp74qpe3TVlLiXe-RuQGwBNztoYN7WjfmRHF5~KZ-KUEKhA3BbAFuWksGMOi7mV0hUD8Egr5ZG03-ekysSiKmVj3mfMv-GfPTdq5W-OdXK87q1Z~KV-e4Qwq6OFV8VREF81jDeMo4agdV0~388WNaQUjS-Jyh7wInh1XOaENFzsLSBPfbgZMIUEoCe5HiTaXLDTxRnDdLPgkvNfOEV9vT3rCgX2lhd8xVL48q4OObjlZ6DLdQ~O4kSIZoPX~9FWDKPB9nCVCa2zIkbDhBqN7p-r~HSPBUM2nUBB2gwuyYtpiLz3ukqEUGV20VAVZ35RqL-pWl4wAMqy2iRwFcgYnM8tvPGFmJM0lLyPlZdyRSU86QkvvVMUrZYXcylg4uP0WXPeNIP4nXOj5ZR7s9gP3AL4xW4Dh2YqPoCaWWt8J2LZugX7QSHpFVEdWZtxnppD1zDmIsbpm-UAUqdgviTIcFPyhxHaEGMUZ7Gid2FqAAAA i2pdocs.str4d.i2p=CRayYfxrPBELUQ4tYi723g8atsyHwkR0--N8fXggNqJgHsnrKxle0ovH5qj6aqUGToay4ktJEz~opIV2lF605gdGE9rSrPONOU0v737~gzjmLpJoyW03yOhr6lGvTxTKWjgx5xRHctt11DEMlMufY4Q72~EZETE4k5E45V3YqSWGyYIzxdpzzw9zvMe9TaLZTs0ZYFgXRMIu1o5IzTkfK2FfAMNfHMcRESHHK8GcF0TkzZFnvOhtgr~Fywq5B7VMYzwq6a8ws5bPjSjQWbJqX8NR~NZl7gxSMwdlZlcICVFOo-uW9Yna2YfhzM-A5SOx60EsL26YX1VXh1zQ3Rsg2lNXbSPI4dLb9taGWxpZS914L-N3Htgih7VM-Zl1QYQGuNV-9LaEEUQKRPCeKdyG14Yry4YOVDItMFE5CHIDaoFcpD24jPE~0aHmVk~RXOIzVhmtVj~HcpBXWxT4lpIO2V3kzA-ZTvo5I0ollbP5Ep3s0Cj~EfikBhUL6zHsWVC0AAAA +mtn.i2p-projekt.i2p=I6Ha4I7rgR0JyExQnN~4sZz5CfRqdN7o-2t1i2YOExd2CxC4MHHz3nJ5KgBIqeNa0dZbugwMEYMWneXAf8nuy9RKUrjcDvGLqScuU8QCpG-e7UDR8lNregfaOwTuypBQiPh9nrc86Zc2JXyTv0eG3T5Yl1tydqs3qEz5w1vn64uRCrGLEMsnGMIZ4aXexseL6McW9ObIQ0qOIfRG9kc~3~bpD9UM4G04BXPZ1Ao5MUjGoQyxlaNCt1DrvAYcrRArzvv0QGyPjb6HpHLlK2UIoR6SumRuNYpEXCaqbXEnEicx1kB5Pyhcwm0cyaMCx-ZaUU-F1~23VurE41xNMbq4GwXtev4bVP4ycHGHjH-XYJmKrqnesIEp7InSAWfm0gdDHuy9377nSIyAhGLLFlWKtzrZPiKm57SN4~BZSQIF6CI4JutGa0x9EaO8hvzFgaYKgwS~a7-YuZNfx4VHEF2J34DrsJo4qetdPTWTKX1o-ztMP6f7DpWjp4JTKb36YstvAAAA diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter index 40181548a5..c06e3b761f 100644 --- a/installer/resources/i2prouter +++ b/installer/resources/i2prouter @@ -186,7 +186,7 @@ if [ -e /etc/gentoo-release ]; then fi fi -WRAPPER_URL="http://www.i2p2.de/manualwrapper" +WRAPPER_URL="https://geti2p.net/en/misc/manual-wrapper" unsupported() { echo "The most likely reason is that a supported version of the java" echo "wrapper is not available in the I2P installation package for your" diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config index d2a0b113e8..8f2fdb9259 100644 --- a/installer/resources/i2ptunnel.config +++ b/installer/resources/i2ptunnel.config @@ -57,13 +57,13 @@ tunnel.1.option.outbound.priority=15 tunnel.1.startOnLoad=true # I2P's mtn server -tunnel.2.name=mtn.i2p2.i2p +tunnel.2.name=mtn.i2p-projekt.i2p tunnel.2.description=I2P Monotone Server tunnel.2.type=client tunnel.2.sharedClient=true tunnel.2.interface=127.0.0.1 tunnel.2.listenPort=8998 -tunnel.2.targetDestination=mtn.i2p2.i2p:4691 +tunnel.2.targetDestination=mtn.i2p-projekt.i2p:4691 tunnel.2.i2cpHost=127.0.0.1 tunnel.2.i2cpPort=7654 tunnel.2.option.inbound.nickname=shared clients @@ -107,7 +107,6 @@ tunnel.4.option.outbound.nickname=shared clients tunnel.4.option.i2cp.reduceIdleTime=900000 tunnel.4.option.i2cp.reduceOnIdle=true tunnel.4.option.i2cp.reduceQuantity=1 -tunnel.4.option.i2p.streaming.connectDelay=1000 tunnel.4.option.inbound.length=3 tunnel.4.option.inbound.lengthVariance=0 tunnel.4.option.outbound.length=3 diff --git a/installer/resources/initialNews/initialNews.xml b/installer/resources/initialNews/initialNews.xml index a91ae226e2..5b3ad43d91 100644 --- a/installer/resources/initialNews/initialNews.xml +++ b/installer/resources/initialNews/initialNews.xml @@ -11,10 +11,10 @@ _("While you are waiting, please {0}adjust your bandwidth settings{1} on the {2} _("Also you can setup your browser to use the I2P proxy to reach eepsites.") _("Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your browser settings.") _("Do not use SOCKS for this.") -_("More information can be found on the {0}I2P browser proxy setup page{1}.", "", "") +_("More information can be found on the {0}I2P browser proxy setup page{1}.", "", "")

-_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "", "", "", "") +_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "", "", "", "")

_("Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p{3}.", "", "", "", "") diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po index 22d4c20918..7428e2f125 100644 --- a/installer/resources/locale/po/messages_en.po +++ b/installer/resources/locale/po/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P startup script\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" +"POT-Creation-Date: 2014-07-23 13:45+0000\n" "PO-Revision-Date: 2012-12-21 23:34+0000\n" "Last-Translator: kytv \n" "Language-Team: English \n" @@ -18,180 +18,180 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../i2prouter:203 +#: ../i2prouter:216 msgid "Failed to load the wrapper" msgstr "" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:938 ../i2prouter:962 ../i2prouter:1036 ../i2prouter:1064 +#: ../i2prouter:1085 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "" -#: ../i2prouter:936 +#: ../i2prouter:949 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "" -#: ../i2prouter:956 +#: ../i2prouter:969 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1003 +#: ../i2prouter:1016 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "" -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1030 ../i2prouter:1058 ../i2prouter:1264 ../i2prouter:1553 msgid "Must be root to perform this action." msgstr "" -#: ../i2prouter:1061 +#: ../i2prouter:1074 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1083 +#: ../i2prouter:1096 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1100 ../i2prouter:1168 ../i2prouter:1721 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "" -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1113 ../i2prouter:1121 ../i2prouter:1183 ../i2prouter:1191 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1126 +#: ../i2prouter:1139 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "" -#: ../i2prouter:1140 +#: ../i2prouter:1153 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1143 +#: ../i2prouter:1156 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1151 +#: ../i2prouter:1164 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "" -#: ../i2prouter:1197 +#: ../i2prouter:1210 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "" -#: ../i2prouter:1202 +#: ../i2prouter:1215 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "" -#: ../i2prouter:1205 +#: ../i2prouter:1218 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1271 ../i2prouter:1283 ../i2prouter:1302 ../i2prouter:1319 +#: ../i2prouter:1386 ../i2prouter:1406 ../i2prouter:1420 ../i2prouter:1434 +#: ../i2prouter:1462 ../i2prouter:1500 ../i2prouter:1535 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1274 ../i2prouter:1289 ../i2prouter:1391 ../i2prouter:1423 +#: ../i2prouter:1437 ../i2prouter:1451 ../i2prouter:1465 ../i2prouter:1503 +#: ../i2prouter:1538 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1532 +#: ../i2prouter:1545 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1561 ../i2prouter:1574 ../i2prouter:1588 ../i2prouter:1597 +#: ../i2prouter:1607 ../i2prouter:1631 ../i2prouter:1644 ../i2prouter:1656 +#: ../i2prouter:1674 ../i2prouter:1687 ../i2prouter:1701 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1567 ../i2prouter:1582 ../i2prouter:1591 ../i2prouter:1601 +#: ../i2prouter:1612 ../i2prouter:1625 ../i2prouter:1637 ../i2prouter:1650 +#: ../i2prouter:1668 ../i2prouter:1681 ../i2prouter:1695 ../i2prouter:1706 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "" -#: ../i2prouter:1697 +#: ../i2prouter:1710 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1784 +#: ../i2prouter:1797 msgid "Commands:" msgstr "" -#: ../i2prouter:1785 +#: ../i2prouter:1798 msgid "Launch in the current console." msgstr "" -#: ../i2prouter:1786 +#: ../i2prouter:1799 msgid "Start in the background as a daemon process." msgstr "" -#: ../i2prouter:1787 +#: ../i2prouter:1800 msgid "Stop if running as a daemon or in another console." msgstr "" -#: ../i2prouter:1788 +#: ../i2prouter:1801 msgid "Stop gracefully, may take up to 11 minutes." msgstr "" -#: ../i2prouter:1789 +#: ../i2prouter:1802 msgid "Stop if running and then start." msgstr "" -#: ../i2prouter:1790 +#: ../i2prouter:1803 msgid "Restart only if already running." msgstr "" -#: ../i2prouter:1791 +#: ../i2prouter:1804 msgid "Query the current status." msgstr "" -#: ../i2prouter:1792 +#: ../i2prouter:1805 msgid "Install to start automatically when system boots." msgstr "" -#: ../i2prouter:1793 +#: ../i2prouter:1806 msgid "Uninstall." msgstr "" -#: ../i2prouter:1794 +#: ../i2prouter:1807 msgid "Request a Java thread dump if running." msgstr "" -#: ../i2prouter:1807 +#: ../i2prouter:1820 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "" -#: ../i2prouter:1812 +#: ../i2prouter:1825 msgid "Running I2P as the root user is *not* recommended." msgstr "" -#: ../i2prouter:1815 +#: ../i2prouter:1828 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index f30a4003ef..1060c72532 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -1,109 +1,96 @@

-
  • Démarrage…
    Si vous venez juste de lancer I2P, le nombre de -pairs actifs indiqués dans la section Pairs du "Panneau de surveillance" sur la gauche devrait -commencer à augmenter dans les prochaines minutes et vous verrez alors en bas du panneau une destination locale -intitulée Clients partagés, avec d'éventuels autres clients et serveurs suivant la configuration initiale d'I2P -(sinon, voir plus bas la section dépannage). Ces destinations locales fournissent des -connexions sur différent ports (et parfois des protocoles) au réseau I2P, pour permettre le fonctionnement de votre -client BitTorrent, de votre messagerie, du mandataire Internet et autres services. Votre -base de données réseau indique tous les pairs que connaît votre routeur. Vous pouvez surveiller -les connexions de pairs en cours et voir les tunnels existants et leur -état. D'autres informations sont disponibles sur la page d'aide.
    • +
    • Démarrage…
      Si vous venez juste de lancer I2P, dans la partie gauche de l'écran en section Pairs, le nombre de pairs actifs indiqué devrait +commencer à augmenter dans les prochaines minutes, puis vous verrez en bas du panneau une Destination locale intitulée Clients partagés, avec éventuellement d'autres clients et serveurs selon comment I2P est configuré (sinon, voir plus bas la section dépannage). Ces destinations locales fournissent des connexions via différent ports (et parfois protocoles) vers le réseau I2P, permettant le fonctionnement de votre client BitTorrent, messagerie, proxy web, et autres services. Votre +base de données réseau indique tous les pairs que connaît votre routeur. Vous pouvez surveiller les connexions de pairs en cours et voir les tunnels existants et leur état. D'autres informations sont disponibles dans la page d'aide.
      • -
    • Intégration au réseau
      La première fois que vous lancez I2P l'intégration au réseau peut -prendre quelques minutes, le temps que votre routeur soit connu et trouve d'autres pairs qui amélioreront alors son -intégration: soyez patient. Quand I2P démarre, et en fonctionnement établi, I2P affiche un indicateur d'état, (juste au -dessus de la section destinations locales dans le panneau de surveillance), qui peut vous signaler l'information +
    • Intégration au réseau
      La première fois que vous lancez I2P, son intégration au réseau peut prendre quelques minutes, le temps que votre routeur soit connu et trouve d'autres pairs qui amélioreront alors son intégration : soyez patient. Quand I2P démarre, et qu'il fonctionnement normalement, I2P affiche un indicateur d'état, (juste au +dessus de la section Destinations locales dans le panneau de contrôle), qui peut vous signaler l'information "Refus de tunnels"; ce comportement est normal et ne doit pas vous inquiéter! Une fois que les étoiles vertes -s'affichent en face des destinations locales, le monde d'I2P vous est ouvert. En voici un aperçu: +s'affichent en face des Destinations locales, le monde d'I2P vous est ouvert, et ci-dessous nous vous en présentons quelques unes.

    Les services sur I2P

      -
    • Internet invisible & exploration anonyme du web public
      Sur I2P vous pouvez accéder +
    • Internet invisible et exploration anonyme du web public
      Sur I2P vous pouvez accéder à des sites anonymes (les sites eep) et à d'autres services (par exemple SSH sur I2P, IRC, Jabber, etc…), et -vous pouvez aussi héberger vos propres services anonyme. Vous avez également un accès anonyme au web normal via le -serveur mandataire sortant ("outproxy") I2P intégré. Pour ceci, -configurez votre navigateur pour qu'il utilise le +vous pouvez aussi héberger vos propres services. Vous pouvez également accéder au web anonymement via le +serveur mandataire sortant ("outproxy") intégré d'I2P. Pour ceci, +configurez votre navigateur afin qu'il utilise le mandataire 127.0.0.1 sur le port 4444, puis promenez-vous sur les sites eep ou non cryptés normaux -(adresses http://. Si vous voulez désactiver ou modifier l'accès mandaté à l'Internet normal, enlevez ou modifiez l'entrée +(adresses http://). Si vous voulez désactiver ou modifier l'accès mandaté à l'Internet normal, enlevez ou modifiez l'entrée false.i2p dans les options de mandataires du gestionnaire de tunnels pour le mandataire HTTP I2P. Dans la section "Sites intéressants" -ci-dessous, vous trouverez notre petite sélection de sites hébergés sur I2P.
      • +ci-dessous, nous listons quelques uns des eepsites hébergés dans I2P. -
    • Messagerie anonyme
      Le système de messagerie basé sur I2P de Postman est utilisable soit -par le client de messagerie I2P intégré dans la console du routeur (susimail), soit en -configurant n'importe quel logiciel client de messagerie compatible SMTP et POP3. Les comptes peuvent recevoir et -envoyer du courrier de/vers l'Internet normal. Créez au moins votre compte sur +
    • Messagerie anonyme
      Le système de messagerie de Postman, basé sur I2P, est utilisable soit +par le client de messagerie I2P intégré (susimail) dans la console du routeur, soit en +configurant n'importe quel logiciel client de messagerie compatible SMTP et POP3. Les comptes peuvent envoyer et +recevoir du courrier vers/depuis l'Internet normal. Pour obtenir un compte visitez hq.postman.i2p. En complément, -I2P-Bote est le nouveau système intra-I2P décentralisé, sécurisé -(crypté de bout en bout) et équipé d'un système de relayage anonymo-pseudonymique, ainsi que d'une interface web et d'un -carnet d'adresses intégré. Développé par HungryHobo, il s'installe en tant que greffon.
      • +I2P-Bote est un nouveau système de messagerie intra-I2P décentralisé, sécurisé +(crypté de bout en bout), et équipé d'un système de relayage anonyme/pseudonyme, disposant d'une interface web et d'un +carnet d'adresses intégré. Il est développé par HungryHobo, il s'installe en tant que greffon.
    • Transfert de fichiers anonyme
      I2PSnark est -intégré dans le router I2P. Il permet les transferts anonymes et cryptés -BitTorrent. -Sponge a développé en Python un autre client bittorrent appelé Robert. -Il y a aussi un portage d'eMule/aMule sur I2P:… -iMule [Cherche développeurs!], une implémentation anonyme et sécurisée d'un +intégré dans le router I2P. Il permet de faire des transferts BitTorrent anonymes et cryptés. +Sponge a développé un autre client bittorrent appelé Robert écrit en Python. +Il existe aussi un portage d'eMule/aMule sur I2P appelé +iMule [Besoin de développeurs !]. Il existe aussi une implémentation anonyme et sécurisée d'un réseau Gnutella accessible par I2Phex [maintenu par Complication, mais on cherche de nouveaux -développeurs!], ainsi que d'autres utilitaires dont un hébergement de fichiers basé sur le navigateur.
      • -
    • Claviotage anonyme (non ça n'est pas le nom de mon chat)
      Lancez votre client IRC (p.e. -Chatzilla, Pidgin, XChat, etc…) et connectez-vous au serveur sur +développeurs !], ainsi que d'autres utilitaires dont l'hébergement de fichiers basé sur navigateur.
      • +
    • Tchat anonyme
      Lancez votre logiciel client IRC (p.e. +Chatzilla, Pidgin, XChat, etc…) et connectez-vous au serveur sur 127.0.0.1 port 6668. Vous n'avez pas besoin de configurer un proxy dans votre client IRC: I2P vous fournit -un tunnel IRC local (configuré dans votre client IRC en tant qu'hôte serveur IRC distant). Votre tunnel IRC local +un tunnel IRC local (configuré dans votre client IRC en tant que serveur IRC ou hôte distant). Votre tunnel IRC local sur localhost:6668 vous emmènera sur un des deux serveurs hébergés sur I2P par Postman and Badger, mais -ni vous ni eux ne sauront où se trouve l'autre, et ni ta maman ni ton gouvernement ne sera capable d'intercepter ta -conversation!… (sauf,… heu… regarde quand même dans ton dos!…ET dans le faux plafond ET dis -à ton correspondant d'en faire autant… ET coulez vos PC dans du béton). Une fois là, /join -#i2p-chat, #i2p, #i2p-chat ou #i2p-dev -ne sont que quelques unes des possibilités pour mettre la tête dehors, même si ça va pas améliorer le bronzage de ta -couenne d'endive.</délire> Il y a aussi une -messagerie instantanée à la sauce I2P pour le claviotage anonyme -(tiens, le rev'là) non surveillable et non censurable, ainsi que d'autres serveurs IRC, Jabber, website-based chat, -and more. Et bien sûr vous avez l'entière liberté de faire tourner vos propres serveurs sur I2P, dans la version qui -vous émoustille les papilles, et si vous êtes un développeur, d'écrire vos propres +ni vous ni eux ne sauront où se trouve l'autre, et ni ta maman ni ton FAI ni ton gouvernement ne seront capables d'intercepter la +conversation !. Une fois là-bas, /join +#i2p-help, #i2p-chat, #i2p, #i2p-chat ou #i2p-dev +sonts quelques-uns des canaux que vous pourrez joindre. Il y a aussi une +messagerie instantanée basée-I2P, permettant de faire du tchat anonyme +non surveillable et non censurable, ainsi que d'autres serveurs IRC alternatifs, serveurs Jabber, tchat basé-site-web, +et davantage. Et bien sûr vous avez l'entière liberté de faire tourner vos propres serveurs sur I2P, quelques soient les versions qui +vous plaisent, et si vous êtes un développeur, d'écrire vos propres applications I2P (les protocoles UDP et TCP sont tous deux compatibles), et -les flux en temps réel sont aussi au menu. +les flux en temps réel sont aussi possibles. Nous fournissons aussi un accès complet à l'API Java.
      • -
    • Forums & Blogs
      Si vous cherchez à faire votre propre blog ou forum , vous pourriez -être intéressé par Syndie, une plateforme décentralisée de -forum et blog pour I2P [Nids de développeurs! (prononcez à l'anglaise)]. -Bien entendu, tous les logiciels de blog, forum et -cms fonctionnent sur I2P, bien qu'il vous soit conseillé de faire très attention à la sécurité quand vous les -configurez et de tenir tous les logiciels associés (p.e. Php, MySql, Python, Apache) bien à jour et verrouillés! -Vous trouverez aussi un petit nombre de forums I2P dans diverses langues: voir plus bas +
    • Forums & Blogs
      Si vous cherchez à faire votre propre blog ou forum, vous pourriez +être intéressé par Syndie, qui est une plateforme décentralisée de +forums et blogs pour I2P [Besoin de développeurs !]. +Bien entendu, tous les logiciels habituels de blog, forum et +CMS fonctionnent sur I2P, bien qu'il vous soit conseillé de faire très attention à la sécurité quand vous les +configurez, et tenir tous les logiciels associés (p.e. Php, MySql, Python, Apache) bien à jour et verrouillés ! +Aussi, vous trouverez dans I2P quelques forums communautaires dans diverses langues : voir plus bas d'autres suggestions.
      • -
    • Greffons pour I2P
      Étendez l'usage et la portée d'I2P en -installant des greffons… blog, chat, partage de fichiers et autres sont déjà écrits ou portés, et n'attendent -autre chose que vous les installiez! -Consultez la carte (et les secrets du chef) sur plugins.i2p. -Si vous êtes développeur, vous disposez d'un -environnement d'écriture de greffons indépendant de tout langage dans la -documentation; les greffons I2P peuvent être codés dans +
    • Greffons pour I2P
      Étendez l'utilité d'I2P en +installant des greffons… blog, tchat, partage de fichiers et autres greffons sont déjà écrits ou portés, et n'attendent +que votre installation ! +Consultez la liste sur plugins.i2p. +Si vous êtes développeur, vous pourrez disposer d'un +environnement d'écriture de greffons indépendant de tout langage, avec +documentation; les greffons d'I2P peuvent être programmés dans n'importe quel langage.
    -

    Hébergement crypté anonyme sur I2P

    +

    Hébergement web anonyme crypté sur I2P

      -
    • Prêt à servir!
      I2P arrive avec un serveur intégré, prêt à servir votre propre site web -anonyme (eepsite) sur le réseau I2P: une instance Jetty qui +
    • Prêt à servir !
      I2P est fourni avec un serveur web intégré, prêt à héberger votre propre site web +anonyme (eepsite) sur le réseau I2P : c'est une instance Jetty qui écoute sur http://127.0.0.1:7658/. Pour héberger votre propre -contenu, placez tout bêtement vos fichiers dans le répertoire eepsite/docroot/ (ou déposez n'importe quel +contenu, déposez tout simplement vos fichiers dans le répertoire eepsite/docroot/ (ou déposez n'importe quel fichier JSP/Servlet standard .war dans eepsite/webapps, ou des scripts CGI standards dans -eepsite/cgi-bin) et ils s'afficheront. Vous gardez tout loisir de choisir le serveur web qui vous convient -pour fonctionner sur I2P et remplacer le serveur intégré, ou exécuter celui-ci sur un autre tunnel.
      • +eepsite/cgi-bin) et ils s'afficheront. Vous gardez l'entière liberté de remplacer le logiciel serveur intégré afin de choisir un logiciel serveur web qui vous convient, ou encore d'exécuter celui-ci sur un autre tunnel.
    • Démarrez votre tunnel
      - Après le démarrage de votre Tunnel serveurWeb I2P, votre eepsite sera -visible (mais pas encore découvrable) par les I2P'nautes. Les instructions détaillées de démarrage de votre eepsite, -d'enregistrement d'un domaine .i2p et de promotion de votre site sont accessibles via votre propre serveur à + Après le démarrage de votre tunnel serveur web I2P, votre eepsite sera +visible (mais pas encore découvrable) par les autres utilisateurs d'I2P. Les instructions détaillées de démarrage de votre eepsite, +d'enregistrement d'un domaine .i2p, et de promotion de votre site, sont accessibles via votre propre serveur web I2P à l'adresse http://127.0.0.1:7658/help/.
    @@ -111,75 +98,69 @@ l'adresse http://127.0.0.1
    • Le site officiel de l'Invisible Internet Project (I2P)
      i2p-projekt.i2p et son miroir -i2p-projekt.i2p sont les adresses de connexions sécurisées et -anonymes des sites classiques www.i2p2.de et -geti2p.net. Si vous êtes curieux du fonctionnement d'I2P et de la -façon d'y contribuer, vous venez de trouver la porte d'entrée.
      • -
    • Les fora de la communauté
      -forum.i2p: le forum sur lequel les développeurs et les -utilisateurs aiment discuter de problèmes et d'idées relatifs à I2P et aux sujets apparentés, et le -forum des développeurs de zzz également ouvert aux utilisateurs.
      • +i2p-projekt.i2p : connexions anonymes et sécurisées à geti2p.net. Si vous êtes curieux du fonctionnement d'I2P et de la +façon d'y contribuer, ceci est la première porte d'entrée. +
    • Forums de la communauté I2P
      +forum.i2p : connexion anoyme et sécurisée au forum communautaire dans lequel sont discutés les problèmes et idées concernant I2P, et sujets apparentés. Il y a aussi le forum développeurs de zzz concernant les discussions relatives à I2P.
    • Pastebin anonyme I2P
      -pastethis.i2p: service de collage sécurisé et anonyme pour le -partage de texte et de code au format textuel sur I2P.
      • -
    • Les ressources i2P d'Echelon -
      echelon.i2p: dépôt de logiciels I2P (I2PFox, iMule, -I2P-Messenger…) avec leurs code sources (quand c'est permis), informations sur I2P, dont le -guide du débutant et pour les plus téméraires, -les pré-versions d'I2P à essayer.
      • -
    • Le Wiki d'Ugha
      ugha.i2p: un wiki -ouvert et anonyme sur lequel chacun peut modifier toute sorte d'informations sur I2P, l'aide pour les débutants, -des liens supplémentaires dans le réseau, etc…
      • -
    • The Planet (sur I2P)
      planet.i2p: -un site agrégateur RSS qui collecte les nouvelles et évènements concernant I2P et les publie toutes regroupée en un -seul endroit. Un bon aperçu de la communauté au travail!
      • -
    • Moteur de recherches eepsites
      -eepsites.i2p: moteur de recherches sur les contenus I2P hébergé +pastethis.i2p : service de collage sécurisé et anonyme permettant le +partage de texte et de code au format textuel via I2P.
      • +
    • Les ressources I2P d'Echelon +
      echelon.i2p : dépôt de logiciels I2P avec leurs code sources (quand cela est permis), informations concernant I2P, dont le +guide du débutant, et pour les plus téméraires +des pré-versions d'I2P à essayer.
      • +
    • Le Wiki d'Ugha
      ugha.i2p : un wiki +ouvert et anonyme dans lequel chacun peut modifier toutes sortes d'informations concernant I2P, aide pour les débutants, +liens supplémentaires dans le réseau, et plus.
      • +
    • The Planet (sur I2P)
      planet.i2p : +un site web agrégateur RSS qui collecte les nouvelles et évènements concernant I2P et les publie toutes regroupée en un +seul endroit. C'est un bon site pour voir la communauté au travail !
      • +
    • Moteur de recherches d'eepsites
      +eepsites.i2p : moteur de recherche d'eepsites hébergé anonymement.
    • Météo du réseau I2P
      stats.i2p: vérifiez divers aspects des performances du réseau I2P avec ce site superviseur maintenu par zzz.
      • -
    • Découvrez I2P
      Il y a plein d'autres eepsites: suivez simplement les liens que vous -rencontrez, marquez-les en favoris, et retournez-y souvent!
      • +
    • Découvrez I2P
      Il y a beaucoup d'autres eepsites : suivez simplement les liens que vous +rencontrez, marquez-les en favoris, et retournez-y souvent !
    -

    Résolution de problèmes & assistance supplémentaire

    +

    Résolution de problèmes et assistance supplémentaire

      -
    • Soyez patient!
      I2P peut être long à s'intégrer au réseau la première fois que vous le -lancez car il s'amorce en découvrant des pairs supplémentaires. Plus il tourne longtemps, mieux il fonctionnera, donc -essayez de le laisser marcher le plus longtemps que vous pouvez, 24h/24 7j/7 si possible! Si après 30mn le nombre +
    • Soyez patient !
      I2P peut être long à s'intégrer au réseau la première fois que vous le +lancez car il s'amorce dans le réseau et prend connaissance de pairs supplémentaires. Plus il tournera longtemps, mieux il fonctionnera, donc +essayez de le laisser actif le plus longtemps que vous pouvez, 24h/24 7j/7 si possible ! Si après 30 minutes le nombre Actifs: [connectés/récents] montre moins de 10 pairs, ou que le nombre de pairs bien intégrés est -inférieur à 5, voici ce que vous pouvez faire pour trouver l'origine du problème: +inférieur à 5, voici ce que vous pouvez faire pour trouver l'origine du problème :
      • -
    • Vérifiez votre configuration & allocation de bande passante
      I2P fonctionne au mieux -quand vous reflétez correctement la vitesse de votre connexion Internet dans la section +
    • Vérifiez votre configuration et votre allocation de bande passante
      I2P fonctionne mieux +lorsque vous indiquez exactement la vitesse de votre connexion Internet dans la section Gestionnaire de bande passante. -I2P est configuré par défaut avec des valeurs volontairement faibles qui ne conviennent généralement pas. Merci de -prendre le temps d'adapter ces valeurs à votre cas particulier. Plus vous allouez de bande passante, en particulier -la bande passante sortante, plus vous obtiendrez de bonnes performances.
      • +I2P est configuré par défaut avec des valeurs volontairement basses qui ne conviennent généralement pas, alors veuillez +prendre le temps d'adapter ces valeurs à votre cas particulier. D'autre part plus vous allouez de bande passante, en particulier +la bande passante sortante, plus vous obtiendrez de bonnes performances de la part du réseau. -
    • Pare-feux, Modems & Routeurs
      Si possible, assurez-vous que I2P/Java dispose d'un -accès bidirectionnel à un port accessible depuis Internet en configurant votre modem-routeur(box x-DSL) et le pare-feu -logiciel de votre PC en conséquence. Si vous êtes derrière un pare-feu hors de votre contrôle mais avec un accès -sortant non restrictif, I2P peut quand même fonctionner: vous pouvez désactiver les accès entrants et vous reposer sur +
    • Pare-feux, modems, et routeurs
      Si possible, assurez-vous que I2P/Java dispose d'un +accès bidirectionnel à un port accessible depuis Internet en configurant votre modem/routeur/pare-feu +d'ordinateur en conséquence. Si vous êtes derrière un pare-feu hors de votre contrôle mais que vous avez un accès +sortant sans restriction, I2P peut tout de même fonctionner : vous pouvez désactiver les accès entrants et vous reposer sur la détection d'adresse IP par SSU (firewall hole punching) -pour vous connecter au réseau, et le panneau de surveillance indiquera alors l'état "Réseau: Bloqué par un pare-feu". -Pour obtenir des performances optimales, préférez si possible de donnez accès à I2P l'accès à un -port externe visible depuis Internet.
      -Pendant l'installation, I2P choisit aléatoirement ce port modifiable ici. -Vous pouvez laisser ce port ou en choisir un autre, et quel que soit votre choix régler vos pare-feux en conséquence. +afin de vous connecter au réseau, et le panneau de contrôle indiquera alors l'état "Réseau: Bloqué par un pare-feu". +Pour obtenir des performances optimales, lorsque c'est possible veuillez vous assurer que le +port externe d'I2P soit visible depuis Internet (lire ci-dessous pour davantage d'informations).
      +Note : pendant l'installation, I2P choisit aléatoirement un numéro de port (modifiable ici), vous pouvez laisser ce numéro de port ou en choisir un autre, et quel que soit votre choix régler vos pare-feux en conséquence.
      Voir plus bas pour d'autres solutions.
      • -
    • Vérifiez vos réglages de mandataire
      Si vous n'avez accès à aucun site eep (même pas +
    • Vérifiez vos réglages de mandataire (proxy)
      Si vous n'avez accès à aucun site eep (même pas à i2p-projekt.i2p), assurez-vous que le mandataire de votre navigateur -est réglé pour le trafic HTTP (pas https, ni socks) via 127.0.0.1 port 4444. Si vous avez +est réglé pour accéder au trafic HTTP (pas https, ni socks) via 127.0.0.1 port 4444. Si vous avez besoin d'aide, voici le guide de configuration du navigateur pour l'utilisation avec I2P, également @@ -189,14 +170,11 @@ l'utilisation avec I2P, également
    • Vérifiez vos historiques
      Les historiques peuvent aider à diagnostiquer un problème. Vous pouvez en coller un extrait sur un forum pour obtenir de l'aide, ou plutôt le -coller ici et faire référence au lien sur le canal IRC #i2p-fr -(Freenode). +coller ici et demander de l'aide sur IRC en faisant référence à ce lien.
      • -
    • Vérifiez que Java est à jour
      Assurez-vous que vous avez la dernière version de Java [vers. 1.6 ou plus récente recommandée, et impérative pour certaines fonctionnalités]. Vérifez la version de votre JRE - ( -Java Runtime Environment) en haut de page de vos historiques. Si vous êtes un développeur, + (Java Runtime Environment) en haut de page de la page historiques. Si vous êtes un développeur, un SDK Java et Apache Ant sont nécessaires à la compilation des sources.
      • @@ -211,55 +189,52 @@ consultez la documentation appropriée, visitez les forums, ou venez faire un to
    • Activez Universal Plug and Play (UPnP)
      Votre modem-routeur est peut-être compatible avec Universal Plug -& Play (UPnP) qui permet le transfert de ports automatique. Vérifiez que le support UPnP pour I2P est activé -dans la page de configuration, puis essayez d'activer UPnP dans votre modem-routeur et -éventuellement dans votre ordinateur. Maintenant, redémarrez le routeur I2P. Si ça marche, le panneau -de surveillance devrait alors indiquer "Réseau: OK" une fois que le routeur I2P aura terminé ses tests de connectivité. +& Play (UPnP), lequel permet le transfert de ports automatiquement. Vérifiez que le support UPnP pour I2P est activé +dans la page de configuration, puis essayez d'activer UPnP dans votre modem/routeur et +éventuellement aussi dans votre ordinateur. Maintenant, redémarrez le routeur I2P. Si cela marche, le panneau +de contrôle devrait alors indiquer "Réseau: OK" une fois que le routeur I2P aura terminé ses tests de connectivité.
      • -
    • Redirection de ports
      Ouvrez le port d'I2P sur votre modem, routeur -et/ou pare-feu(x) logiciels pour améliorer la connectivité (idéalement, pour UDP et TCP). Plus d'informations sur la -façon de s'y prendre pour divers matériels est accessible sur -portforward.com, avec nos forums et canaux IRC listés ci-dessous. -Notez qu'I2P ne prend pas en charge la connexion à Internet via des mandataires (proxies) http ou socks [correctifs -bienvenus!], bien qui vous puissiez vous connecter à des mandataires via I2P lui-même quand il connecté au réseau
      • +
    • Redirection de ports
      Ouvrez le port d'I2P sur votre modem, routeur +et/ou pare-feu(x) logiciels afin d'améliorer la connectivité (dans l'idéal pour UDP et TCP). Beaucoup d'informations sur la +façon de s'y prendre avec divers matériels sont accessibles sur +portforward.com, en plus de nos forums et canaux IRC listés ci-dessous. +Notez qu'I2P ne prend pas en charge la connexion à Internet via des mandataires (proxies) http ou socks [améliorations +bienvenues !], cependant vous pourrez vous connecter à des mandataires via I2P lui-même une fois connecté au réseau
    • Aide en ligne
      Vous pouvez trouver de l'information à parcourir sur le -site web I2P, poster des messages sur le -forum de discussion I2P, ou louvoyer sur les canaux IRC -#i2p ou encore -#i2p-chat dans le réseau interne I2P (irc.postman.i2p, irc.echelon.i2p ou -irc.dg.i2p). Ces canaux sont aussi accessibles de façon non cryptée en dehors du réseau anonyme -via le serveur IRC Freenode. +site web I2P, poster des messages dans le +forum de discussion I2P, +ou aller sur les canaux IRC +#i2p-help, #i2p ou encore +#i2p-chat dans le réseau interne I2P (irc.postman.i2p ou +irc.freshcoffee.i2p). Ces canaux sont aussi accessibles de façon ni cryptée, ni anonyme, en dehors du réseau I2P via le réseau serveur IRC Freenode.
      • -
    • Rapports de bogues
      Si vous voulez rapporter un bogue, merci d'enregistrer un ticket sur +
    • Rapports de bogues
      Si vous voulez rapporter un bogue, veuillez enregistrer un ticket sur trac.i2p2.i2p. Les développeurs discutent sur les -fora de développeurs de zzz ou sur le -canal des développeurs. Les développeurs peuvent consulter les sources sur -l'explorateur du dépôt de kytv ou par -Github. Nous utilisons -monotone pour gérer les sources du code. +forums de développeurs de zzz, et dans le +canal des développeurs sur le réseau IRC. Les développeurs peuvent consulter les sources sur +l'explorateur de dépôt mtn hébergé par Kytv ou sur +trac.i2p2.i2p. Nous utilisons +monotone pour gérer nos codes sources.
    • Impliquez-vous!
      I2P est principalement développé et maintenu bénévolement par les -membres dévoués d'une équipe de développeurs. Nous acceptons les -dons. Ils sont essentiellement affectés aux coûts -administratifs et d'hébergements. Nous avons un système de +membres de la communauté. Nous seront heureux d'accepter des +dons, ils sont essentiellement affectés aux frais +d'hébergements et administratifs. Nous avons un système de primes pour certains aspects d'I2P à l'intention de -développeurs qui rechercheraient des incitations, et nous sommes en recherche permanente de plus de +développeurs qui rechercheraient des incitations à participer, et nous sommes en recherche permanente de davantage de codeurs Java, de -traducteurs, de prescripteurs et -d'utilisateurs pour accélérer la diffusion d'I2P. Plus grand sera le réseau I2P, plus tout le monde en profitera, -alors en parler simplement à l'apéro avec vos amis au lieu de vous étriper pour savoir si le PSG est plus tafiole -que l'OM n'est tarlouze, (et tendre la main à votre pire ennemi pour l'installation et les réglages chaque fois que -le besoin s'en fait sentir) sera une belle participation! Pour en savoir plus sur les façons de participer, venez -visiter le zoo sur la page "Engagez-vous!" du -site web. +traducteurs, de prescripteurs, et +d'utilisateurs, afin d'accélérer la diffusion d'I2P. Plus grand sera le réseau I2P, plus tout le monde en profitera, +alors parlez-en simplement à vos amis (et donnez leur un coup de main si nécessaire pour l'installation), ce sera une grande participation !. Pour en savoir plus sur les diverses façons de participer, voyez +la page "Impliquez-vous!" du site web.
    [Haut de page]
    -
    Document mis à jour en février 2011
    +
    Document mis à jour en juillet 2014
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 31c35f8c3e..a411b00998 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 14; + public final static long BUILD = 0; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index 9b169ca757..44d7811b6b 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -64,7 +64,9 @@ class ClientListenerRunner implements Runnable { return new ServerSocket(_port, 0, InetAddress.getByName(listenInterface)); } } - + + public void run() { runServer(); } + /** * Start up the socket listener, listens for connections, and * fires those connections off via {@link #runConnection runConnection}. @@ -72,7 +74,7 @@ class ClientListenerRunner implements Runnable { * failure. * */ - public void runServer() { + protected void runServer() { _running = true; int curDelay = 1000; while (_running) { @@ -173,5 +175,4 @@ class ClientListenerRunner implements Runnable { _socket = null; } catch (IOException ioe) {} } - public void run() { runServer(); } } diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 96e6ac20b6..9a8850c9b0 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -10,8 +10,10 @@ package net.i2p.router.client; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; @@ -37,6 +39,7 @@ import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.util.SystemVersion; /** * Coordinate connections and various tasks @@ -45,7 +48,7 @@ import net.i2p.util.Log; */ class ClientManager { private final Log _log; - protected ClientListenerRunner _listener; + protected final List _listeners; // Destination --> ClientConnectionRunner // Locked for adds/removes but not lookups private final Map _runners; @@ -87,6 +90,7 @@ class ClientManager { // "How large are messages received by the client?", // "ClientMessages", // new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); + _listeners = new ArrayList(); _runners = new ConcurrentHashMap(); _runnersByHash = new ConcurrentHashMap(); _pendingRunners = new HashSet(); @@ -105,14 +109,22 @@ class ClientManager { /** Todo: Start a 3rd listener for IPV6? */ protected void startListeners() { + ClientListenerRunner listener; + if (SystemVersion.isAndroid()) { + listener = new DomainClientListenerRunner(_ctx, this); + Thread t = new I2PThread(listener, "DomainClientListener", true); + t.start(); + _listeners.add(listener); + } if (!_ctx.getBooleanProperty(PROP_DISABLE_EXTERNAL)) { // there's no option to start both an SSL and non-SSL listener if (_ctx.getBooleanProperty(PROP_ENABLE_SSL)) - _listener = new SSLClientListenerRunner(_ctx, this, _port); + listener = new SSLClientListenerRunner(_ctx, this, _port); else - _listener = new ClientListenerRunner(_ctx, this, _port); - Thread t = new I2PThread(_listener, "ClientListener:" + _port, true); + listener = new ClientListenerRunner(_ctx, this, _port); + Thread t = new I2PThread(listener, "ClientListener:" + _port, true); t.start(); + _listeners.add(listener); } _isStarted = true; } @@ -132,8 +144,9 @@ class ClientManager { public synchronized void shutdown(String msg) { _isStarted = false; _log.info("Shutting down the ClientManager"); - if (_listener != null) - _listener.stopListening(); + for (ClientListenerRunner listener : _listeners) + listener.stopListening(); + _listeners.clear(); Set runners = new HashSet(); synchronized (_runners) { for (ClientConnectionRunner runner : _runners.values()) { @@ -169,8 +182,13 @@ class ClientManager { return hisQueue; } - public boolean isAlive() { - return _isStarted && (_listener == null || _listener.isListening()); + public synchronized boolean isAlive() { + boolean listening = true; + if (!_listeners.isEmpty()) { + for (ClientListenerRunner listener : _listeners) + listening = listening && listener.isListening(); + } + return _isStarted && (_listeners.isEmpty() || listening); } public void registerConnection(ClientConnectionRunner runner) { diff --git a/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java b/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java new file mode 100644 index 0000000000..0f28a494f4 --- /dev/null +++ b/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java @@ -0,0 +1,31 @@ +package net.i2p.router.client; + +import java.io.IOException; +import java.net.ServerSocket; + +import net.i2p.client.DomainSocketFactory; +import net.i2p.router.RouterContext; + +/** + * Unix domain socket version of ClientListenerRunner. + *

+ * This is a stub that does nothing. + * This class is replaced in the Android build. + * + * @author str4d + * @since 0.9.14 + */ +public class DomainClientListenerRunner extends ClientListenerRunner { + public DomainClientListenerRunner(RouterContext context, ClientManager manager) { + super(context, manager, -1); + } + + /** + * @throws IOException + */ + @Override + protected ServerSocket getServerSocket() throws IOException { + final DomainSocketFactory fact = new DomainSocketFactory(_context); + return fact.createServerSocket(DomainSocketFactory.I2CP_SOCKET_ADDRESS); + } +} diff --git a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java index fcd008ad68..948cb7527a 100644 --- a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java @@ -181,7 +181,7 @@ class SSLClientListenerRunner extends ClientListenerRunner { * Create (if necessary) and load the key store, then run. */ @Override - public void runServer() { + protected void runServer() { File keyStore = new File(_context.getConfigDir(), "keystore/i2cp.ks"); if (verifyKeyStore(keyStore) && initializeFactory(keyStore)) { super.runServer(); diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index 3bcb7d8d9f..b25641e0a2 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -100,6 +100,7 @@ public class Reseeder { "https://uk.reseed.i2p2.no:444/" + "," + "https://jp.reseed.i2p2.no:444/" + "," + "https://i2p-netdb.innovatio.no/" + "," + + "https://ssl.webpack.de/ivae2he9.sg4.e-plaza.de/" + "," + // Only HTTPS and SU3 (v2) support "https://ieb9oopo.mooo.com/"; // Temp disabled since h2ik have been AWOL since 06-03-2013 //"https://i2p.feared.eu/"; @@ -194,7 +195,7 @@ public class Reseeder { _checker.setError(_("Reseed failed.") + ' ' + _("See {0} for help.", "" + _("reseed configuration page") + "")); - } + } _isRunning = false; _checker.setStatus(""); _context.router().eventLog().addEvent(EventLog.RESEED, Integer.toString(total)); @@ -534,7 +535,9 @@ public class Reseeder { break; } } catch (Throwable t) { - _log.warn("Error reseeding", t); + System.err.println("Error reseeding: " + t); + _log.error("Error reseeding", t); + errors++; } finally { if (contentRaw != null) contentRaw.delete(); @@ -550,7 +553,7 @@ public class Reseeder { _context.netDb().rescan(); return fetched; } - + /** * Always throws an exception if something fails. * We do NOT validate the received data here - that is done in PersistentDataStore @@ -620,7 +623,7 @@ public class Reseeder { return baos.toByteArray(); return null; } - + /** * Fetch a URL to a file. * @@ -666,7 +669,7 @@ public class Reseeder { out.delete(); return null; } - + /** * @param name valid Base64 hash * @return true on success, false if skipped diff --git a/router/java/src/net/i2p/router/package.html b/router/java/src/net/i2p/router/package.html index e18dbdf96a..dc610cc0c6 100644 --- a/router/java/src/net/i2p/router/package.html +++ b/router/java/src/net/i2p/router/package.html @@ -10,6 +10,9 @@ Classes in this package, sub-packages, and others in router.jar are not for use by apps, clients or plugins (except for routerconsole). Subject to change. Not necessarily maintained as a stable API. +

+For applications bundling the I2P router, instantiate Router and call runRouter(), or use Router.main() or RouterLaunch. +Most public methods in Router are maintained as a stable I2P for those bundling the router.

diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java index 573931cbd7..3763f2e7a7 100644 --- a/router/java/src/net/i2p/router/startup/WorkingDir.java +++ b/router/java/src/net/i2p/router/startup/WorkingDir.java @@ -272,10 +272,10 @@ public class WorkingDir { // but distros might put one in "addressbook,eepsite," + // base install - files - // We don't currently have a default router.config, logger.config, or webapps.config in the base distribution, + // We don't currently have a default router.config, logger.config, susimail.config, or webapps.config in the base distribution, // but distros might put one in "blocklist.txt,hosts.txt,i2psnark.config,i2ptunnel.config,jetty-i2psnark.xml," + - "logger.config,router.config,systray.config,webapps.config"; + "logger.config,router.config,susimail.config,systray.config,webapps.config"; private static boolean migrate(String list, File olddir, File todir) { boolean rv = true; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java index 3ff080fd7f..b771589a1f 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -285,6 +285,26 @@ class BuildExecutor implements Runnable { public void run() { _isRunning = true; + try { + run2(); + } catch (NoSuchMethodError nsme) { + // http://zzz.i2p/topics/1668 + // https://gist.github.com/AlainODea/1375759b8720a3f9f094 + // at ObjectCounter.objects() + String s = "Fatal error:" + + "\nJava 8 compiler used with JRE version " + System.getProperty("java.version") + + " and no bootclasspath specified." + + "\nUpdate to Java 8 or contact packager." + + "\nStop I2P now, it will not build tunnels."; + _log.log(Log.CRIT, s, nsme); + System.out.println(s); + throw nsme; + } finally { + _isRunning = false; + } + } + + private void run2() { List wanted = new ArrayList(MAX_CONCURRENT_BUILDS); List pools = new ArrayList(8); @@ -423,7 +443,6 @@ class BuildExecutor implements Runnable { if (_log.shouldLog(Log.WARN)) _log.warn("Done building"); - _isRunning = false; } /** diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java index fb7bf15fc2..f8df029899 100644 --- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java +++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java @@ -36,9 +36,10 @@ class LocalClientManager extends ClientManager { @Override protected void startListeners() { - _listener = new LocalClientListenerRunner(_ctx, this, _port); - Thread t = new I2PThread(_listener, "ClientListener:" + _port, true); + ClientListenerRunner listener = new LocalClientListenerRunner(_ctx, this, _port); + Thread t = new I2PThread(listener, "ClientListener:" + _port, true); t.start(); + _listeners.add(listener); _isStarted = true; }