diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml index 1629eeef4..1a1c9105e 100644 --- a/apps/desktopgui/build.xml +++ b/apps/desktopgui/build.xml @@ -75,6 +75,8 @@ + + diff --git a/apps/desktopgui/images/itoopie_black_24.png b/apps/desktopgui/images/itoopie_black_24.png new file mode 100644 index 000000000..ee108ab34 Binary files /dev/null and b/apps/desktopgui/images/itoopie_black_24.png differ diff --git a/apps/desktopgui/images/itoopie_white_24.png b/apps/desktopgui/images/itoopie_white_24.png new file mode 100644 index 000000000..61c0c28f5 Binary files /dev/null and b/apps/desktopgui/images/itoopie_white_24.png differ diff --git a/apps/desktopgui/locale/messages_en.po b/apps/desktopgui/locale/messages_en.po index 4c853c2c9..b291f0223 100644 --- a/apps/desktopgui/locale/messages_en.po +++ b/apps/desktopgui/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P desktopgui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-09 19:27+0000\n" +"POT-Creation-Date: 2016-05-25 12:29+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,38 +18,76 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: src/net/i2p/desktopgui/ExternalTrayManager.java:23 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:31 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:59 msgid "Start I2P" msgstr "" -#: src/net/i2p/desktopgui/ExternalTrayManager.java:38 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:44 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:72 msgid "I2P is starting!" msgstr "" -#: src/net/i2p/desktopgui/ExternalTrayManager.java:38 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:44 +#: src/net/i2p/desktopgui/ExternalTrayManager.java:72 msgid "Starting" msgstr "" -#: src/net/i2p/desktopgui/InternalTrayManager.java:26 +#: src/net/i2p/desktopgui/InternalTrayManager.java:55 +#: src/net/i2p/desktopgui/InternalTrayManager.java:207 msgid "Launch I2P Browser" msgstr "" -#: src/net/i2p/desktopgui/InternalTrayManager.java:50 -msgid "Configure desktopgui" +#: src/net/i2p/desktopgui/InternalTrayManager.java:76 +#: src/net/i2p/desktopgui/InternalTrayManager.java:228 +msgid "Configure I2P System Tray" msgstr "" -#: src/net/i2p/desktopgui/InternalTrayManager.java:67 +#: src/net/i2p/desktopgui/InternalTrayManager.java:77 +#: src/net/i2p/desktopgui/InternalTrayManager.java:229 +msgid "Disable" +msgstr "" + +#: src/net/i2p/desktopgui/InternalTrayManager.java:93 +#: src/net/i2p/desktopgui/InternalTrayManager.java:245 msgid "Restart I2P" msgstr "" -#: src/net/i2p/desktopgui/InternalTrayManager.java:85 +#: src/net/i2p/desktopgui/InternalTrayManager.java:110 +#: src/net/i2p/desktopgui/InternalTrayManager.java:262 msgid "Stop I2P" msgstr "" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:43 -msgid "Tray icon configuration" +#: src/net/i2p/desktopgui/InternalTrayManager.java:126 +#: src/net/i2p/desktopgui/InternalTrayManager.java:278 +msgid "Restart I2P Immediately" msgstr "" -#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:46 -msgid "Should tray icon be enabled?" +#: src/net/i2p/desktopgui/InternalTrayManager.java:143 +#: src/net/i2p/desktopgui/InternalTrayManager.java:295 +msgid "Stop I2P Immediately" +msgstr "" + +#: src/net/i2p/desktopgui/InternalTrayManager.java:157 +#: src/net/i2p/desktopgui/InternalTrayManager.java:309 +msgid "Cancel I2P Shutdown" +msgstr "" + +#: src/net/i2p/desktopgui/InternalTrayManager.java:363 +#, java-format +msgid "Shutdown in {0}" +msgstr "" + +#: src/net/i2p/desktopgui/InternalTrayManager.java:365 +msgid "Shutdown imminent" +msgstr "" + +#. status translations are in the console bundle +#: src/net/i2p/desktopgui/InternalTrayManager.java:370 +msgid "Network" +msgstr "" + +#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't +#: src/net/i2p/desktopgui/TrayManager.java:63 +msgid "I2P: Right-click for menu" msgstr "" diff --git a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java index 6217e8d88..fc2c7b59e 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java @@ -38,6 +38,11 @@ abstract class TrayManager { ///Our tray icon, or null if unsupported protected TrayIcon trayIcon; + private static final String PNG_DIR = "/desktopgui/resources/images/"; + private static final String MAC_ICON = "itoopie_black_24.png"; + private static final String WIN_ICON = "itoopie_white_24.png"; + private static final String LIN_ICON = "logo.png"; + /** * Instantiate tray manager. */ @@ -185,9 +190,16 @@ abstract class TrayManager { * @throws AWTException if image not found */ private Image getTrayImage() throws AWTException { - URL url = getClass().getResource("/desktopgui/resources/images/logo.png"); + String img; + if (SystemVersion.isWindows()) + img = WIN_ICON; + else if (SystemVersion.isMac()) + img = MAC_ICON; + else + img = LIN_ICON; + URL url = getClass().getResource(PNG_DIR + img); if (url == null) - throw new AWTException("cannot load tray image"); + throw new AWTException("cannot load tray image " + img); Image image = Toolkit.getDefaultToolkit().getImage(url); return image; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index b9dadb5a3..51a071dc6 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -2147,7 +2147,7 @@ public class SnarkManager implements CompleteListener { } _magnets.remove(snark.getName()); removeMagnetStatus(snark.getInfoHash()); - addMessage(_t("Metainfo received for {0}", snark.getName())); + //addMessage(_t("Metainfo received for {0}", snark.getName())); addMessageNoEscape(_t("Starting up torrent {0}", linkify(snark))); return name; } catch (IOException ioe) { diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po index 52c0251be..aa85409aa 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: 2016-01-17 17:08+0000\n" +"POT-Creation-Date: 2016-05-25 12:28+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -74,7 +74,7 @@ msgid "Page size changed to {0}" msgstr "" #: ../java/src/org/klomp/snark/SnarkManager.java:860 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory must be an absolute path" msgstr "" @@ -258,8 +258,8 @@ msgid "Torrent in \"{0}\" is invalid" msgstr "" #: ../java/src/org/klomp/snark/SnarkManager.java:1295 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1042 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1069 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1071 #, java-format msgid "Torrent file deleted: {0}" msgstr "" @@ -386,11 +386,7 @@ msgstr "" msgid "Download finished: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2150 -#, java-format -msgid "Metainfo received for {0}" -msgstr "" - +#. addMessage(_t("Metainfo received for {0}", snark.getName())); #: ../java/src/org/klomp/snark/SnarkManager.java:2151 #: ../java/src/org/klomp/snark/SnarkManager.java:2434 #, java-format @@ -486,14 +482,14 @@ msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:270 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:313 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:324 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2700 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2702 msgid "I2PSnark" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2165 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2167 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2450 msgid "Configuration" msgstr "" @@ -521,877 +517,877 @@ msgstr "" msgid "Click \"Add torrent\" button to fetch torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:397 msgid "clear messages" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:452 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3084 msgid "Status" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:453 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:495 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:513 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:585 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:600 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3055 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3072 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3084 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3096 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:454 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:571 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:601 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3074 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3086 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3098 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:464 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:465 msgid "Hide Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:470 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:471 msgid "Show Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2686 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2720 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:494 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2688 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 msgid "Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:495 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:496 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:513 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:514 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515 msgid "Estimated time remaining" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:541 msgid "Downloaded" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:539 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2880 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3070 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2882 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3072 msgid "Size" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2898 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:571 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2900 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:570 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:571 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:572 msgid "Uploaded" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:585 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:586 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:587 msgid "Down Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:600 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:601 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:602 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:618 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:619 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:620 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:632 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:633 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:647 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:634 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:648 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:646 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:670 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:671 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:677 msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:678 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:679 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:683 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:684 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:690 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:691 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:697 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:698 msgid "Dest" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:826 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:835 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:835 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:836 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:869 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:868 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:869 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:877 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:876 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:877 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:962 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:964 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:972 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1185 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:974 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1187 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:993 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:995 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1036 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1065 #, java-format msgid "Magnet deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1078 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080 #, java-format msgid "Data file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1080 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1089 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 #, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1105 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1107 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1114 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1164 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1169 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1171 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1175 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1177 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1190 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1192 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1216 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1218 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1251 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 #, java-format msgid "Torrent created for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1255 #, 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:1255 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1257 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1259 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1261 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1262 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1264 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2432 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1310 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1312 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1342 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2431 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1344 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2435 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1365 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1368 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1367 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1370 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1372 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2438 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1373 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1375 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1485 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2959 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1487 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1488 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2961 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1505 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507 msgid "Tracker Error" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1507 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1537 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1542 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1553 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1558 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1555 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1566 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1571 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1518 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2964 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1519 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1520 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1526 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2893 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2895 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3151 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1555 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1558 msgid "OK" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1566 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1567 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1562 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1569 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1571 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1572 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1575 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1576 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1573 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1574 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1577 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1578 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1578 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1579 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1581 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1608 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1610 msgid "Torrent details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1643 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1645 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1645 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1647 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2971 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1701 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2973 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1714 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1714 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1716 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2975 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1727 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1729 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:1732 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 #, 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:1736 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1738 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1749 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1751 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:1754 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1756 #, 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:1758 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2390 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1760 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1794 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1796 msgid "Unknown" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1806 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1808 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1829 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1831 msgid "Uninteresting (The peer has no pieces we need)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1833 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1851 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1853 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1853 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1855 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1969 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 #, java-format msgid "Details at {0} tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1986 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988 msgid "Info" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2061 msgid "Add Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2064 msgid "From URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2065 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2067 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:2070 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2072 msgid "Add torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2074 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2076 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2077 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2079 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2083 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2083 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 msgid "Removing a .torrent will cause it to stop." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2096 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create Torrent" msgstr "" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2099 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2101 msgid "Data to seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2105 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2106 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2363 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2108 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2365 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2108 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2110 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2112 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2113 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2115 msgid "Create torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2131 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2133 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2169 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2171 msgid "Data directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2176 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2178 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2180 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2182 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2184 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2186 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "If checked, automatically start torrents that are added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2190 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2192 msgid "Smart torrent sorting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2196 msgid "If checked, ignore words such as 'the' when sorting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2198 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2200 msgid "Theme" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2212 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2214 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2227 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2233 msgid "Startup delay" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 msgid "minutes" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2265 msgid "Total uploader limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2266 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2268 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2270 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2272 msgid "Up bandwidth limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2273 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2277 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2279 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2281 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2285 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:2287 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2291 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2293 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2307 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2309 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2314 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2316 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2325 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2343 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2345 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Save configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2368 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2370 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2370 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2372 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2372 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2374 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3182 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2376 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3184 msgid "Open" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2376 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2378 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2378 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2380 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2424 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2465 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2467 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2473 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2475 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2474 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2476 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2730 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2732 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2738 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2740 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2749 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2775 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2777 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2800 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2802 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2812 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2814 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2825 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2833 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2835 msgid "Added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2844 msgid "Completed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2869 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2871 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2889 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2891 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2918 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2920 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3086 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2927 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2929 msgid "Skipped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2937 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 msgid "Files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2944 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2946 msgid "Pieces" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2950 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2952 msgid "Piece size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2962 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2964 msgid "Refresh page for results" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2974 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2976 msgid "Force Recheck" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3037 msgid "Directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3094 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3096 msgid "Priority" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3106 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3108 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3142 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3146 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3148 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3159 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3161 msgid "complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3162 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3206 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3208 msgid "High" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3211 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3213 msgid "Normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3216 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3218 msgid "Skip" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3226 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3228 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3230 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3230 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3232 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3233 msgid "Save priorities" msgstr "" diff --git a/apps/i2ptunnel/locale-proxy/messages_en.po b/apps/i2ptunnel/locale-proxy/messages_en.po index 04b889f19..6276a1107 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: 2016-01-17 17:08+0000\n" +"POT-Creation-Date: 2016-05-25 12:28+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,470 +18,479 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../java/build/Proxy.java:5 -msgid "Information: New Host Name" +#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11 +#: ../java/build/Proxy.java:40 ../java/build/Proxy.java:46 +#: ../java/build/Proxy.java:82 ../java/build/Proxy.java:88 +msgid "Website Unreachable" msgstr "" -#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18 -#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:38 -#: ../java/build/Proxy.java:46 ../java/build/Proxy.java:57 -#: ../java/build/Proxy.java:69 ../java/build/Proxy.java:78 -#: ../java/build/Proxy.java:87 ../java/build/Proxy.java:96 -#: ../java/build/Proxy.java:107 ../java/build/Proxy.java:119 -#: ../java/build/Proxy.java:129 ../java/build/Proxy.java:140 -#: ../java/build/Proxy.java:151 ../java/build/Proxy.java:164 -#: ../java/build/Proxy.java:173 ../java/build/Proxy.java:185 +#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:17 +#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:41 +#: ../java/build/Proxy.java:52 ../java/build/Proxy.java:61 +#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:83 +#: ../java/build/Proxy.java:92 ../java/build/Proxy.java:103 +#: ../java/build/Proxy.java:115 ../java/build/Proxy.java:124 +#: ../java/build/Proxy.java:134 ../java/build/Proxy.java:144 +#: ../java/build/Proxy.java:156 ../java/build/Proxy.java:169 +#: ../java/build/Proxy.java:181 ../java/build/Proxy.java:191 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:209 msgid "Router Console" msgstr "" -#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19 -#: ../java/build/Proxy.java:29 ../java/build/Proxy.java:39 -#: ../java/build/Proxy.java:47 ../java/build/Proxy.java:58 -#: ../java/build/Proxy.java:70 ../java/build/Proxy.java:79 -#: ../java/build/Proxy.java:88 ../java/build/Proxy.java:97 -#: ../java/build/Proxy.java:108 ../java/build/Proxy.java:120 -#: ../java/build/Proxy.java:130 ../java/build/Proxy.java:141 -#: ../java/build/Proxy.java:152 ../java/build/Proxy.java:165 -#: ../java/build/Proxy.java:174 ../java/build/Proxy.java:186 +#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:18 +#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:42 +#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:62 +#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:84 +#: ../java/build/Proxy.java:93 ../java/build/Proxy.java:104 +#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:125 +#: ../java/build/Proxy.java:135 ../java/build/Proxy.java:145 +#: ../java/build/Proxy.java:157 ../java/build/Proxy.java:170 +#: ../java/build/Proxy.java:182 ../java/build/Proxy.java:192 msgid "I2P Router Console" msgstr "" -#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20 -#: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40 -#: ../java/build/Proxy.java:48 ../java/build/Proxy.java:59 -#: ../java/build/Proxy.java:71 ../java/build/Proxy.java:80 -#: ../java/build/Proxy.java:89 ../java/build/Proxy.java:98 -#: ../java/build/Proxy.java:109 ../java/build/Proxy.java:121 -#: ../java/build/Proxy.java:131 ../java/build/Proxy.java:142 -#: ../java/build/Proxy.java:153 ../java/build/Proxy.java:166 -#: ../java/build/Proxy.java:175 ../java/build/Proxy.java:187 +#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:19 +#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:43 +#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:63 +#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:85 +#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:105 +#: ../java/build/Proxy.java:117 ../java/build/Proxy.java:126 +#: ../java/build/Proxy.java:136 ../java/build/Proxy.java:146 +#: ../java/build/Proxy.java:158 ../java/build/Proxy.java:171 +#: ../java/build/Proxy.java:183 ../java/build/Proxy.java:193 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210 msgid "Configuration" msgstr "" -#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21 -#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:41 -#: ../java/build/Proxy.java:49 ../java/build/Proxy.java:60 -#: ../java/build/Proxy.java:72 ../java/build/Proxy.java:81 -#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:99 -#: ../java/build/Proxy.java:110 ../java/build/Proxy.java:122 -#: ../java/build/Proxy.java:132 ../java/build/Proxy.java:143 -#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:167 -#: ../java/build/Proxy.java:176 ../java/build/Proxy.java:188 +#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:20 +#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44 +#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:64 +#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:86 +#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:106 +#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:127 +#: ../java/build/Proxy.java:137 ../java/build/Proxy.java:147 +#: ../java/build/Proxy.java:159 ../java/build/Proxy.java:172 +#: ../java/build/Proxy.java:184 ../java/build/Proxy.java:194 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210 msgid "Help" msgstr "" -#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22 -#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:42 -#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:61 -#: ../java/build/Proxy.java:73 ../java/build/Proxy.java:82 -#: ../java/build/Proxy.java:91 ../java/build/Proxy.java:100 -#: ../java/build/Proxy.java:111 ../java/build/Proxy.java:123 -#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:144 -#: ../java/build/Proxy.java:155 ../java/build/Proxy.java:168 -#: ../java/build/Proxy.java:177 ../java/build/Proxy.java:189 +#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:21 +#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45 +#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:65 +#: ../java/build/Proxy.java:74 ../java/build/Proxy.java:87 +#: ../java/build/Proxy.java:96 ../java/build/Proxy.java:107 +#: ../java/build/Proxy.java:119 ../java/build/Proxy.java:128 +#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:148 +#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:173 +#: ../java/build/Proxy.java:185 ../java/build/Proxy.java:195 #: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:210 msgid "Addressbook" msgstr "" -#: ../java/build/Proxy.java:11 -msgid "Information: New Host Name with Address Helper" -msgstr "" - #: ../java/build/Proxy.java:12 -msgid "" -"The address helper link you followed is for a new host name that is not in " -"your address book." +msgid "The website was not reachable." msgstr "" #: ../java/build/Proxy.java:13 -msgid "You may save this host name to your local address book." -msgstr "" - -#: ../java/build/Proxy.java:14 msgid "" -"If you save it to your address book, you will not see this message again." +"The website is offline, there is network congestion, or your router is not " +"yet well-integrated with peers." msgstr "" -#: ../java/build/Proxy.java:15 -msgid "" -"If you do not save it, the host name will be forgotten after the next router " -"restart." -msgstr "" - -#: ../java/build/Proxy.java:16 -msgid "" -"If you do not wish to visit this host, click the \"back\" button on your " -"browser." -msgstr "" - -#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23 -msgid "Warning: Destination Key Conflict" -msgstr "" - -#: ../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:25 -msgid "" -"Someone could be trying to impersonate another website, or people have given " -"two websites identical names." -msgstr "" - -#: ../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: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:68 ../java/build/Proxy.java:74 -#: ../java/build/Proxy.java:95 ../java/build/Proxy.java:101 -msgid "Website Unreachable" -msgstr "" - -#: ../java/build/Proxy.java:52 -msgid "The website was not reachable, because its lease set was not found." -msgstr "" - -#: ../java/build/Proxy.java:53 -msgid "" -"The website is probably down, but there could also be network congestion." -msgstr "" - -#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:104 -#: ../java/build/Proxy.java:116 ../java/build/Proxy.java:137 +#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:49 +#: ../java/build/Proxy.java:100 ../java/build/Proxy.java:112 #, java-format msgid "You may want to {0}retry{1}." msgstr "" -#: ../java/build/Proxy.java:55 ../java/build/Proxy.java:67 -#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:117 -#: ../java/build/Proxy.java:138 ../java/build/Proxy.java:162 -#: ../java/build/Proxy.java:183 ../java/build/Proxy.java:195 +#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:27 +#: ../java/build/Proxy.java:50 ../java/build/Proxy.java:81 +#: ../java/build/Proxy.java:101 ../java/build/Proxy.java:113 +#: ../java/build/Proxy.java:154 ../java/build/Proxy.java:179 msgid "Could not find the following destination:" msgstr "" -#: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62 -#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:134 -msgid "Connection Reset" +#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:22 +#: ../java/build/Proxy.java:143 ../java/build/Proxy.java:149 +msgid "Outproxy Not Found" msgstr "" -#: ../java/build/Proxy.java:63 -msgid "The connection to the proxy was reset." -msgstr "" - -#: ../java/build/Proxy.java:64 +#: ../java/build/Proxy.java:23 msgid "" -"The proxy could be temporarily unavailable, too busy, or it has blocked your " -"access." +"The HTTP outproxy was not reachable, because its lease set was not found." msgstr "" -#: ../java/build/Proxy.java:65 ../java/build/Proxy.java:147 -#: ../java/build/Proxy.java:181 ../java/build/Proxy.java:193 +#: ../java/build/Proxy.java:24 +msgid "" +"The outproxy is probably down, but there could also be network congestion." +msgstr "" + +#: ../java/build/Proxy.java:25 ../java/build/Proxy.java:152 +#: ../java/build/Proxy.java:177 ../java/build/Proxy.java:198 #, 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:66 ../java/build/Proxy.java:148 -#: ../java/build/Proxy.java:182 ../java/build/Proxy.java:194 +#: ../java/build/Proxy.java:26 ../java/build/Proxy.java:153 +#: ../java/build/Proxy.java:178 ../java/build/Proxy.java:199 #, 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:75 +#: ../java/build/Proxy.java:28 +msgid "Information: New Host Name" +msgstr "" + +#: ../java/build/Proxy.java:34 +msgid "Information: New Host Name with Address Helper" +msgstr "" + +#: ../java/build/Proxy.java:35 msgid "" -"The website was not reachable, because it uses encryption options that are " -"not supported by your I2P or Java version." +"The address helper link you followed is for a new host name that is not in " +"your address book." msgstr "" -#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:149 -msgid "Could not connect to the following destination:" +#: ../java/build/Proxy.java:36 +msgid "You may save this host name to your local address book." msgstr "" -#: ../java/build/Proxy.java:77 +#: ../java/build/Proxy.java:37 +msgid "" +"If you save it to your address book, you will not see this message again." +msgstr "" + +#: ../java/build/Proxy.java:38 +msgid "" +"If you do not save it, the host name will be forgotten after the next router " +"restart." +msgstr "" + +#: ../java/build/Proxy.java:39 +msgid "" +"If you do not wish to visit this host, click the \"back\" button on your " +"browser." +msgstr "" + +#: ../java/build/Proxy.java:47 +msgid "The website was not reachable, because its lease set was not found." +msgstr "" + +#: ../java/build/Proxy.java:48 +msgid "" +"The website is probably down, but there could also be network congestion." +msgstr "" + +#: ../java/build/Proxy.java:51 ../java/build/Proxy.java:57 +msgid "Warning: Invalid Request URI" +msgstr "" + +#: ../java/build/Proxy.java:58 +msgid "The request URI is invalid, and probably contains illegal characters." +msgstr "" + +#: ../java/build/Proxy.java:59 +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:60 msgid "Error: Request Denied" msgstr "" -#: ../java/build/Proxy.java:83 +#: ../java/build/Proxy.java:66 msgid "Error: Local Access" msgstr "" -#: ../java/build/Proxy.java:84 +#: ../java/build/Proxy.java:67 msgid "Your browser is misconfigured." msgstr "" -#: ../java/build/Proxy.java:85 +#: ../java/build/Proxy.java:68 msgid "" "Do not use the proxy to access the router console, localhost, or local LAN " "destinations." msgstr "" -#: ../java/build/Proxy.java:86 ../java/build/Proxy.java:92 -msgid "Warning: No Outproxy Configured" -msgstr "" - -#: ../java/build/Proxy.java:93 -msgid "" -"Your request was for a site outside of I2P, but you have no HTTP outproxy " -"configured." -msgstr "" - -#: ../java/build/Proxy.java:94 -msgid "Please configure an outproxy in I2PTunnel." -msgstr "" - -#: ../java/build/Proxy.java:102 -msgid "The website was not reachable." -msgstr "" - -#: ../java/build/Proxy.java:103 -msgid "" -"The website is offline, there is network congestion, or your router is not " -"yet well-integrated with peers." -msgstr "" - -#: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112 -msgid "Warning: Invalid Destination" -msgstr "" - -#: ../java/build/Proxy.java:113 -msgid "" -"The website destination specified was not valid, or was otherwise " -"unreachable." -msgstr "" - -#: ../java/build/Proxy.java:114 -msgid "" -"Perhaps you pasted in the wrong Base 64 string or the link you are following " -"is bad." -msgstr "" - -#: ../java/build/Proxy.java:115 -msgid "The I2P host could also be offline." -msgstr "" - -#: ../java/build/Proxy.java:118 ../java/build/Proxy.java:124 -msgid "Warning: Non-HTTP Protocol" -msgstr "" - -#: ../java/build/Proxy.java:125 -msgid "The request uses a bad protocol." -msgstr "" - -#: ../java/build/Proxy.java:126 -msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only." -msgstr "" - -#: ../java/build/Proxy.java:127 -msgid "Other protocols such as FTP are not allowed." -msgstr "" - -#: ../java/build/Proxy.java:135 -msgid "The connection to the website was reset while the page was loading." -msgstr "" - -#: ../java/build/Proxy.java:136 -msgid "" -"The website could be temporarily unavailable, too busy, or it has blocked " -"your access." -msgstr "" - -#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:145 -msgid "Outproxy Unreachable" -msgstr "" - -#: ../java/build/Proxy.java:146 -msgid "" -"The HTTP outproxy was not reachable, because it uses encryption options that " -"are not supported by your I2P or Java version." -msgstr "" - -#: ../java/build/Proxy.java:150 +#: ../java/build/Proxy.java:69 msgid "Website Unknown" msgstr "" -#: ../java/build/Proxy.java:156 +#: ../java/build/Proxy.java:75 msgid "Website Not Found in Addressbook" msgstr "" -#: ../java/build/Proxy.java:157 +#: ../java/build/Proxy.java:76 msgid "The website was not found in your router's addressbook." msgstr "" -#: ../java/build/Proxy.java:158 +#: ../java/build/Proxy.java:77 msgid "Check the link or find a Base 32 or Base 64 address." msgstr "" -#: ../java/build/Proxy.java:159 +#: ../java/build/Proxy.java:78 #, java-format msgid "If you have the Base 64 address, {0}add it to your addressbook{1}." msgstr "" -#: ../java/build/Proxy.java:160 +#: ../java/build/Proxy.java:79 msgid "" "Otherwise, find a Base 32 or address helper link, or use a jump service link " "below." msgstr "" -#: ../java/build/Proxy.java:161 +#: ../java/build/Proxy.java:80 #, 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:163 ../java/build/Proxy.java:169 -msgid "Warning: Invalid Request URI" -msgstr "" - -#: ../java/build/Proxy.java:170 -msgid "The request URI is invalid, and probably contains illegal characters." -msgstr "" - -#: ../java/build/Proxy.java:171 +#: ../java/build/Proxy.java:89 msgid "" -"If you clicked a link, check the end of the URI for any characters the " -"browser has mistakenly added on." +"The website was not reachable, because it uses encryption options that are " +"not supported by your I2P or Java version." msgstr "" -#: ../java/build/Proxy.java:172 ../java/build/Proxy.java:178 -#: ../java/build/Proxy.java:184 ../java/build/Proxy.java:190 -msgid "Outproxy Not Found" +#: ../java/build/Proxy.java:90 ../java/build/Proxy.java:200 +msgid "Could not connect to the following destination:" msgstr "" -#: ../java/build/Proxy.java:179 +#: ../java/build/Proxy.java:91 ../java/build/Proxy.java:97 +#: ../java/build/Proxy.java:168 ../java/build/Proxy.java:174 +msgid "Connection Reset" +msgstr "" + +#: ../java/build/Proxy.java:98 +msgid "The connection to the website was reset while the page was loading." +msgstr "" + +#: ../java/build/Proxy.java:99 msgid "" -"The HTTP outproxy was not reachable, because its lease set was not found." +"The website could be temporarily unavailable, too busy, or it has blocked " +"your access." msgstr "" -#: ../java/build/Proxy.java:180 +#: ../java/build/Proxy.java:102 ../java/build/Proxy.java:108 +msgid "Warning: Invalid Destination" +msgstr "" + +#: ../java/build/Proxy.java:109 msgid "" -"The outproxy is probably down, but there could also be network congestion." +"The website destination specified was not valid, or was otherwise " +"unreachable." msgstr "" -#: ../java/build/Proxy.java:191 +#: ../java/build/Proxy.java:110 +msgid "" +"Perhaps you pasted in the wrong Base 64 string or the link you are following " +"is bad." +msgstr "" + +#: ../java/build/Proxy.java:111 +msgid "The I2P host could also be offline." +msgstr "" + +#: ../java/build/Proxy.java:114 ../java/build/Proxy.java:120 +msgid "Warning: No Outproxy Configured" +msgstr "" + +#: ../java/build/Proxy.java:121 +msgid "" +"Your request was for a site outside of I2P, but you have no HTTP outproxy " +"configured." +msgstr "" + +#: ../java/build/Proxy.java:122 +msgid "Please configure an outproxy in I2PTunnel." +msgstr "" + +#: ../java/build/Proxy.java:123 ../java/build/Proxy.java:129 +msgid "Warning: Destination Key Conflict" +msgstr "" + +#: ../java/build/Proxy.java:130 +msgid "" +"The address helper link you followed specifies a different destination key " +"than the entry in your address book." +msgstr "" + +#: ../java/build/Proxy.java:131 +msgid "" +"Someone could be trying to impersonate another website, or people have given " +"two websites identical names." +msgstr "" + +#: ../java/build/Proxy.java:132 +msgid "" +"Resolve the conflict by deciding which key you trust, and then either ignore " +"the address helper link, or delete the host entry from your address book and " +"click the address helper link again." +msgstr "" + +#: ../java/build/Proxy.java:133 ../java/build/Proxy.java:139 +msgid "Warning: Bad Address Helper" +msgstr "" + +#: ../java/build/Proxy.java:140 +#, java-format +msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable." +msgstr "" + +#: ../java/build/Proxy.java:141 +msgid "It seems to be garbage data, or a mistyped Base 32 address." +msgstr "" + +#: ../java/build/Proxy.java:142 +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:150 msgid "The HTTP Outproxy was not found." msgstr "" -#: ../java/build/Proxy.java:192 +#: ../java/build/Proxy.java:151 msgid "" "It is offline, there is network congestion, or your router is not yet well-" "integrated with peers." msgstr "" -#: ../java/build/Proxy.java:196 +#: ../java/build/Proxy.java:155 ../java/build/Proxy.java:161 +msgid "Warning: Request Denied" +msgstr "" + +#: ../java/build/Proxy.java:162 +msgid "You attempted to connect to a non-I2P website or location." +msgstr "" + +#: ../java/build/Proxy.java:163 msgid "Proxy Authorization Required" msgstr "" -#: ../java/build/Proxy.java:197 +#: ../java/build/Proxy.java:164 msgid "I2P HTTP Proxy Authorization Required" msgstr "" -#: ../java/build/Proxy.java:198 +#: ../java/build/Proxy.java:165 msgid "This proxy is configured to require a username and password for access." msgstr "" -#: ../java/build/Proxy.java:199 +#: ../java/build/Proxy.java:166 #, 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:200 +#: ../java/build/Proxy.java:167 #, 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/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:634 +#: ../java/build/Proxy.java:175 +msgid "The connection to the proxy was reset." +msgstr "" + +#: ../java/build/Proxy.java:176 +msgid "" +"The proxy could be temporarily unavailable, too busy, or it has blocked your " +"access." +msgstr "" + +#: ../java/build/Proxy.java:180 ../java/build/Proxy.java:186 +msgid "Warning: Non-HTTP Protocol" +msgstr "" + +#: ../java/build/Proxy.java:187 +msgid "The request uses a bad protocol." +msgstr "" + +#: ../java/build/Proxy.java:188 +msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only." +msgstr "" + +#: ../java/build/Proxy.java:189 +msgid "Other protocols such as FTP are not allowed." +msgstr "" + +#: ../java/build/Proxy.java:190 ../java/build/Proxy.java:196 +msgid "Outproxy Unreachable" +msgstr "" + +#: ../java/build/Proxy.java:197 +msgid "" +"The HTTP outproxy was not reachable, because it uses encryption options that " +"are not supported by your I2P or Java version." +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:640 msgid "This seems to be a bad destination:" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:635 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:641 msgid "i2paddresshelper cannot help you with a destination like that!" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:709 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:716 #, java-format msgid "" -"To visit the destination in your host database, click herehere. To visit the conflicting addresshelper destination, click here." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1121 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:741 +#, java-format +msgid "Destination for {0} in address book" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:744 +msgid "Conflicting address helper destination" +msgstr "" + +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1169 msgid "Destination lease set not found" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1273 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1321 msgid "Host" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1277 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1325 msgid "Base 32" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1281 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1329 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1287 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1335 #, java-format msgid "Continue to {0} without saving" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1293 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1341 #, java-format msgid "Save {0} to router address book and continue to website" msgstr "" #. only blockfile supports multiple books -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1296 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1344 #, java-format msgid "Save {0} to master address book and continue to website" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1297 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1345 #, java-format msgid "Save {0} to private address book and continue to website" msgstr "" diff --git a/apps/i2ptunnel/locale/messages_en.po b/apps/i2ptunnel/locale/messages_en.po index cdf5e048d..e58aa05bb 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: 2016-01-17 17:08+0000\n" +"POT-Creation-Date: 2016-05-25 12:28+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -18,27 +18,27 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:365 -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:375 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:396 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:406 msgid "internal" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:409 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:440 #, 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:413 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:444 msgid "lower bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:415 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:446 msgid "standard bandwidth and reliability" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:417 +#: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:448 msgid "higher bandwidth and reliability" msgstr "" @@ -146,7 +146,7 @@ msgid "HTTP bidir" msgstr "" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:447 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:319 msgid "Host not set" msgstr "" @@ -156,7 +156,8 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:82 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:86 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:95 msgid "Hidden Services Manager" msgstr "" @@ -174,26 +175,27 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:162 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:162 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:129 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:143 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:274 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:289 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:144 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:275 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:290 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:156 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:330 msgid "Name" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:166 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:166 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:278 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:307 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:279 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:308 msgid "Type" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:170 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:170 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:258 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:427 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:333 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:259 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:428 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:334 msgid "Description" msgstr "" @@ -219,7 +221,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:208 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:234 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:486 msgid "Reachable by" msgstr "" @@ -229,7 +231,7 @@ msgid "Use SSL?" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:238 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:361 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:362 msgid "Outproxies" msgstr "" @@ -245,22 +247,22 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:301 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:178 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:529 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:530 msgid "(Check the Box for 'YES')" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:260 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:381 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:382 msgid "Tunnel Destination" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:272 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:385 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:386 msgid "name, name:port, or destination" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:275 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:389 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:390 msgid "b32 not recommended" msgstr "" @@ -276,7 +278,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:289 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:174 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:525 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:526 msgid "Auto Start" msgstr "" @@ -285,7 +287,7 @@ msgid "Enable DCC" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347 msgid "Advanced networking options" msgstr "" @@ -296,125 +298,125 @@ msgid "" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:307 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:349 msgid "Tunnel Options" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:351 msgid "Length" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:358 msgid "0 hop tunnel (no anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:362 msgid "1 hop tunnel (low anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:366 msgid "2 hop tunnel (medium anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:370 msgid "3 hop tunnel (high anonymity)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:349 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:347 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:389 msgid "hop tunnel (very poor performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:354 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:352 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:394 msgid "Variance" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:361 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:401 msgid "0 hop variance (no randomisation, consistant performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:365 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:363 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:405 msgid "" "+ 0-1 hop variance (medium additive randomisation, subtractive performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:369 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:367 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:409 msgid "" "+ 0-2 hop variance (high additive randomisation, subtractive performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:373 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:371 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:413 msgid "+/- 0-1 hop variance (standard randomisation, standard performance)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:377 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:375 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:417 msgid "+/- 0-2 hop variance (not recommended)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:388 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:428 msgid "hop variance" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:393 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:391 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:433 msgid "Count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:437 msgid "Backup Count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:404 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:402 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444 msgid "0 backup tunnels (0 redundancy, no added resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:408 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:406 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:448 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:412 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:410 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:452 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:416 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:414 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:456 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:424 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:422 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464 msgid "backup tunnels" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:431 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:471 msgid "Profile" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:438 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:436 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478 msgid "interactive connection" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:442 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:440 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:482 msgid "bulk connection (downloads/websites/BT)" msgstr "" @@ -427,23 +429,23 @@ msgid "for request/response connections" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:452 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:444 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:486 msgid "Router I2CP Address" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:454 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:192 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:446 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:416 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:417 msgid "Host" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:462 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:198 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:454 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:276 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:298 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:437 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:277 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:299 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:438 msgid "Port" msgstr "" @@ -462,27 +464,29 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:564 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:605 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:615 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:464 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:501 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:578 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:506 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:545 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:551 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:557 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:568 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:574 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:636 msgid "Enable" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:480 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:576 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:634 msgid "Reduce tunnel quantity when idle" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:486 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:582 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:640 msgid "Reduced tunnel count" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:490 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:510 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:586 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:644 msgid "Idle minutes" msgstr "" @@ -495,7 +499,7 @@ msgid "New Keys on Reopen" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:508 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:480 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:526 msgid "Disable" msgstr "" @@ -509,6 +513,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:531 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:276 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:172 msgid "Local destination" msgstr "" @@ -533,7 +538,7 @@ msgid "Allow SSL to I2P addresses" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:573 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:629 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:687 msgid "Signature type" msgstr "" @@ -564,23 +569,24 @@ msgid "Jump URL List" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:636 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:658 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:716 msgid "Custom options" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:640 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:662 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:705 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:720 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:429 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:706 msgid "Cancel" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:644 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:666 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:724 msgid "Delete" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:646 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:668 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:726 msgid "Save" msgstr "" @@ -597,6 +603,7 @@ msgid "New server settings" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:255 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:164 msgid "Website name" msgstr "" @@ -608,584 +615,752 @@ msgstr "" msgid "Private key file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:291 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:317 +msgid "Generate QR Code" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:323 msgid "Add to local addressbook" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:299 -msgid "Hostname Signature" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328 +msgid "Registration Authentication" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:462 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:334 +msgid "Set name with .i2p suffix to enable QR code generation" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 +msgid "Set name with .i2p suffix to enable registration authentication" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:504 msgid "Encrypt Leaseset" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:468 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:510 msgid "Encryption Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:472 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514 msgid "Generate New Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:474 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:516 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:431 msgid "Generate" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:476 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:518 msgid "(Tunnel must be stopped first)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:478 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520 msgid "Restricted Access List" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:484 -msgid "Whitelist" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:530 msgid "Blacklist" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:492 -msgid "Access List" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:499 -msgid "Block Access via Inproxies" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:508 -msgid "Unique Local Address per Client" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:514 -msgid "Optimize for Multihoming" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:520 -msgid "Inbound connection limits (0=unlimited)" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:522 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:553 -msgid "Per client" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:524 -msgid "Per minute" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:528 -msgid "Per hour" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:532 -msgid "Per day" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:534 +msgid "Whitelist" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:536 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:563 -msgid "Total" +msgid "Access List" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:544 -msgid "Max concurrent connections (0=unlimited)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:543 +msgid "Block Access via Inproxies" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:551 -msgid "POST limits (0=unlimited)" +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:549 +msgid "Block Accesses containing Referers" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:555 +msgid "Block these User-Agents" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:566 +msgid "Unique Local Address per Client" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:572 +msgid "Optimize for Multihoming" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:578 +msgid "Inbound connection limits (0=unlimited)" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:580 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:611 +msgid "Per client" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:582 +msgid "Per minute" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:586 +msgid "Per hour" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:590 +msgid "Per day" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:594 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:621 +msgid "Total" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:602 +msgid "Max concurrent connections (0=unlimited)" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:609 +msgid "POST limits (0=unlimited)" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:613 msgid "Per period" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:559 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:617 msgid "Ban minutes" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:569 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:627 msgid "POST limit period (minutes)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:631 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:689 msgid "Experts only! Changes B32!" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:99 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:100 msgid "Status Messages" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:103 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:104 msgid "Refresh" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:112 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:113 msgid "Tunnel Wizard" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:116 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:117 msgid "Stop All" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:120 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:121 msgid "Start All" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:124 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:125 msgid "Restart All" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:127 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:128 msgid "I2P Hidden Services" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:131 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:132 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:153 msgid "Points at" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:133 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:185 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:189 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:134 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:186 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:190 msgid "Preview" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:135 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:209 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:282 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:136 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:210 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:283 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:326 msgid "Status" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:195 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:196 msgid "Base32 Address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:203 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:204 msgid "No Preview" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:216 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:217 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:333 msgid "Starting..." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:223 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:237 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:339 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:353 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:367 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:238 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:354 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:368 msgid "Stop" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:230 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:360 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:231 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:361 msgid "Running" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:374 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:245 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:375 msgid "Stopped" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:251 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:381 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:382 msgid "Start" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:266 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 msgid "New hidden service" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:268 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:437 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:268 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:298 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:304 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:579 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:438 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:299 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:580 msgid "Standard" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:270 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:439 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:271 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:440 msgid "Create" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:272 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273 msgid "I2P Client Tunnels" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:280 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:281 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:312 msgid "Interface" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:347 msgid "Standby" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:390 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:391 msgid "Outproxy" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:393 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:394 msgid "Destination" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:400 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:401 msgid "internal plugin" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:419 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:420 msgid "none" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436 msgid "New client tunnel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:122 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:99 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:128 +msgid "Registration Helper" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:154 +msgid "" +"Please be sure to select, copy, and paste the entire contents of the " +"appropriate authentication data into the form of your favorite registration " +"site" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:179 +msgid "Local destination is not available. Start the tunnel." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:184 +msgid "" +"To enable registration verification, edit tunnel and set name (or website " +"name) to a valid host name ending in '.i2p'" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:188 +msgid "" +"To enable registration verification, edit tunnel and set name to a valid " +"host name ending in '.i2p'" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:195 +msgid "Destination signing key is not available. Start the tunnel." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:204 +msgid "Authentication for adding host" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:208 +msgid "Advanced authentication strings" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:216 +msgid "Authentication for removing host" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:220 +#, java-format +msgid "This will remove the entry for {0}" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:246 +msgid "Authentication for changing name" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:257 +#, java-format +msgid "This will change the name from {0} to {1}, using the same destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:263 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:292 +msgid "This tunnel must be configured with the new host name." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:265 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:294 +msgid "Enter old host name below." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:275 +msgid "Authentication for adding alias" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:286 +#, java-format +msgid "This will add an alias {0} for {1}, using the same destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:304 +msgid "Authentication for changing destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:316 +#, java-format +msgid "This will change the destination for {0}" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:322 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:353 +msgid "This tunnel must be configured with the new destination." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:355 +msgid "Enter old destination below." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:335 +msgid "Authentication for adding alternate destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:347 +#, java-format +msgid "This will add an alternate destination for {0}" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:366 +msgid "Authentication for adding subdomain" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:379 +#, java-format +msgid "This will add a subdomain {0} of {1}, with a different destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:385 +msgid "This tunnel must be configured with the new subdomain and destination." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:387 +msgid "Enter higher-level domain and destination below." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:403 +msgid "Go back and edit the tunnel" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:413 +msgid "Specify old name and destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:415 +msgid "This is only required for advanced authentication." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:416 +msgid "See above for required items." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:423 +msgid "Old Host Name" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:427 +msgid "Private Key File for old Destination" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:123 msgid "I2P Tunnel Manager - Tunnel Creation Wizard" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:142 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:570 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:143 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:571 msgid "Server or client tunnel?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:148 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:574 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:149 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:575 msgid "Tunnel type" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:604 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:605 msgid "Tunnel name and description" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:160 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:613 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:161 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:614 msgid "Tunnel destination" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:166 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:629 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:167 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:630 msgid "Binding address and port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:172 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:655 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:173 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:656 msgid "Tunnel auto-start" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:179 msgid "Wizard completed" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:192 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:193 msgid "" "This wizard will take you through the various options available for creating " "tunnels in I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:194 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:195 msgid "" "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:196 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:197 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:198 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:199 msgid "" "On the other hand, if you wish to host a service for others to connect to " "you'll need to create a SERVER tunnel." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:200 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:201 msgid "Server Tunnel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:202 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:203 msgid "Client Tunnel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:221 msgid "There are several types of tunnels to choose from:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:228 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:229 msgid "Basic tunnel for connecting to a single service inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:230 -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:272 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:231 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:273 msgid "" "Try this if none of the tunnel types below fit your requirements, or you " "don't know what type of tunnel you need." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:232 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:233 msgid "Tunnel that acts as an HTTP proxy for reaching eepsites inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:234 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:235 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:237 msgid "" "Websites outside I2P can also be reached if an HTTP proxy within I2P is " "known." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:238 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:239 msgid "Customised client tunnel specific for IRC connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:240 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:241 msgid "" "With this tunnel type, your IRC client will be able to connect to an IRC " "network inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:242 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:243 msgid "" "Each IRC network in I2P that you wish to connect to will require its own " "tunnel. (See Also, SOCKS IRC)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:244 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:245 msgid "A tunnel that implements the SOCKS protocol." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:246 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:247 msgid "" "This enables both TCP and UDP connections to be made through a SOCKS " "outproxy within I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:249 msgid "" "A client tunnel implementing the SOCKS protocol, which is customised for " "connecting to IRC networks." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:251 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:252 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:253 msgid "" "This means that only one I2P tunnel is required rather than a separate " "tunnel per IRC network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:254 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:255 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:256 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:257 msgid "A client tunnel that implements the HTTP CONNECT command." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:258 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:259 msgid "" "This enables TCP connections to be made through an HTTP outproxy, assuming " "the proxy supports the CONNECT command." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:260 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:261 msgid "A customised client tunnel for Streamr." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:270 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:271 msgid "A basic server tunnel for hosting a generic service inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:274 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:275 msgid "A server tunnel that is customised for HTTP connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:276 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:277 msgid "Use this tunnel type if you want to host an eepsite." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:278 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:279 msgid "" "A customised server tunnel that can both serve HTTP data and connect to " "other server tunnels." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:280 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:281 msgid "This tunnel type is predominantly used when running a Seedless server." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:282 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:283 msgid "A customised server tunnel for hosting IRC networks inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:284 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:285 msgid "" "Usually, a separate tunnel needs to be created for each IRC server that is " "to be accessible inside I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:286 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:287 msgid "A customised server tunnel for Streamr." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:326 msgid "Choose a name and description for your tunnel." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:327 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:328 msgid "" "These can be anything you want - they are just for ease of identifying the " "tunnel in the routerconsole." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:357 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:358 msgid "" "If you know of any outproxies for this type of tunnel (either HTTP or " "SOCKS), fill them in below." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:360 msgid "Separate multiple proxies with commas." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:377 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:378 msgid "" "Type in the I2P destination of the service that this client tunnel should " "connect to." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:379 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:380 msgid "" "This could be the full base 64 destination key, or an I2P URL from your " "address book." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:412 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:413 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:436 msgid "This is the port that the service is accepting connections on." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:456 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:457 msgid "This is the port that the client tunnel will be accessed from locally." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:458 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:459 msgid "This is also the client port for the HTTPBidir server tunnel." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:478 msgid "" "How do you want this tunnel to be accessed? By just this machine, your " "entire subnet, or external internet?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:480 msgid "You will most likely want to just allow 127.0.0.1" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:521 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:522 msgid "" "The I2P router can automatically start this tunnel for you when the router " "is started." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:523 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:524 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:549 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:550 msgid "The wizard has now collected enough information to create your tunnel." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:551 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:552 msgid "" "Upon clicking the Save button below, the wizard will set up the tunnel, and " "take you back to the main I2PTunnel page." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:556 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:557 msgid "" "Because you chose to automatically start the tunnel when the router starts, " "you don't have to do anything further." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:558 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:559 msgid "The router will start the tunnel once it has been set up." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:562 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:563 msgid "" "Because you chose not to automatically start the tunnel, you will have to " "manually start it." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:564 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:565 msgid "" "You can do this by clicking the Start button on the main page which " "corresponds to the new tunnel." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:568 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:569 msgid "Below is a summary of the options you chose:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:666 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:667 msgid "" "Alongside these basic settings, there are a number of advanced options for " "tunnel configuration." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:668 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:669 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:710 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:711 msgid "Previous" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:718 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:719 msgid "Save Tunnel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:724 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:725 msgid "Finish" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:730 +#: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:731 msgid "Next" msgstr "" diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po index 2a7650269..a79f397c8 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: 2016-01-17 17:08+0000\n" +"POT-Creation-Date: 2016-05-25 12:28+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -26,8 +26,8 @@ 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:1529 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1524 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -36,8 +36,8 @@ msgstr[1] "" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1528 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -46,8 +46,8 @@ msgstr[1] "" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1532 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -56,8 +56,8 @@ msgstr[1] "" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1536 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -65,8 +65,8 @@ msgstr[0] "" msgstr[1] "" #. days -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -74,28 +74,28 @@ msgstr[0] "" msgstr[1] "" #. years -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1542 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1589 #, java-format msgid "1 year" msgid_plural "{0} years" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:336 msgid "n/a" msgstr "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -149,7 +149,7 @@ msgstr "" #. * IPv4 OK, IPv6 OK or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:702 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:703 msgid "OK" msgstr "" @@ -192,7 +192,7 @@ msgstr "" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:707 msgid "Firewalled" msgstr "" @@ -218,7 +218,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:339 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:723 msgid "Testing" msgstr "" @@ -227,94 +227,94 @@ msgstr "" #. setTunnelStatus("Not expecting tunnel requests: Advertised bandwidth too low"); #. else #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:78 -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:135 -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:136 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:524 msgid "Rejecting tunnels: Starting up" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:182 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:183 msgid "Rejecting tunnels: High message delay" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:195 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:196 msgid "Rejecting tunnels: Limit reached" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:227 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:228 msgid "Rejecting most tunnels: High number of requests" msgstr "" #. hard to do {0} from here #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of tunnels"); -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:229 -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:410 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:230 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:411 msgid "Accepting most tunnels" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:231 -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:412 -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:539 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:232 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:413 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:540 msgid "Accepting tunnels" msgstr "" #. .067KBps #. * also limited to 90% - see below #. always leave at least 4KBps free when allowing -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:336 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:337 msgid "Rejecting tunnels: Bandwidth limit" msgstr "" #. hard to do {0} from here #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels: Bandwidth limit"); -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:406 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:407 msgid "Rejecting most tunnels: Bandwidth limit" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:528 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:529 msgid "Rejecting tunnels: Shutting down" msgstr "" -#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:541 +#: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:542 msgid "Rejecting tunnels" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:207 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:228 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:279 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:300 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:302 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:323 #, 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:311 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:332 msgid "Reseed failed." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:312 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:333 #, java-format msgid "See {0} for help." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:313 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:334 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:561 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:692 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:585 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:716 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:618 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:728 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:642 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:752 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -360,7 +360,7 @@ msgid "NetDb entry" msgstr "" #. This used to be "no common transports" but it is almost always no transports at all -#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:73 +#: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:74 msgid "No transports (hidden or starting up?)" msgstr "" @@ -377,12 +377,12 @@ msgid "Unreachable on any transport" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:687 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:566 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:577 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:604 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:622 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:580 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:607 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:625 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1363 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2579 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2641 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:94 msgid "Status" msgstr "" @@ -403,7 +403,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:733 #: ../java/src/net/i2p/router/web/HomeHelper.java:35 -#: ../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:168 msgid "Help" msgstr "" @@ -426,7 +426,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:739 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1367 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2583 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2645 #: ../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 @@ -441,7 +441,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:740 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1368 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2649 msgid "Dir" msgstr "" @@ -467,13 +467,13 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1370 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2589 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2651 msgid "Idle" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1371 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2594 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2656 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:167 msgid "In/Out" msgstr "" @@ -488,14 +488,14 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1372 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2599 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2661 #: ../java/src/net/i2p/router/web/SummaryHelper.java:963 msgid "Up" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1373 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2601 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2663 msgid "Skew" msgstr "" @@ -542,7 +542,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:761 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1374 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2618 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2680 msgid "TX" msgstr "" @@ -552,7 +552,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:762 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2620 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 msgid "RX" msgstr "" @@ -561,7 +561,7 @@ msgid "The total number of messages received from the peer" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:763 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2623 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2685 msgid "Dup TX" msgstr "" @@ -570,7 +570,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:764 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2625 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2687 msgid "Dup RX" msgstr "" @@ -578,104 +578,104 @@ msgstr "" msgid "The total number of duplicate packets received from the peer" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:561 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 msgid "Service" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:568 msgid "WAN Common Interface Configuration" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:568 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:588 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:615 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:618 msgid "Type" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:570 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:590 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:573 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593 msgid "Upstream" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:572 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:592 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:595 msgid "Downstream" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:576 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:579 msgid "WAN PPP Connection" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:584 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:611 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:322 msgid "Uptime" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:594 -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:617 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620 msgid "External IP" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:601 msgid "Layer 3 Forwarding" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:599 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602 msgid "Default Connection Service" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:606 msgid "WAN IP Connection" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:624 msgid "WAN Ethernet Link Configuration" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:642 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:645 msgid "Found Device" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:644 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:647 msgid "Subdevice" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:665 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668 msgid "UPnP Status" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:669 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:672 msgid "Disabled UPnP Devices" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:683 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:686 msgid "" "UPnP has been disabled; Do you have more than one UPnP Internet Gateway " "Device on your LAN ?" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:686 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:689 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN." msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:694 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:697 #, java-format msgid "The current external IP address reported by UPnP is {0}" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:696 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699 msgid "The current external IP address is not available." msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:700 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:703 #, java-format msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:702 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:705 #, java-format msgid "UPnP reports the maximum upstream bit rate is {0}bits/sec" msgstr "" @@ -683,12 +683,12 @@ msgstr "" #. {0} is TCP or UDP #. {1,number,#####} prevents 12345 from being output as 12,345 in the English locale. #. If you want the digit separator in your locale, translate as {1}. -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:710 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:713 #, java-format msgid "{0} port {1,number,#####} was successfully forwarded by UPnP." msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:712 +#: ../../../router/java/src/net/i2p/router/transport/UPnP.java:715 #, java-format msgid "{0} port {1,number,#####} was not forwarded by UPnP." msgstr "" @@ -704,17 +704,17 @@ msgid "NTCP connections" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2576 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2638 msgid "Limit" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1361 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2577 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2639 msgid "Timeout" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1369 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2588 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2650 msgid "IPv6" msgstr "" @@ -727,126 +727,126 @@ msgid "Backlogged?" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1390 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2642 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2704 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1392 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2644 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2706 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1447 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2809 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2871 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2575 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2637 msgid "UDP connections" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2585 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2647 msgid "Sort by peer hash" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2587 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2649 msgid "Direction/Introduction" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2590 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2652 msgid "Sort by idle inbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2592 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2654 msgid "Sort by idle outbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2595 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2657 msgid "Sort by inbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2597 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2659 msgid "Sort by outbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2662 msgid "Sort by connection uptime" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2602 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2664 msgid "Sort by clock skew" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2605 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2667 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2607 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2669 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2610 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2672 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2614 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2676 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2679 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2619 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2681 msgid "Sort by packets sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2621 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2683 msgid "Sort by packets received" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2624 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2686 msgid "Sort by packets retransmitted" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2626 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2688 msgid "Sort by packets received more than once" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2646 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2708 msgid "We offered to introduce them" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2648 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2710 msgid "They offered to introduce us" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2652 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2714 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2660 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2722 msgid "1 fail" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2662 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2724 #, java-format msgid "{0} fails" msgstr "" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2668 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2730 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2727 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2789 msgid "backlogged" msgstr "" @@ -863,24 +863,24 @@ msgstr "" msgid "Dropping tunnel requests: Overloaded" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:723 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:732 msgid "Rejecting tunnels: Hidden mode" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:751 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:760 msgid "Rejecting tunnels: Request overload" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:782 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:791 msgid "Rejecting tunnels: Connection limit" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1001 -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1034 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1009 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1042 msgid "Dropping tunnel requests: High load" msgstr "" -#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1117 +#: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1125 msgid "Dropping tunnel requests: Queue time" msgstr "" @@ -931,9 +931,10 @@ msgstr "" msgid "Update verified" msgstr "" +#. } else if (_context.getBooleanProperty(PROP_ALLOW_NEW_KEYS)) { #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:307 #, java-format msgid "from {0}" msgstr "" @@ -957,12 +958,12 @@ msgstr "" #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 -#: ../java/src/net/i2p/router/web/PluginStarter.java:157 +#: ../java/src/net/i2p/router/web/PluginStarter.java:158 msgid "HTTP client proxy tunnel must be running" msgstr "" #: ../java/src/net/i2p/router/update/DevSU3UpdateChecker.java:83 -#: ../java/src/net/i2p/router/update/NewsFetcher.java:254 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:260 #: ../java/src/net/i2p/router/update/UnsignedUpdateChecker.java:88 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" @@ -977,23 +978,23 @@ msgstr "" msgid "Updating" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:218 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:224 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:224 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:230 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:230 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:236 msgid "No Pack200 support in Java runtime." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:236 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:242 msgid "No update certificates installed." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:244 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:250 #, java-format msgid "You must first update to version {0}" msgstr "" @@ -1032,7 +1033,7 @@ msgid "Plugin downloaded" msgstr "" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:144 -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:506 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:507 #, java-format msgid "Cannot create plugin directory {0}" msgstr "" @@ -1040,7 +1041,7 @@ msgstr "" #. updateStatus("" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' + signer + ""); #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:205 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:214 -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:318 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:319 #, java-format msgid "Plugin from {0} contains an invalid key" msgstr "" @@ -1048,7 +1049,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:247 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:271 -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:329 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:330 #, java-format msgid "Plugin signature verification of {0} failed" msgstr "" @@ -1058,115 +1059,115 @@ msgstr "" msgid "Plugin not installed - signer is untrusted" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:345 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:346 #, java-format msgid "Plugin from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:355 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:356 #, java-format msgid "Plugin from {0} does not contain the required configuration file" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:377 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:378 #, java-format msgid "Plugin from {0} has invalid name or version" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:382 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:383 #, java-format msgid "Plugin {0} has mismatched versions" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:393 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:394 #, java-format msgid "This plugin requires I2P version {0} or higher" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:401 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:402 #, java-format msgid "This plugin requires Java version {0} or higher" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:410 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:411 msgid "" "Downloaded plugin is for new installs only, but the plugin is already " "installed" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:420 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:421 msgid "Installed plugin does not contain the required configuration file" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:428 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:429 msgid "Signature of downloaded plugin does not match installed plugin" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:435 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:436 #, java-format msgid "Downloaded plugin version {0} is not newer than installed plugin" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:442 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:443 #, java-format msgid "Plugin update requires installed plugin version {0} or higher" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:449 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:450 #, java-format msgid "Plugin update requires installed plugin version {0} or lower" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:457 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:458 #, java-format msgid "Plugin requires Jetty version {0} or higher" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:464 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:465 #, java-format msgid "Plugin requires Jetty version {0} or lower" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:473 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:474 #, java-format msgid "Cannot copy plugin to directory {0}" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:483 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:484 msgid "Plugin will be installed on next restart." msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:502 msgid "Plugin is for upgrades only, but the plugin is not installed" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:514 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:515 #, java-format msgid "Failed to install plugin in {0}" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:521 -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:549 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:522 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:550 #, java-format msgid "Plugin {0} installed" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:540 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:541 #, java-format msgid "Plugin {0} installed and started" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:543 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:544 #, java-format msgid "Plugin {0} installed but failed to start, check logs" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:545 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:546 #, java-format msgid "Plugin {0} installed but failed to start" msgstr "" -#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:557 +#: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:558 #, java-format msgid "Failed to download plugin from {0}" msgstr "" @@ -1202,101 +1203,103 @@ msgstr "" #: ../java/src/net/i2p/router/web/CSSHelper.java:149 #: ../java/src/net/i2p/router/web/HomeHelper.java:36 #: ../java/strings/Strings.java:29 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:229 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:231 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:221 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:220 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:321 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:237 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:163 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:232 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:234 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:233 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:247 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:249 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:238 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:240 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:225 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:227 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:201 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:203 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:300 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:236 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:238 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:228 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:230 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:226 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:222 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:224 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:237 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:219 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:230 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:232 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:222 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:221 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:322 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:238 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:164 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:235 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:234 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:248 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:250 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:239 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:241 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:226 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:228 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:202 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:204 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:237 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:239 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:229 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:231 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:227 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:223 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:225 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:238 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:218 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:220 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:236 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:238 msgid "I2P Router Console" msgstr "" @@ -1324,55 +1327,60 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:392 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:368 msgid "Configuration saved successfully" msgstr "" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:40 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:85 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:104 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:394 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:109 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:160 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:370 msgid "" "Error saving the configuration (applied but not saved) - please see the " "error logs" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:506 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:507 msgid "Save Client Configuration" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:573 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:577 msgid "Save Interface Configuration" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:592 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:593 msgid "Save WebApp Configuration" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:61 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:609 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:610 msgid "Save Plugin Configuration" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:625 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:629 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:626 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:630 msgid "Install Plugin" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:640 msgid "Install Plugin from File" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:651 msgid "Update All Installed Plugins" msgstr "" @@ -1467,6 +1475,7 @@ msgid "No plugin URL specified." msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:47 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" msgstr "" @@ -1510,7 +1519,7 @@ msgid "Error starting plugin {0}" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:604 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:105 #, java-format msgid "Added user {0}" msgstr "" @@ -1520,10 +1529,14 @@ msgid "Interface configuration saved" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:620 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:342 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:38 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:83 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:102 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:345 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:351 #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:122 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:108 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:132 msgid "Restart required to take effect" msgstr "" @@ -1533,7 +1546,7 @@ msgid "Edit" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:107 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:502 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:503 msgid "Add Client" msgstr "" @@ -1594,7 +1607,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:38 -#: ../java/src/net/i2p/router/web/HomeHelper.java:177 +#: ../java/src/net/i2p/router/web/HomeHelper.java:178 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:163 msgid "Website" msgstr "" @@ -1609,7 +1622,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:364 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:464 msgid "Check for updates" msgstr "" @@ -1627,42 +1640,71 @@ msgstr "" msgid "Delete" msgstr "" +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:27 +msgid "Create Router Family" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:31 +msgid "You must enter a family name" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:37 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:101 +#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:158 +msgid "Configuration saved successfully." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:42 +msgid "Join Router Family" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:88 +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:90 +msgid "Load from file failed" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigFamilyHandler.java:95 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:535 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:539 +msgid "Leave Router Family" +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/ConfigUIHandler.java:21 #: ../java/src/net/i2p/router/web/SummaryHelper.java:998 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:473 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:517 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:533 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:474 msgid "Delete selected" 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:1017 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:522 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:530 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:538 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:503 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:515 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:523 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:531 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:539 msgid "Add item" msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:520 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:536 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:501 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:521 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:537 msgid "Restore defaults" msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:543 msgid "Save" msgstr "" @@ -1693,12 +1735,12 @@ msgid "Removed" msgstr "" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:505 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:506 msgid "Add key" msgstr "" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:503 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:504 msgid "Delete key" msgstr "" @@ -1763,7 +1805,7 @@ msgstr "" #. http://www.dhs.gov/xinfoshare/programs/Copy_of_press_release_0046.shtm #. but pink instead of yellow for WARN #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:65 -#: ../java/src/net/i2p/router/web/LogsHelper.java:141 +#: ../java/src/net/i2p/router/web/LogsHelper.java:170 msgid "CRIT" msgstr "" @@ -1772,23 +1814,23 @@ msgid "DEBUG" msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:65 -#: ../java/src/net/i2p/router/web/LogsHelper.java:143 +#: ../java/src/net/i2p/router/web/LogsHelper.java:172 msgid "ERROR" msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:65 -#: ../java/src/net/i2p/router/web/LogsHelper.java:147 +#: ../java/src/net/i2p/router/web/LogsHelper.java:176 msgid "INFO" msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:65 -#: ../java/src/net/i2p/router/web/LogsHelper.java:145 +#: ../java/src/net/i2p/router/web/LogsHelper.java:174 msgid "WARN" msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:171 -#: ../java/src/net/i2p/router/web/HomeHelper.java:214 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:174 +#: ../java/src/net/i2p/router/web/HomeHelper.java:215 #: ../java/src/net/i2p/router/web/SummaryHelper.java:932 msgid "Remove" msgstr "" @@ -1813,51 +1855,52 @@ msgid "Network" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:294 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:294 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:304 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:294 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:294 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:294 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:295 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:308 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:341 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:313 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:300 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:209 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:318 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:318 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:318 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:322 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:297 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:318 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:295 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:295 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:305 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:295 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:295 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:295 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:296 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:342 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:314 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:301 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:210 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:298 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:319 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:293 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:311 msgid "Summary Bar" msgstr "" @@ -1877,7 +1920,7 @@ msgid "Clients" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:478 msgid "Keyring" msgstr "" @@ -1902,127 +1945,131 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:59 +#: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 +msgid "Router Family" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:60 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:593 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:560 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:511 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:472 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:492 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:480 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:642 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:594 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:561 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:512 msgid "Save changes" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:212 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:215 msgid "Updating IP address" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:234 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:237 msgid "Updating IPv6 setting" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:254 msgid "Disabling TCP completely" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:259 #, java-format msgid "Updating TCP address to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:263 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:266 msgid "Disabling inbound TCP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:265 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:268 msgid "Updating inbound TCP address to auto" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:281 #, java-format msgid "Updating TCP port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:280 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:305 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:283 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:308 msgid "Warning - ports less than 1024 are not recommended" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284 -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:311 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:287 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:314 msgid "Invalid port" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:289 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:292 msgid "Updating inbound TCP port to auto" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:303 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:306 #, java-format msgid "Updating UDP port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:328 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:331 msgid "Gracefully restarting into Hidden Router Mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:330 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:333 msgid "Gracefully restarting to exit Hidden Router Mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:339 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:342 msgid "Enabling UPnP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:341 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:344 msgid "Disabling UPnP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:350 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:353 msgid "Enabling laptop mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:352 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:355 msgid "Disabling laptop mode" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:362 msgid "Disabling inbound IPv4" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:364 msgid "Enabling inbound IPv4" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:372 msgid "Disabling UDP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:371 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:374 msgid "Enabling UDP" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:378 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:381 msgid "Requiring SSU introducers" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:436 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:439 msgid "Invalid address" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:442 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:445 #, java-format msgid "The hostname or IP {0} is not publicly routable" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:467 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:470 msgid "Updating bandwidth share percentage" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:497 +#: ../java/src/net/i2p/router/web/ConfigNetHandler.java:500 msgid "Updated bandwidth limits" msgstr "" @@ -2031,17 +2078,21 @@ msgstr "" msgid "unknown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:248 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:227 +msgid "Add host name or IP" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:251 msgid "bits per second" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:249 +#: ../java/src/net/i2p/router/web/ConfigNetHelper.java:252 #, java-format msgid "or {0} bytes per month maximum" msgstr "" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:497 msgid "Ban peer until restart" msgstr "" @@ -2061,7 +2112,7 @@ msgid "Invalid peer" msgstr "" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:499 msgid "Unban peer" msgstr "" @@ -2074,7 +2125,7 @@ msgid "is not currently banned" msgstr "" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:524 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:525 msgid "Adjust peer bonuses" msgstr "" @@ -2091,7 +2142,7 @@ msgid "Unsupported" msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:24 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:592 msgid "Save changes and reseed now" msgstr "" @@ -2106,7 +2157,7 @@ msgid "Starting reseed process" msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:32 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:492 msgid "Reseed from URL" msgstr "" @@ -2123,7 +2174,7 @@ msgid "Reseed complete, check summary bar for status" msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:504 msgid "Reseed from file" msgstr "" @@ -2140,7 +2191,7 @@ msgstr[0] "" msgstr[1] "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:99 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:540 msgid "Reset URL list" msgstr "" @@ -2148,15 +2199,11 @@ msgstr "" msgid "URL list reset successfully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:158 -msgid "Configuration saved successfully." -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:203 -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:207 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:229 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:474 msgid "Shutdown immediately" msgstr "" @@ -2177,7 +2224,7 @@ msgstr "" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:217 msgid "Restart" msgstr "" @@ -2211,121 +2258,148 @@ msgstr[1] "" msgid "Restart in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:198 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:472 msgid "Shutdown gracefully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:202 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:228 msgid "Graceful shutdown initiated" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:478 msgid "Cancel graceful shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:210 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:236 msgid "Graceful shutdown cancelled" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:211 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:491 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:237 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:492 msgid "Graceful restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:216 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242 msgid "Graceful restart requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:217 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:494 msgid "Hard restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:222 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:248 msgid "Hard restart requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:249 msgid "Rekey and Restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:224 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:250 msgid "Rekeying after graceful restart" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:227 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:253 msgid "Rekey and Shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:228 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:254 msgid "Rekeying after graceful shutdown" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:231 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:257 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:526 msgid "Run I2P on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:233 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:259 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:528 msgid "Don't run I2P on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:235 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:545 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:552 msgid "Dump threads" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:242 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:268 #, java-format msgid "Threads dumped to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:243 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:553 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:269 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:560 msgid "View console on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:245 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:271 msgid "Console is to be shown on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:246 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:555 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:272 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:562 msgid "Do not view console on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:248 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:274 msgid "Console is not to be shown on startup" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:249 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:541 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:275 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:548 msgid "Force GC" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:251 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:277 msgid "Full garbage collection requested" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:260 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:278 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:506 +msgid "Show systray icon" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:280 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:510 +msgid "Hide systray icon" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:290 msgid "Service installed" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:262 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:292 msgid "Warning: unable to install the service" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:269 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:299 msgid "Service removed" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:271 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:301 msgid "Warning: unable to remove the service" msgstr "" +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:340 +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:355 +msgid "Enabled system tray" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:345 +msgid "Disabled system tray" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:360 +msgid "Failed to start systray" +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:362 +msgid "Failed to stop systray" +msgstr "" + #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116 msgid "Stat filter and location updated successfully to" msgstr "" @@ -2363,7 +2437,7 @@ msgid "Refresh interval must be a number" msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:495 msgid "Restore full default" msgstr "" @@ -2378,7 +2452,7 @@ msgid "Summary bar will refresh shortly." msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:496 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:497 msgid "Restore minimal default" msgstr "" @@ -2419,9 +2493,9 @@ msgid "Exploratory tunnel configuration saved successfully." msgstr "" #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:96 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:114 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:75 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:110 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:128 msgid "" "Error saving the configuration (applied but not saved) - please see the " "error logs." @@ -2493,34 +2567,47 @@ msgstr "" msgid "Outbound options" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:21 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:471 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:477 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:23 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:472 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:478 msgid "Add user" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65 msgid "Theme change saved." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65 -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:67 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:72 msgid "Refresh the page to view." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70 msgid "Mobile console option saved." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:82 msgid "No user name entered" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94 +msgid "" +"Warning: User names outside the ISO-8859-1 character set are not " +"recommended. Support is not standardized and varies by browser." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:97 msgid "No password entered" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111 +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:106 +#, java-format +msgid "" +"To recover from a forgotten or non-working password, stop I2P, edit the file " +"{0}, delete the line {1}, and restart I2P." +msgstr "" + +#: ../java/src/net/i2p/router/web/ConfigUIHandler.java:125 #, java-format msgid "Removed user {0}" msgstr "" @@ -2639,22 +2726,22 @@ msgstr "" msgid "Chinese" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:167 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 msgid "Add a user and password to enable." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:173 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:176 msgid "User Name" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:184 -#: ../java/src/net/i2p/router/web/HomeHelper.java:241 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:187 +#: ../java/src/net/i2p/router/web/HomeHelper.java:242 #: ../java/src/net/i2p/router/web/SummaryHelper.java:1000 msgid "Add" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:187 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562 +#: ../java/src/net/i2p/router/web/ConfigUIHelper.java:190 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:563 msgid "Password" msgstr "" @@ -2980,7 +3067,7 @@ msgid "Periods" msgstr "" #: ../java/src/net/i2p/router/web/GraphHelper.java:362 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:524 msgid "or" msgstr "" @@ -3032,7 +3119,7 @@ msgid "Configure Bandwidth" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:31 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:331 msgid "I2P Bandwidth Configuration" msgstr "" @@ -3049,7 +3136,7 @@ msgid "Customize Home Page" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:347 msgid "I2P Home Page Configuration" msgstr "" @@ -3069,7 +3156,7 @@ msgid "I2P Router Help" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:162 msgid "Router Console" msgstr "" @@ -3172,21 +3259,10 @@ msgstr "" msgid "Your premier microblogging service on I2P" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:56 -msgid "Javadocs" -msgstr "" - -#: ../java/src/net/i2p/router/web/HomeHelper.java:56 -#: ../java/src/net/i2p/router/web/HomeHelper.java:69 -msgid "Technical documentation" -msgstr "" - +#. _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S + #. "jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S + #. _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "education.png" + S + -#: ../java/src/net/i2p/router/web/HomeHelper.java:59 -msgid "Debian and Tahoe-LAFS repositories" -msgstr "" - +#. "killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "television_delete.png" + S + #: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "Free Web Hosting" msgstr "" @@ -3244,34 +3320,46 @@ msgstr "" msgid "Technical Docs" msgstr "" +#: ../java/src/net/i2p/router/web/HomeHelper.java:69 +msgid "Technical documentation" +msgstr "" + #: ../java/src/net/i2p/router/web/HomeHelper.java:70 +msgid "Privacy guides and tutorials" +msgstr "" + +#: ../java/src/net/i2p/router/web/HomeHelper.java:70 +msgid "The Tin Hat" +msgstr "" + +#: ../java/src/net/i2p/router/web/HomeHelper.java:71 msgid "Trac Wiki" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:72 +#: ../java/src/net/i2p/router/web/HomeHelper.java:73 msgid "Seedless and the Robert BitTorrent applications" msgstr "" #. _x("Ugha's Wiki") + S + S + "http://ugha.i2p/" + S + I + "billiard_marker.png" + S + -#: ../java/src/net/i2p/router/web/HomeHelper.java:72 +#: ../java/src/net/i2p/router/web/HomeHelper.java:73 msgid "Sponge's main site" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:112 +#: ../java/src/net/i2p/router/web/HomeHelper.java:113 msgid "The HTTP proxy is not up" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:114 +#: ../java/src/net/i2p/router/web/HomeHelper.java:115 #, 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:216 +#: ../java/src/net/i2p/router/web/HomeHelper.java:217 #: ../java/src/net/i2p/router/web/SummaryHelper.java:934 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:218 +#: ../java/src/net/i2p/router/web/HomeHelper.java:219 msgid "URL" msgstr "" @@ -3360,16 +3448,16 @@ msgstr "" msgid "Summary" msgstr "" -#: ../java/src/net/i2p/router/web/LogsHelper.java:49 -#: ../java/src/net/i2p/router/web/LogsHelper.java:103 +#: ../java/src/net/i2p/router/web/LogsHelper.java:78 +#: ../java/src/net/i2p/router/web/LogsHelper.java:132 msgid "File location" msgstr "" -#: ../java/src/net/i2p/router/web/LogsHelper.java:100 +#: ../java/src/net/i2p/router/web/LogsHelper.java:129 msgid "File not found" msgstr "" -#: ../java/src/net/i2p/router/web/LogsHelper.java:118 +#: ../java/src/net/i2p/router/web/LogsHelper.java:147 msgid "No log messages" msgstr "" @@ -3494,28 +3582,28 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:464 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:846 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:847 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:727 msgid "Hidden" msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:464 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:846 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:847 msgid "Updated" msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:465 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:468 #: ../java/src/net/i2p/router/web/SybilRenderer.java:625 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:800 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:806 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:812 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:820 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:826 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:832 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:838 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:847 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:850 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:801 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:807 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:813 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:821 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:827 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:833 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:839 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:848 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:851 #, java-format msgid "{0} ago" msgstr "" @@ -3523,12 +3611,12 @@ msgstr "" #. shouldnt happen #: ../java/src/net/i2p/router/web/NetDbRenderer.java:467 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:849 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:850 msgid "Published" msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 -#: ../java/src/net/i2p/router/web/SybilRenderer.java:852 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:853 msgid "Signing Key" msgstr "" @@ -3619,23 +3707,23 @@ msgstr "" msgid "Show all news" msgstr "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:140 +#: ../java/src/net/i2p/router/web/PluginStarter.java:141 msgid "Checking for plugin updates" msgstr "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:155 -#: ../java/src/net/i2p/router/web/PluginStarter.java:161 +#: ../java/src/net/i2p/router/web/PluginStarter.java:156 +#: ../java/src/net/i2p/router/web/PluginStarter.java:162 msgid "Plugin update check failed" msgstr "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:199 +#: ../java/src/net/i2p/router/web/PluginStarter.java:200 #, java-format msgid "1 plugin updated" msgid_plural "{0} plugins updated" msgstr[0] "" msgstr[1] "" -#: ../java/src/net/i2p/router/web/PluginStarter.java:201 +#: ../java/src/net/i2p/router/web/PluginStarter.java:202 msgid "Plugin update check complete" msgstr "" @@ -3667,13 +3755,13 @@ msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:517 msgid "Speed" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:521 msgid "Capacity" msgstr "" @@ -4046,8 +4134,8 @@ msgid "Local Tunnels" msgstr "" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:241 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:165 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:338 msgid "Hidden Services Manager" msgstr "" @@ -4443,42 +4531,42 @@ msgstr "" msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:158 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:160 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:170 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:205 msgid "avg" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:193 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:206 msgid "max" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:194 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:207 msgid "now" msgstr "" -#: ../java/src/net/i2p/router/web/SybilRenderer.java:854 +#: ../java/src/net/i2p/router/web/SybilRenderer.java:855 msgid "Addresses" msgstr "" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:36 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:441 msgid "configure" msgstr "" @@ -4589,7 +4677,7 @@ msgstr "" #. wars for ConfigClientsHelper #: ../java/strings/Strings.java:12 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:164 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:165 msgid "addressbook" msgstr "" @@ -4766,391 +4854,394 @@ msgstr "" msgid "port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:146 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:147 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:319 msgid "Certificates" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:153 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:164 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:165 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:174 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:170 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:157 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:155 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:154 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:151 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:167 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:149 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:167 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:154 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:168 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:165 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:166 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:175 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:171 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:158 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:168 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:156 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:155 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:168 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:168 msgid "Router is down" msgstr "" #. We have intl defined when this is included, but not when compiled standalone. -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:317 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:333 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:307 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:308 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:323 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:320 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:321 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:354 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:326 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:313 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:324 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:331 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:331 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:331 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:310 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:331 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:299 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:323 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:305 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:323 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:308 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:309 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:321 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:322 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:355 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:327 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:314 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:311 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:332 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:300 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:324 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:306 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:324 msgid "Refresh (s)" msgstr "" #. ditto -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:337 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:311 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:312 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:327 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:324 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:325 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:358 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:330 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:317 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:328 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:339 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:314 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:335 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:302 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:327 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/certs_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:322 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:313 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/debug_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:328 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:325 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:326 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:331 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005far_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005ffr_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fnl_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_005fru_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/help_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:329 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/oldconsole_jsp.java:315 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:303 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:328 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:310 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:328 msgid "Enable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:149 msgid "configure bandwidth" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:437 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:438 msgid "Bandwidth limiter" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:439 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:440 msgid "" "I2P will work best if you configure your rates to match the speed of your " "internet connection." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:444 msgid "KBps In" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:458 msgid "KBps Out" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:473 msgid "Share" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:480 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:476 msgid "NOTE" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:482 #, java-format msgid "You have configured I2P to share only {0} KBps." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:484 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 msgid "I2P requires at least 12KBps to enable sharing. " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:486 msgid "" "Please enable sharing (participating in tunnels) by configuring more " "bandwidth. " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:487 msgid "" "It improves your anonymity by creating cover traffic, and helps the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:489 #, java-format msgid "You have configured I2P to share {0} KBps." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:491 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:492 msgid "" "The higher the share bandwidth the more you improve your anonymity and help " "the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:496 msgid "Advanced network configuration page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:607 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:627 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:498 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:518 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:534 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:501 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:477 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:639 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:589 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:558 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:509 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:461 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:475 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:540 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:498 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:575 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:591 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:608 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:628 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:519 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:535 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:502 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:478 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:640 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:590 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:559 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:462 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:476 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:541 msgid "Cancel" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:149 msgid "config advanced" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:330 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:331 msgid "I2P Advanced Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:436 msgid "Floodfill Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:437 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:438 msgid "" "Floodill participation helps the network, but may use more of your " "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:443 msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:447 msgid "This router is not currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:458 msgid "Automatic" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:464 msgid "Force On" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:470 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:474 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:496 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:499 #, java-format msgid "To make changes, edit the file {0}." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:151 msgid "config clients" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:362 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:363 msgid "I2P Client Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:480 msgid "Client Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:482 msgid "" "The Java clients listed below are started by the router and run in the same " "JVM." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:484 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 "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:489 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:490 msgid "To change other client options, edit the file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:496 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:570 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:588 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:571 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:589 msgid "All changes require restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:509 msgid "Advanced Client Interface Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:512 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:513 msgid "External I2CP (I2P Client Protocol) Interface Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:518 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:519 msgid "Enabled without SSL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:524 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:525 msgid "Enabled with SSL required" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:531 msgid "Disabled - Clients outside this Java process may not connect" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:533 msgid "I2CP Interface" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:548 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:549 msgid "I2CP Port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:552 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:553 msgid "Authorization" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:559 msgid "Require username and password" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:561 msgid "Username" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:564 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:480 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:517 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:565 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:518 msgid "The default settings will work for most people." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:566 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:567 msgid "Any changes made here must also be configured in the external client." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:568 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:569 msgid "Many clients do not support SSL or authorization." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:578 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:579 msgid "WebApp Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:580 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:581 msgid "" "The Java web applications listed below are started by the webConsole client " "and run in the same JVM as the router. They are usually web applications " @@ -5160,7 +5251,7 @@ msgid "" "all (e.g. addressbook)." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:583 msgid "" "A web app may also be disabled by removing the .war file from the webapps " "directory; however the .war file and web app will reappear when you update " @@ -5168,741 +5259,811 @@ msgid "" "preferred method." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:599 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:600 msgid "Plugin Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:601 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:602 msgid "The plugins listed below are started by the webConsole client." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:617 msgid "Plugin Installation from URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:619 #, java-format msgid "Look for available plugins on {0}." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:621 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:622 msgid "To install a plugin, enter the download URL:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:631 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:632 msgid "Plugin Installation from File" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:635 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:636 msgid "Install plugin from file." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:637 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:638 msgid "Select xpi2p or su3 file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:646 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:647 msgid "Update All Plugins" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:151 +msgid "config router family" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:360 +msgid "I2P Router Family Configuration" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:476 +msgid "Routers in the same family share a family key." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:478 +msgid "" +"To join an existing family, import the private key you exported from a " +"router in the family." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:480 +msgid "To start a new family, enter a family name." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:496 +msgid "Join Existing Router Family" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:492 +msgid "" +"Import the secret family key that you exported from an existing router in " +"the family." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:494 +msgid "Select secret key file" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:504 +msgid "Create New Router Family" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:502 +msgid "Family Name" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:514 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:518 +msgid "Export Family Key" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:516 +msgid "" +"Export the secret family key to be imported into other routers you control." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:525 +#, java-format +msgid "Restart required to activate family {0}." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:527 +msgid "After restarting, you may export the family key." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configfamily_jsp.java:537 +#, java-format +msgid "No longer be a member of the family {0}." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:151 msgid "config home" msgstr "" -#: ../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:475 msgid "Default Home Page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:480 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:481 msgid "Use old home page" msgstr "" -#: ../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:489 msgid "Search Engines" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:414 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:509 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:415 msgid "Hidden Services of Interest" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:524 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:418 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:525 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:419 msgid "Applications and Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:151 msgid "config keyring" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:347 msgid "I2P Keyring Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:480 msgid "The router keyring is used to decrypt encrypted leaseSets." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:482 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:483 msgid "" "The keyring may contain keys for local or remote encrypted destinations." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:489 msgid "Manual Keyring Addition" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:491 msgid "Enter keys for encrypted remote destinations here." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:494 msgid "Keys for local destinations must be entered on the" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:496 msgid "I2PTunnel page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:498 msgid "Dest. name, hash, or full key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:500 msgid "Encryption Key" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:149 msgid "config logging" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:330 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:331 msgid "I2P Logging Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:437 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:438 msgid "Configure I2P Logging Options" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:439 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:440 msgid "Log file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:441 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:442 #, java-format msgid "Edit {0} to change" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:446 msgid "(the symbol '@' will be replaced during log rotation)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:447 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:448 msgid "Log record format" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:452 msgid "" "(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:453 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:454 msgid "Log date format" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:458 msgid "" "('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' " "= millisecond)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:459 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:460 msgid "Max log file size" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:464 msgid "Default log level" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:468 msgid "" "(DEBUG and INFO are not recommended defaults, as they will drastically slow " "down your router)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:469 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:470 msgid "Log level overrides" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:473 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:474 msgid "New override" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:151 msgid "config networking" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:360 msgid "I2P Network Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:478 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:479 msgid "IP and Transport Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:482 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:483 msgid "There is help below." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:484 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:485 msgid "UPnP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:489 msgid "Enable UPnP to open firewall ports" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:491 msgid "UPnP status" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:492 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:493 msgid "IP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:494 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:586 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:587 msgid "Externally reachable hostname or IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:498 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:499 msgid "Use all auto-detect methods" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:502 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:503 msgid "Disable UPnP IP address detection" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:506 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:507 msgid "Ignore local interface IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:510 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:511 msgid "Use SSU IP address detection only" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:514 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:515 msgid "Hidden mode - do not publish IP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:516 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:517 msgid "(prevents participating traffic)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:520 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:604 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:521 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:605 msgid "Specify hostname or IP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:524 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:525 msgid "Action when IP changes" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:528 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:529 msgid "" "Laptop mode - Change router identity and UDP port when IP changes for " "enhanced anonymity" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:531 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:561 msgid "Experimental" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:533 msgid "IPv4 Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:537 msgid "Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:539 msgid "IPv6 Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:542 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:543 msgid "Disable IPv6" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:547 msgid "Enable IPv6" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:551 msgid "Prefer IPv4 over IPv6" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:554 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:555 msgid "Prefer IPv6 over IPv4" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:558 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:559 msgid "Use IPv6 only (disable IPv4)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:562 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:563 msgid "UDP Configuration:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:564 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:565 msgid "UDP port:" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:570 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:614 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:571 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:615 msgid "Completely disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:572 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:573 msgid "(select only if behind a firewall that blocks outbound UDP)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:584 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:585 msgid "TCP Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:590 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:591 msgid "Use auto-detected IP address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:592 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:624 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:593 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:625 msgid "currently" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:596 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:597 msgid "if we are not firewalled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:600 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:601 msgid "Always use auto-detected IP address (Not firewalled)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:610 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:611 msgid "Disable inbound (Firewalled)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:616 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:617 msgid "" "(select only if behind a firewall that throttles or blocks outbound TCP)" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:618 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:619 msgid "Externally reachable TCP port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:622 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:623 msgid "Use the same port configured for UDP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:630 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:631 msgid "Specify Port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:634 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:635 msgid "Notes" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:637 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:638 msgid "" "a) Do not reveal your port numbers to anyone! b) Changing these settings " "will restart your router." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:643 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:644 msgid "Configuration Help" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:645 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:694 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:646 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:695 msgid "" "While I2P will work fine behind most firewalls, your speeds and network " "integration will generally improve if the I2P port is forwarded for both UDP " "and TCP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:647 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:648 msgid "" "If you can, please poke a hole in your firewall to allow unsolicited UDP and " "TCP packets to reach you." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:649 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:650 msgid "" "If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole " "punching with \"SSU introductions\" to relay traffic." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:651 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:652 msgid "" "Most of the options above are for special situations, for example where UPnP " "does not work correctly, or a firewall not under your control is doing harm." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:653 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:654 msgid "Certain firewalls such as symmetric NATs may not work well with I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:662 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:663 msgid "" "UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect " "the external IP address and forward ports." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:664 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:665 msgid "UPnP support is beta, and may not work for any number of reasons" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:666 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:667 msgid "No UPnP-compatible device present" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:668 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:669 msgid "UPnP disabled on the device" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:670 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:671 msgid "Software firewall interference with UPnP" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:672 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:673 msgid "Bugs in the device's UPnP implementation" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:674 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:675 msgid "Multiple firewall/routers in the internet connection path" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:676 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:677 msgid "UPnP device change, reset, or address change" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:678 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:679 msgid "Review the UPnP status here." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:680 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:681 msgid "" "UPnP may be enabled or disabled above, but a change requires a router " "restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:682 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:683 msgid "Hostnames entered above will be published in the network database." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:684 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:685 msgid "They are not private." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:686 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:687 msgid "" "Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:688 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:689 msgid "" "If you specify the wrong IP address or hostname, or do not properly " "configure your NAT or firewall, your network performance will degrade " "substantially." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:690 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:691 msgid "When in doubt, leave the settings at the defaults." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:692 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:693 msgid "Reachability Help" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:697 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:698 msgid "" "If you think you have opened up your firewall and I2P still thinks you are " "firewalled, remember that you may have multiple firewalls, for example both " "software packages and external hardware routers." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:700 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:701 msgid "" "If there is an error, the logs may also help " "diagnose the problem." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:704 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:705 msgid "Your UDP port does not appear to be firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:708 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:709 msgid "Your UDP port appears to be firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:710 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:711 msgid "" "As the firewall detection methods are not 100% reliable, this may " "occasionally be displayed in error." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:712 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:713 msgid "" "However, if it appears consistently, you should check whether both your " "external and internal firewalls are open for your port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:714 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:715 msgid "" "I2P will work fine when firewalled, there is no reason for concern. When " "firewalled, the router uses \"introducers\" to relay inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:716 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:717 msgid "" "However, you will get more participating traffic and help the network more " "if you can open your firewall(s)." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:718 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:719 msgid "" "If you think you have already done so, remember that you may have both a " "hardware and a software firewall, or be behind an additional, institutional " "firewall you cannot control." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:720 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:721 msgid "" "Also, some routers cannot correctly forward both TCP and UDP on a single " "port, or may have other limitations or bugs that prevent them from passing " "traffic through to I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:724 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:725 msgid "The router is currently testing whether your UDP port is firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:728 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:729 msgid "" "The router is not configured to publish its address, therefore it does not " "expect incoming connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:730 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:731 msgid "" "Hidden mode is automatically enabled for added protection in certain " "countries." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:732 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:733 msgid "WARN - Firewalled and Fast" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:734 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:735 msgid "" "You have configured I2P to share more than 128KBps of bandwidth, but you are " "firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:737 msgid "" "While I2P will work fine in this configuration, if you really have over " "128KBps of bandwidth to share, it will be much more helpful to the network " "if you open your firewall." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:739 msgid "WARN - Firewalled and Floodfill" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:740 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:741 msgid "" "You have configured I2P to be a floodfill router, but you are firewalled." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:742 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:743 msgid "" "For best participation as a floodfill router, you should open your firewall." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:745 msgid "WARN - Firewalled with Inbound TCP Enabled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:747 msgid "" "You have configured inbound TCP, however your UDP port is firewalled, and " "therefore it is likely that your TCP port is firewalled as well." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:748 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:749 msgid "" "If your TCP port is firewalled with inbound TCP enabled, routers will not be " "able to contact you via TCP, which will hurt the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:750 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:751 msgid "Please open your firewall or disable inbound TCP above." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:752 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:753 msgid "WARN - Firewalled with UDP Disabled" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:754 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:755 msgid "You have configured inbound TCP, however you have disabled UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:756 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:757 msgid "" "You appear to be firewalled on TCP, therefore your router cannot accept " "inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:758 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:759 msgid "Please open your firewall or enable UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:761 msgid "ERR - Clock Skew" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:763 msgid "" "Your system's clock is skewed, which will make it difficult to participate " "in the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:765 msgid "Correct your clock setting if this error persists." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:766 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:767 msgid "ERR - Private TCP Address" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:768 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:769 msgid "" "You must never advertise an unroutable IP address such as 127.0.0.1 or " "192.168.1.1 as your external address." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:770 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:771 msgid "Correct the address or disable inbound TCP above." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:772 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:773 msgid "ERR - SymmetricNAT" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:774 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:775 msgid "I2P detected that you are firewalled by a Symmetric NAT." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:776 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:777 msgid "" "I2P does not work well behind this type of firewall. You will probably not " "be able to accept inbound connections, which will limit your participation " "in the network." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:778 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:779 msgid "" "ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config " "and restart" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:780 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:781 msgid "" "I2P was unable to bind to the configured port noted on the advanced network " "configuration page ." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:782 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:783 msgid "" "Check to see if another program is using the configured port. If so, stop " "that program or configure I2P to use a different port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:784 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:785 msgid "" "This may be a transient error, if the other program is no longer using the " "port." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:786 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:787 msgid "However, a restart is always required after this error." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:788 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:789 msgid "ERR - UDP Disabled and Inbound TCP host/port not set" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:790 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:791 msgid "" "You have not configured inbound TCP with a hostname and port above, however " "you have disabled UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:792 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:793 msgid "Therefore your router cannot accept inbound connections." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:794 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:795 msgid "Please configure a TCP host and port above or enable UDP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:796 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:797 msgid "ERR - Client Manager I2CP Error - check logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:798 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:799 msgid "This is usually due to a port 7654 conflict. Check the logs to verify." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:800 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:801 msgid "" "Do you have another I2P instance running? Stop the conflicting program and " "restart I2P." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:151 msgid "config peers" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:347 msgid "I2P Peer Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:487 msgid "Manual Peer Controls" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:489 msgid "Router Hash" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:492 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:493 msgid "Manually Ban / Unban a Peer" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:494 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:495 msgid "" "Banning will prevent the participation of this peer in tunnels you create." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:504 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:505 msgid "Adjust Profile Bonuses" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:506 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:507 msgid "" "Bonuses may be positive or negative, and affect the peer's inclusion in Fast " "and High Capacity tiers. Fast peers are used for client tunnels, and High " @@ -5910,811 +6071,791 @@ msgid "" "displayed on the" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:508 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:509 msgid "profiles page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:526 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:527 msgid "Banned Peers" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:547 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:548 msgid "Banned IPs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:151 msgid "config reseeding" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:360 msgid "I2P Reseeding Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:476 msgid "" "Reseeding is the bootstrapping process used to find other routers when you " "first install I2P, or when your router has too few router references " "remaining." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:478 msgid "" "If reseeding has failed, you should first check your network connection." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:480 #, java-format msgid "See {0} for instructions on reseeding manually." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:480 msgid "the FAQ" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:484 msgid "Manual Reseed from URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:486 msgid "Enter zip or su3 URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:487 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:500 msgid "" "The su3 format is preferred, as it will be verified as signed by a trusted " "source." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:489 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:501 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:502 msgid "" "The zip format is unsigned; use a zip file only from a source that you trust." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:496 msgid "Manual Reseed from File" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:498 msgid "Select zip or su3 file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:505 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:506 msgid "Create Reseed File" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:508 msgid "" "Create a new reseed zip file you may share for others to reseed manually." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:509 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:510 msgid "This file will never contain your own router's identity or IP." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:512 msgid "Create reseed file" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:516 msgid "Reseeding Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:520 msgid "" "Change these only if HTTPS is blocked by a restrictive firewall and reseed " "has failed." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:521 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:522 msgid "Reseed URL Selection" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:525 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:526 msgid "Try SSL first then non-SSL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:529 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:530 msgid "Use SSL only" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:533 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:534 msgid "Use non-SSL only" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:536 msgid "Reseed URLs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:541 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:542 msgid "Enable HTTP Proxy?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:545 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:546 msgid "HTTP Proxy Host" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:549 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:550 msgid "HTTP Proxy Port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:553 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:554 msgid "Use HTTP Proxy Authorization?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:557 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:558 msgid "HTTP Proxy Username" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:561 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:562 msgid "HTTP Proxy Password" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:565 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:566 msgid "Enable HTTPS Proxy?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:569 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:570 msgid "HTTPS Proxy Host" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:573 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:574 msgid "HTTPS Proxy Port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:577 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:578 msgid "Use HTTPS Proxy Authorization?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:581 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:582 msgid "HTTPS Proxy Username" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:585 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:586 msgid "HTTPS Proxy Password" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:151 msgid "config service" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:347 msgid "I2P Service Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:466 msgid "Shutdown the router" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:468 msgid "" "Graceful shutdown lets the router satisfy the agreements it has already made " "before shutting down, but may take a few minutes." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:469 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:470 msgid "" "If you need to kill the router immediately, that option is available as well." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:484 msgid "" "If you want the router to restart itself after shutting down, you can choose " "one of the following." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:486 msgid "" "This is useful in some situations - for example, if you changed some " "settings that client applications only read at startup, such as the " "routerconsole password or the interface it listens on." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:488 msgid "" "A graceful restart will take a few minutes (but your peers will appreciate " "your patience), while a hard restart does so immediately." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:489 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:490 msgid "" "After tearing down the router, it will wait 1 minute before starting back up " "again." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:499 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:500 msgid "Systray integration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:501 -msgid "" -"On the windows platform, there is a small application to sit in the system " -"tray, allowing you to view the router's status" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:502 +msgid "Control the system tray icon" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:503 -msgid "" -"(later on, I2P client applications will be able to integrate their own " -"functionality into the system tray as well)." -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:505 -msgid "If you are on windows, you can either enable or disable that icon here." -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:507 -msgid "Show systray icon" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:509 -msgid "Hide systray icon" -msgstr "" - -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:511 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:518 msgid "Run on startup" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:513 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:520 msgid "" "You can control whether I2P is run on startup or not by selecting one of the " "following options - I2P will install (or remove) a service accordingly." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:515 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:522 msgid "If you prefer the command line, you can also run the " msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:523 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:530 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:498 msgid "Note" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:525 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:532 msgid "" "If you are running I2P as service right now, removing it will shut down your " "router immediately." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:527 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:534 msgid "" "You may want to consider shutting down gracefully, as above, then running " "uninstall_i2p_service_winnt.bat." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:531 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:538 msgid "Debugging" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:533 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:540 msgid "View the job queue" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:537 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:544 msgid "" "At times, it may be helpful to debug I2P by getting a thread dump. To do so, " "please select the following option and review the thread dumped to wrapper.log." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:549 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:556 msgid "Launch browser on router startup?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:551 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:558 msgid "" "I2P's main configuration interface is this web console, so for your " "convenience I2P can launch a web browser on startup pointing at" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:151 msgid "config summary bar" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:347 msgid "I2P Summary Bar Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:478 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:479 msgid "Refresh Interval" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:484 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:485 msgid "seconds" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:488 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:489 msgid "Customize Summary Bar" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:149 msgid "config stats" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:321 msgid "I2P Stats Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:437 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:438 msgid "Configure I2P Stat Collection" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:439 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:440 msgid "Enable full stats?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:446 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:447 msgid "change requires restart to take effect" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:455 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:456 msgid "Stat file" msgstr "" #. shouldShowLog -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:464 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:465 msgid "Filter" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:466 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:478 msgid "toggle all" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:485 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:486 msgid "Log" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:493 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:494 msgid "Graph" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:548 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configstats_jsp.java:549 msgid "Advanced filter" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:150 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:151 msgid "config tunnels" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:359 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:360 msgid "I2P Tunnel Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:478 msgid "The default settings work for most people." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:482 msgid "There is a fundamental tradeoff between anonymity and performance." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:484 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:485 msgid "" "Tunnels longer than 3 hops (for example 2 hops + 0-2 hops, 3 hops + 0-1 " "hops, 3 hops + 0-2 hops), or a high quantity + backup quantity, may severely " "reduce performance or reliability." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:488 msgid "High CPU and/or high outbound bandwidth usage may result." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:490 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:491 msgid "Change these settings with care, and adjust them if you have problems." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:500 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:501 msgid "" "Exploratory tunnel setting changes are stored in the router.config file." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:503 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:504 msgid "Client tunnel changes are temporary and are not saved." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:505 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:506 msgid "To make permanent client tunnel changes see the" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:507 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:508 msgid "i2ptunnel page" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:149 msgid "config UI" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:330 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:331 msgid "I2P UI Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:435 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:436 msgid "Router Console Theme" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:447 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:448 msgid "Theme selection disabled for Internet Explorer, sorry." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:449 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:450 msgid "" "If you're not using IE, it's likely that your browser is pretending to be " "IE; please configure your browser (or proxy) to use a different User Agent " "string if you'd like to access the console themes." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:453 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:454 msgid "Router Console Language" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:459 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:460 msgid "" "Please contribute to the router console translation project! Contact the " "developers in #i2p-dev on IRC to help." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:463 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:464 msgid "Apply" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:465 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:466 msgid "Router Console Password" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:149 msgid "config update" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:320 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:321 msgid "I2P Update Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:443 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:444 msgid "Check for I2P and news updates" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:446 msgid "News & I2P Updates" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:449 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:450 msgid "Check for news updates" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:452 msgid "News Updates" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:459 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:460 msgid "Update In Progress" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:467 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:468 msgid "News URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:475 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:476 msgid "Refresh frequency" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:482 msgid "Update policy" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:487 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:488 msgid "Fetch news through the eepProxy?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:491 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:492 msgid "Update through the eepProxy?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:497 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:498 msgid "eepProxy host" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:501 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:502 msgid "eepProxy port" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:509 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:510 msgid "Update URLs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:513 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:514 msgid "Trusted keys" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:517 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:518 msgid "Update with signed development builds?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:521 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:522 msgid "Signed Build URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:525 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:526 msgid "Update with unsigned development builds?" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:529 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:530 msgid "Unsigned Build URL" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:536 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:537 msgid "Updates will be dispatched via your package manager." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:147 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:147 msgid "home" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:410 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:386 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:411 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:387 msgid "Welcome to I2P" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:337 msgid "I2P Addressbook" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:339 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:340 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:339 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:339 msgid "Open in new tab" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:342 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:342 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:343 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:343 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:343 msgid "Your browser does not support iFrames." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:344 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:345 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:345 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:345 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:345 msgid "Click here to continue." 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:160 msgid "Internal Error" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:165 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:166 msgid "Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:173 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:174 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:177 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:350 +#: ../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:351 #, java-format msgid "Please report bugs on {0} or {1}." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:181 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:354 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:182 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:355 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:183 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:184 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:357 msgid "Please include this information in bug reports" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:185 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:186 msgid "Error Details" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:187 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:188 #, java-format msgid "Error {0}" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:207 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:346 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:208 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:347 msgid "I2P Version and Running Environment" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:258 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:407 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:259 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:433 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:161 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:162 msgid "Page Not Found" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:337 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:338 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:339 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:340 msgid "Error 404" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:345 msgid "not found" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:147 msgid "events" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:335 msgid "I2P Event Log" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:149 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:147 msgid "graphs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:367 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:339 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:380 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:340 msgid "I2P Performance Graphs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:328 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:329 msgid "" "Click a flag to select a language. Click 'configure language' below to " "change it later." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:394 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:395 msgid "Search I2P" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jars_jsp.java:149 msgid "Jar File Dump" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:147 msgid "job queue" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/jobs_jsp.java:319 msgid "I2P Router Job Queue" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:149 msgid "logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:345 msgid "I2P Router Logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:435 msgid "Critical Logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:439 msgid "Router Logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:445 msgid "Event Logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:447 msgid "View event logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:449 msgid "Service (Wrapper) Logs" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:147 msgid "network database" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/netdb_jsp.java:319 msgid "I2P Network Database" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:149 msgid "News" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:344 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/news_jsp.java:345 msgid "Latest News" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:152 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:153 msgid "WebApp Not Found" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:349 msgid "Web Application Not Running" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:351 msgid "The requested web application is not running." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:353 #, java-format msgid "Please visit the {0}config clients page{1} to start it." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:147 msgid "peer connections" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:319 msgid "I2P Network Peers" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:147 msgid "peer profiles" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/profiles_jsp.java:319 msgid "I2P Network Peer Profiles" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:148 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/proof_jsp.java:149 msgid "Proof" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:147 msgid "statistics" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:331 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/stats_jsp.java:332 msgid "I2P Router Statistics" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:312 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/summaryframe_jsp.java:313 #, java-format msgid "Disable {0} Refresh" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:165 msgid "torrents" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:337 msgid "I2P Torrent Downloader" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:147 msgid "tunnel summary" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:319 msgid "I2P Tunnel Summary" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:146 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:318 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:147 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:319 msgid "Peer Profile" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:342 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:343 #, java-format msgid "Profile for peer {0}" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:165 msgid "webmail" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:337 msgid "I2P Webmail" msgstr "" diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java index aaab086f0..0fecaa3cf 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java @@ -10,6 +10,7 @@ import java.nio.channels.ServerSocketChannel; import net.i2p.I2PException; import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketAddress; /** * Bridge to I2PServerSocket. @@ -99,11 +100,14 @@ class StandardServerSocket extends ServerSocket { } /** - * @return null always + * Port in returned SocketAddress will be zero. + * + * @return an I2PSocketAddress as of 0.9.26; prior to that, returned null + * @since implemented in 0.9.26 */ @Override public SocketAddress getLocalSocketAddress() { - return null; + return new I2PSocketAddress(_socket.getManager().getSession().getMyDestination(), 0); } @Override diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java index 151c1f395..0a1fb093e 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java @@ -10,6 +10,7 @@ import java.net.SocketException; import java.nio.channels.SocketChannel; import net.i2p.client.streaming.I2PSocket; +import net.i2p.client.streaming.I2PSocketAddress; import net.i2p.client.streaming.I2PSocketOptions; /** @@ -117,11 +118,12 @@ class StandardSocket extends Socket { } /** - * @return null always + * @return an I2PSocketAddress as of 0.9.26; prior to that, returned null + * @since implemented in 0.9.26 */ @Override public SocketAddress getLocalSocketAddress() { - return null; + return new I2PSocketAddress(_socket.getThisDestination(), _socket.getLocalPort()); } /** @@ -157,11 +159,12 @@ class StandardSocket extends Socket { } /** - * @throws UnsupportedOperationException always + * @return an I2PSocketAddress as of 0.9.26; prior to that, threw UnsupportedOperationException + * @since implemented in 0.9.26 */ @Override public SocketAddress getRemoteSocketAddress() { - throw new UnsupportedOperationException(); + return new I2PSocketAddress(_socket.getPeerDestination(), _socket.getPort()); } /** diff --git a/apps/susidns/locale/messages_en.po b/apps/susidns/locale/messages_en.po index 06c5cfc24..0f7f80dff 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: 2015-11-05 17:12+0000\n" +"POT-Creation-Date: 2016-05-25 12:28+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -48,35 +48,35 @@ msgid "" "unavailable in this JVM" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:219 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:223 msgid "None" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:227 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:231 msgid "Hashcash" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:229 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Hidden" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:231 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:235 msgid "Signed" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:233 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:237 msgid "Key" msgstr "" -#: ../src/java/src/i2p/susi/dns/AddressBean.java:235 -#: ../src/java/src/i2p/susi/dns/AddressBean.java:260 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:239 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:264 #, java-format msgid "Type {0}" msgstr "" -#: ../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 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:251 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:258 +#: ../src/java/src/i2p/susi/dns/AddressBean.java:261 msgid "DSA 1024 bit" msgstr "" @@ -114,27 +114,27 @@ msgid "Showing {0} of {1}" msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:232 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:432 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:234 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:453 msgid "Add" msgstr "" #: ../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:232 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:244 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:430 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:234 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:246 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:451 msgid "Replace" msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:254 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:243 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:245 #, java-format msgid "Host name {0} is already in address book, unchanged." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:245 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:247 #, java-format msgid "" "Host name {0} is already in address book with a different destination. Click " @@ -142,63 +142,63 @@ msgid "" msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:258 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:260 #, java-format msgid "Destination added for {0}." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:271 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:260 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:262 #, java-format msgid "Destination changed for {0}." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:262 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:264 msgid "Warning - host name does not end with \".i2p\"" msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:270 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:272 msgid "Invalid Base 64 destination." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:276 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278 #, java-format msgid "Invalid host name \"{0}\"." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:279 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:281 msgid "Please enter a host name and destination" msgstr "" #. clear search when deleting #: ../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:283 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:308 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:270 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:285 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:310 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:285 msgid "Delete Entry" msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:283 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:354 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:285 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:369 msgid "Delete Selected" msgstr "" #. parameter is a host name #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:300 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:302 #, java-format msgid "Destination {0} deleted." msgstr "" #. parameter will always be >= 2 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:308 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:303 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:305 #, java-format msgid "1 destination deleted." msgid_plural "{0} destinations deleted." @@ -206,12 +206,12 @@ msgstr[0] "" msgstr[1] "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:305 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307 msgid "No entries selected to delete." msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318 -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:312 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:314 msgid "Address book saved." msgstr "" @@ -221,7 +221,7 @@ msgstr "" #: ../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:316 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or \"reload" @@ -230,7 +230,7 @@ msgstr "" #: ../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:318 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:320 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " @@ -239,8 +239,8 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:161 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:152 msgid "Save" msgstr "" @@ -250,8 +250,8 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 #: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:159 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:150 msgid "Reload" msgstr "" @@ -259,21 +259,21 @@ msgstr "" msgid "Configuration reloaded." msgstr "" -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:104 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:106 #, java-format msgid "{0} address book in {1} database" msgstr "" -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:253 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:255 msgid "Manually added via SusiDNS" msgstr "" -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:267 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:269 #, java-format msgid "Failed to add Destination for {0} to naming service {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:291 +#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:293 #, java-format msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "" @@ -291,428 +291,440 @@ msgstr "" msgid "Subscriptions reloaded." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135 msgid "address book" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:133 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:132 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:148 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:118 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:134 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:135 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:123 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:139 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:157 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:125 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:136 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:124 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:140 msgid "Overview" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135 -#: ../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:121 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:125 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:135 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:122 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:126 msgid "Address books" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:137 -#: ../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:123 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:127 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:129 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:124 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:128 msgid "private" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:139 -#: ../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:125 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:129 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:139 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:131 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:126 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:130 msgid "master" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141 -#: ../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:127 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:131 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:128 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:132 msgid "router" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143 -#: ../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:129 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:133 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:143 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:135 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:130 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:134 msgid "published" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145 -#: ../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:131 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:135 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:153 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:145 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:132 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:136 msgid "Subscriptions" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147 -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:146 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:132 -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:133 -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:155 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:147 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:139 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:134 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:138 msgid "Configuration" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:136 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:159 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:143 msgid "Address book" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:156 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:164 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:148 msgid "Storage" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:174 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:184 msgid "Filter" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:177 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:187 msgid "other" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:179 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:189 msgid "all" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:193 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:201 msgid "Current filter" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:198 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:206 msgid "clear filter" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:211 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:215 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:219 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:223 msgid "Search" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:249 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:262 msgid "Name" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:251 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:264 msgid "Links" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:253 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:424 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:262 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:266 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:445 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:277 msgid "Destination" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:289 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:302 msgid "Mark for deletion" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:308 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:321 msgid "Base 32 address" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:312 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:325 msgid "More information on this entry" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:315 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:328 msgid "details" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:352 -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:428 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:367 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:449 msgid "Cancel" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:379 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "Export in hosts.txt format" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:403 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:424 msgid "This address book is empty." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:418 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:439 msgid "Add new destination" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:420 -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:168 +#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:441 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:177 msgid "Host Name" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:126 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:127 msgid "configuration" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:163 msgid "Hints" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:165 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:166 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:167 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:168 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:169 msgid "" "The router addressbook and the published addressbook are updated by the " "addressbook application." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:170 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:171 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:172 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:173 msgid "" "Use the private addressbook for private destinations, these are not " "published." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:174 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:175 msgid "Options" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:176 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:177 msgid "File containing the list of subscriptions URLs (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:178 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:179 msgid "Update interval in hours" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:180 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:181 msgid "" "Your public hosts.txt file (choose a path within your webserver document " "root)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:182 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:183 msgid "Your hosts.txt (don't change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:184 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:185 msgid "Your personal addressbook, these hosts will be published" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:186 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:187 msgid "Your private addressbook, it is never published" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:188 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:189 msgid "Port for your eepProxy (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191 msgid "Hostname for your eepProxy (no need to change)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:192 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:193 msgid "Whether to update the published addressbook" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:194 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:195 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:196 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:197 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:198 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:199 msgid "File to log activity to (change to /dev/null if you like)" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200 +#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:201 msgid "Name of the theme to use (defaults to 'light')" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:119 msgid "addressbook" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:182 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:191 msgid "Encoded Name" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:196 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:205 msgid "Base 32 Address" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:204 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213 msgid "Base 64 Hash" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:210 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:219 msgid "Address Helper" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:216 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:225 msgid "link" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:220 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229 msgid "Public Key" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:222 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:231 msgid "ElGamal 2048 bit" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:226 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:235 msgid "Signing Key" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:232 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:241 msgid "Certificate" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:238 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:247 msgid "Added Date" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:244 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:253 +msgid "Validated" +msgstr "" + +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:255 +msgid "no" +msgstr "" + +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:255 +msgid "yes" +msgstr "" + +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:259 msgid "Source" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:250 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:265 msgid "Last Modified" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:256 +#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:271 msgid "Notes" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:116 msgid "Introduction" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138 msgid "What is the addressbook?" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:139 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140 msgid "The addressbook application is part of your I2P installation." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:141 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142 msgid "" "It regularly updates your hosts.txt file from distributed sources or " "\"subscriptions\"." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:143 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:144 #, java-format msgid "" "In the default configuration, the address book is only subscribed to {0}." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:146 msgid "" "Subscribing to additional sites is easy, just add them to your subscriptions file." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:147 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:148 msgid "" "For more information on naming in I2P, see the overview." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:150 msgid "How does the addressbook application work?" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:151 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:152 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:153 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:154 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:155 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:156 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:157 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:158 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:159 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:160 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:161 +#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:162 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:117 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:118 msgid "subscriptions" msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:154 msgid "The subscription file contains a list of i2p URLs." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:155 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:156 msgid "" "The addressbook application regularly checks this list for new eepsites." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:157 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:158 msgid "Those URLs refer to published hosts.txt files." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:159 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:160 #, java-format msgid "" "The default subscription is the hosts.txt from {0}, which is updated " "infrequently." msgstr "" -#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:162 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:163 +#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:164 msgid "See the FAQ for a list of subscription URLs." msgstr "" diff --git a/apps/susimail/locale/messages_en.po b/apps/susimail/locale/messages_en.po index 052b9c554..46b5f7c11 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: 2015-03-29 14:30+0000\n" +"POT-Creation-Date: 2016-05-25 12:29+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -109,6 +109,7 @@ msgid "User logged out." msgstr "" #: src/src/i2p/susi/webmail/WebMail.java:837 +#: src/src/i2p/susi/webmail/WebMail.java:1143 msgid "Internal error, lost connection." msgstr "" @@ -126,7 +127,7 @@ msgid "end forwarded mail" msgstr "" #: src/src/i2p/susi/webmail/WebMail.java:1070 -#: src/src/i2p/susi/webmail/WebMail.java:2369 +#: src/src/i2p/susi/webmail/WebMail.java:2376 msgid "Could not fetch mail body." msgstr "" @@ -138,209 +139,209 @@ msgstr "" msgid "Configuration reloaded" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1199 +#: src/src/i2p/susi/webmail/WebMail.java:1205 #, java-format msgid "No Encoding found for {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1203 +#: src/src/i2p/susi/webmail/WebMail.java:1209 #, java-format msgid "Could not encode data: {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1208 +#: src/src/i2p/susi/webmail/WebMail.java:1214 #, java-format msgid "Error reading uploaded file: {0}" msgstr "" #. error if we get here -#: src/src/i2p/susi/webmail/WebMail.java:1293 -#: src/src/i2p/susi/webmail/WebMail.java:1296 +#: src/src/i2p/susi/webmail/WebMail.java:1299 +#: src/src/i2p/susi/webmail/WebMail.java:1302 msgid "Attachment not found." msgstr "" #. error if we get here -#: src/src/i2p/susi/webmail/WebMail.java:1323 -#: src/src/i2p/susi/webmail/WebMail.java:1325 +#: src/src/i2p/susi/webmail/WebMail.java:1329 +#: src/src/i2p/susi/webmail/WebMail.java:1331 msgid "Message not found." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1370 -#: src/src/i2p/susi/webmail/WebMail.java:1498 +#: src/src/i2p/susi/webmail/WebMail.java:1376 +#: src/src/i2p/susi/webmail/WebMail.java:1504 msgid "Invalid pagesize number, resetting to default value." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1394 +#: src/src/i2p/susi/webmail/WebMail.java:1400 msgid "No messages marked for deletion." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1410 +#: src/src/i2p/susi/webmail/WebMail.java:1416 #, java-format msgid "1 message deleted." msgid_plural "{0} messages deleted." msgstr[0] "" msgstr[1] "" -#: src/src/i2p/susi/webmail/WebMail.java:1477 +#: src/src/i2p/susi/webmail/WebMail.java:1483 msgid "Configuration saved" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1697 -#: src/src/i2p/susi/webmail/WebMail.java:2159 +#: src/src/i2p/susi/webmail/WebMail.java:1704 +#: src/src/i2p/susi/webmail/WebMail.java:2166 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:1702 +#: src/src/i2p/susi/webmail/WebMail.java:1709 #, java-format msgid "1 Message" msgid_plural "{0} Messages" msgstr[0] "" msgstr[1] "" -#: src/src/i2p/susi/webmail/WebMail.java:1708 +#: src/src/i2p/susi/webmail/WebMail.java:1715 msgid "Show Message" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1710 +#: src/src/i2p/susi/webmail/WebMail.java:1717 msgid "New Message" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1712 +#: src/src/i2p/susi/webmail/WebMail.java:1719 msgid "Configuration" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1723 +#: src/src/i2p/susi/webmail/WebMail.java:1730 msgid "SusiMail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1736 +#: src/src/i2p/susi/webmail/WebMail.java:1743 msgid "Message has not been sent. Do you want to discard it?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1798 +#: src/src/i2p/susi/webmail/WebMail.java:1805 #, java-format msgid "Error decoding content: {0}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1907 +#: src/src/i2p/susi/webmail/WebMail.java:1914 msgid "no subject" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1924 +#: src/src/i2p/susi/webmail/WebMail.java:1931 msgid "Found no valid sender address." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1930 +#: src/src/i2p/susi/webmail/WebMail.java:1937 #, java-format msgid "Found no valid address in \\''{0}\\''." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:1951 +#: src/src/i2p/susi/webmail/WebMail.java:1958 msgid "No recipients found." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2015 +#: src/src/i2p/susi/webmail/WebMail.java:2022 msgid "Mail sent." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2059 +#: src/src/i2p/susi/webmail/WebMail.java:2066 msgid "Send" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2060 -#: src/src/i2p/susi/webmail/WebMail.java:2275 -#: src/src/i2p/susi/webmail/WebMail.java:2409 +#: src/src/i2p/susi/webmail/WebMail.java:2067 +#: src/src/i2p/susi/webmail/WebMail.java:2282 +#: src/src/i2p/susi/webmail/WebMail.java:2416 msgid "Cancel" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2103 -#: src/src/i2p/susi/webmail/WebMail.java:2202 -#: src/src/i2p/susi/webmail/WebMail.java:2357 +#: src/src/i2p/susi/webmail/WebMail.java:2110 +#: src/src/i2p/susi/webmail/WebMail.java:2209 +#: src/src/i2p/susi/webmail/WebMail.java:2364 msgid "From" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2104 +#: src/src/i2p/susi/webmail/WebMail.java:2111 msgid "To" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2105 +#: src/src/i2p/susi/webmail/WebMail.java:2112 msgid "Cc" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2106 +#: src/src/i2p/susi/webmail/WebMail.java:2113 msgid "Bcc" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2107 +#: src/src/i2p/susi/webmail/WebMail.java:2114 msgid "Bcc to self" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2108 -#: src/src/i2p/susi/webmail/WebMail.java:2203 -#: src/src/i2p/susi/webmail/WebMail.java:2359 +#: src/src/i2p/susi/webmail/WebMail.java:2115 +#: src/src/i2p/susi/webmail/WebMail.java:2210 +#: src/src/i2p/susi/webmail/WebMail.java:2366 msgid "Subject" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2111 +#: src/src/i2p/susi/webmail/WebMail.java:2118 msgid "Add Attachment" msgstr "" #. TODO disable/hide in JS if no file selected -#: src/src/i2p/susi/webmail/WebMail.java:2113 +#: src/src/i2p/susi/webmail/WebMail.java:2120 msgid "Add another attachment" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2119 +#: src/src/i2p/susi/webmail/WebMail.java:2126 msgid "Attachments" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2128 +#: src/src/i2p/susi/webmail/WebMail.java:2135 msgid "Delete selected attachments" msgstr "" #. current postman hq length limits 16/12, new postman version 32/32 -#: src/src/i2p/susi/webmail/WebMail.java:2147 +#: src/src/i2p/susi/webmail/WebMail.java:2154 msgid "User" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2148 +#: src/src/i2p/susi/webmail/WebMail.java:2155 msgid "Password" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2153 +#: src/src/i2p/susi/webmail/WebMail.java:2160 msgid "Host" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2154 +#: src/src/i2p/susi/webmail/WebMail.java:2161 msgid "POP3 Port" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2155 +#: src/src/i2p/susi/webmail/WebMail.java:2162 msgid "SMTP Port" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2160 +#: src/src/i2p/susi/webmail/WebMail.java:2167 msgid "Read Mail Offline" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2164 -#: src/src/i2p/susi/webmail/WebMail.java:2293 +#: src/src/i2p/susi/webmail/WebMail.java:2171 +#: src/src/i2p/susi/webmail/WebMail.java:2300 msgid "Settings" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2167 +#: src/src/i2p/susi/webmail/WebMail.java:2174 msgid "Learn about I2P mail" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2168 +#: src/src/i2p/susi/webmail/WebMail.java:2175 msgid "Create Account" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2181 -#: src/src/i2p/susi/webmail/WebMail.java:2337 +#: src/src/i2p/susi/webmail/WebMail.java:2188 +#: src/src/i2p/susi/webmail/WebMail.java:2344 msgid "New" msgstr "" @@ -350,139 +351,139 @@ msgstr "" #. button( REPLYALL, _t("Reply All") ) + #. button( FORWARD, _t("Forward") ) + spacer + #. button( DELETE, _t("Delete") ) + spacer + -#: src/src/i2p/susi/webmail/WebMail.java:2188 +#: src/src/i2p/susi/webmail/WebMail.java:2195 msgid "Check Mail" msgstr "" #. if (Config.hasConfigFile()) #. out.println(button( RELOAD, _t("Reload Config") ) + spacer); -#: src/src/i2p/susi/webmail/WebMail.java:2191 +#: src/src/i2p/susi/webmail/WebMail.java:2198 msgid "Logout" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2204 -#: src/src/i2p/susi/webmail/WebMail.java:2361 +#: src/src/i2p/susi/webmail/WebMail.java:2211 +#: src/src/i2p/susi/webmail/WebMail.java:2368 msgid "Date" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2207 +#: src/src/i2p/susi/webmail/WebMail.java:2214 msgid "Size" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2248 +#: src/src/i2p/susi/webmail/WebMail.java:2255 msgid "Message is new" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2251 +#: src/src/i2p/susi/webmail/WebMail.java:2258 msgid "Message has an attachment" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2253 +#: src/src/i2p/susi/webmail/WebMail.java:2260 msgid "Message is spam" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2261 +#: src/src/i2p/susi/webmail/WebMail.java:2268 msgid "No messages" msgstr "" #. TODO ngettext -#: src/src/i2p/susi/webmail/WebMail.java:2273 +#: src/src/i2p/susi/webmail/WebMail.java:2280 msgid "Really delete the marked messages?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2274 +#: src/src/i2p/susi/webmail/WebMail.java:2281 msgid "Yes, really delete them!" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2277 +#: src/src/i2p/susi/webmail/WebMail.java:2284 msgid "Delete Selected" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2279 +#: src/src/i2p/susi/webmail/WebMail.java:2286 msgid "Mark All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2281 +#: src/src/i2p/susi/webmail/WebMail.java:2288 msgid "Clear All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2306 -#: src/src/i2p/susi/webmail/WebMail.java:2307 +#: src/src/i2p/susi/webmail/WebMail.java:2313 +#: src/src/i2p/susi/webmail/WebMail.java:2314 msgid "First" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2306 -#: src/src/i2p/susi/webmail/WebMail.java:2307 -#: src/src/i2p/susi/webmail/WebMail.java:2347 +#: src/src/i2p/susi/webmail/WebMail.java:2313 +#: src/src/i2p/susi/webmail/WebMail.java:2314 +#: src/src/i2p/susi/webmail/WebMail.java:2354 msgid "Previous" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2309 +#: src/src/i2p/susi/webmail/WebMail.java:2316 #, java-format msgid "Page {0} of {1}" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2312 -#: src/src/i2p/susi/webmail/WebMail.java:2313 +#: src/src/i2p/susi/webmail/WebMail.java:2319 +#: src/src/i2p/susi/webmail/WebMail.java:2320 msgid "Last" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2312 -#: src/src/i2p/susi/webmail/WebMail.java:2313 -#: src/src/i2p/susi/webmail/WebMail.java:2349 +#: src/src/i2p/susi/webmail/WebMail.java:2319 +#: src/src/i2p/susi/webmail/WebMail.java:2320 +#: src/src/i2p/susi/webmail/WebMail.java:2356 msgid "Next" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2325 +#: src/src/i2p/susi/webmail/WebMail.java:2332 msgid "Really delete this message?" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2325 +#: src/src/i2p/susi/webmail/WebMail.java:2332 msgid "Yes, really delete it!" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2338 +#: src/src/i2p/susi/webmail/WebMail.java:2345 msgid "Reply" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2339 +#: src/src/i2p/susi/webmail/WebMail.java:2346 msgid "Reply All" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2340 +#: src/src/i2p/susi/webmail/WebMail.java:2347 msgid "Forward" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2341 +#: src/src/i2p/susi/webmail/WebMail.java:2348 msgid "Save As" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2343 -#: src/src/i2p/susi/webmail/WebMail.java:2345 +#: src/src/i2p/susi/webmail/WebMail.java:2350 +#: src/src/i2p/susi/webmail/WebMail.java:2352 msgid "Delete" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2348 +#: src/src/i2p/susi/webmail/WebMail.java:2355 msgid "Back to Folder" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2373 +#: src/src/i2p/susi/webmail/WebMail.java:2380 msgid "Could not fetch mail." msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2391 +#: src/src/i2p/susi/webmail/WebMail.java:2398 msgid "Folder Page Size" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2394 +#: src/src/i2p/susi/webmail/WebMail.java:2401 msgid "Set" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2397 +#: src/src/i2p/susi/webmail/WebMail.java:2404 msgid "Advanced Configuration" msgstr "" -#: src/src/i2p/susi/webmail/WebMail.java:2408 +#: src/src/i2p/susi/webmail/WebMail.java:2415 msgid "Save Configuration" msgstr "" diff --git a/build.xml b/build.xml index 6411b2523..3e14c6510 100644 --- a/build.xml +++ b/build.xml @@ -2094,6 +2094,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh index 73cc5db83..6926bdee4 100755 --- a/core/c/jbigi/build_jbigi.sh +++ b/core/c/jbigi/build_jbigi.sh @@ -26,7 +26,7 @@ if [ -z $BITS ]; then exit fi - printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2 + printf "BITS variable not set, $BITS bit system detected\n" >&2 fi # If JAVA_HOME isn't set we'll try to figure it out diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh index 98fb67ab6..8c8a9af09 100755 --- a/core/c/jcpuid/build.sh +++ b/core/c/jcpuid/build.sh @@ -45,13 +45,13 @@ if [ -z $BITS ]; then exit fi - printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2 + printf "BITS variable not set, $BITS bit system detected\n" >&2 fi if [ -z $CC ]; then export CC="gcc" - printf "\aCC variable not set, defaulting to $CC\n\a" >&2 + printf "CC variable not set, defaulting to $CC\n" >&2 fi @@ -64,7 +64,7 @@ elif [ $BITS -eq 64 ]; then export CFLAGS="-m64 -mtune=generic" export LDFLAGS="-m64" else - printf "\aBITS value \"$BITS\" not valid, please select 32 or 64\n\a" >&2 + printf "BITS value \"$BITS\" not valid, please select 32 or 64\n" >&2 exit 1 fi diff --git a/core/java/src/net/i2p/util/FileLogWriter.java b/core/java/src/net/i2p/util/FileLogWriter.java new file mode 100644 index 000000000..92babcf86 --- /dev/null +++ b/core/java/src/net/i2p/util/FileLogWriter.java @@ -0,0 +1,218 @@ +package net.i2p.util; + +/* + * free (adj.): unencumbered; not under the control of others + * Written by jrandom in 2003 and released into the public domain + * with no warranty of any kind, either expressed or implied. + * It probably won't make your computer catch on fire, or eat + * your children, but it might. Use at your own risk. + * + */ + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; + +/** + * File-based log writer thread that pulls log records from the LogManager, + * writes them to the current logfile, and rotates the logs as necessary. + * + */ +class FileLogWriter extends LogWriter { + // volatile as it changes on log file rotation + private volatile Writer _currentOut; + private int _rotationNum = -1; + private File _currentFile; + private long _numBytesInCurrentFile; + + private static final int MAX_DISKFULL_MESSAGES = 8; + private int _diskFullMessageCount; + + public FileLogWriter(LogManager manager) { + super(manager); + } + + /** + * File may not exist or have old logs in it if not opened yet + */ + public synchronized String currentFile() { + if (_currentFile != null) + return _currentFile.getAbsolutePath(); + String rv = getNextFile().getAbsolutePath(); + // so it doesn't increment every time we call this + _rotationNum = -1; + return rv; + } + + protected void writeRecord(LogRecord rec, String formatted) { + writeRecord(rec.getPriority(), formatted); + } + + protected synchronized void writeRecord(int priority, String val) { + if (val == null) return; + if (_currentOut == null) { + rotateFile(); + if (_currentOut == null) + return; // hosed + } + + try { + _currentOut.write(val); + // may be a little off if a lot of multi-byte chars, but unlikely + _numBytesInCurrentFile += val.length(); + } catch (Throwable t) { + if (!_write) + return; + if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) + System.err.println("Error writing log, disk full? " + t); + //t.printStackTrace(); + } + if (_numBytesInCurrentFile >= _manager.getFileSize()) { + rotateFile(); + } + } + + /** + * @since 0.9.19 + */ + protected void flushWriter() { + try { + if (_currentOut != null) + _currentOut.flush(); + } catch (IOException ioe) { + if (_write && ++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) + System.err.println("Error writing the router log - disk full? " + ioe); + } + } + + /** + * @since 0.9.19 renamed from closeFile() + */ + protected void closeWriter() { + Writer out = _currentOut; + if (out != null) { + try { + out.close(); + } catch (IOException ioe) {} + } + } + + /** + * Rotate to the next file (or the first file if this is the first call) + * + * Caller must synch + */ + private void rotateFile() { + File f = getNextFile(); + _currentFile = f; + _numBytesInCurrentFile = 0; + File parent = f.getParentFile(); + if (parent != null) { + if (!parent.exists()) { + File sd = new SecureDirectory(parent.getAbsolutePath()); + boolean ok = sd.mkdirs(); + if (!ok) { + System.err.println("Unable to create the parent directory: " + parent.getAbsolutePath()); + //System.exit(0); + } + } + if (!parent.isDirectory()) { + System.err.println("Cannot put the logs in a subdirectory of a plain file: " + f.getAbsolutePath()); + //System.exit(0); + } + } + closeWriter(); + try { + _currentOut = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8")); + } catch (IOException ioe) { + if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) + System.err.println("Error creating log file [" + f.getAbsolutePath() + "]" + ioe); + } + } + + /** + * Get the next file in the rotation + * + * Caller must synch + */ + private File getNextFile() { + String pattern = _manager.getBaseLogfilename(); + File f = new File(pattern); + File base = null; + if (!f.isAbsolute()) + base = _manager.getContext().getLogDir(); + + if ( (pattern.indexOf('#') < 0) && (pattern.indexOf('@') <= 0) ) { + if (base != null) + return new File(base, pattern); + else + return f; + } + + int max = _manager.getRotationLimit(); + if (_rotationNum == -1) { + return getFirstFile(base, pattern, max); + } + + // we're in rotation, just go to the next + _rotationNum++; + if (_rotationNum > max) _rotationNum = 0; + + String newf = replace(pattern, _rotationNum); + if (base != null) + return new File(base, newf); + return new File(newf); + } + + /** + * Retrieve the first file, updating the rotation number accordingly + * + * Caller must synch + */ + private File getFirstFile(File base, String pattern, int max) { + for (int i = 0; i < max; i++) { + File f; + if (base != null) + f = new File(base, replace(pattern, i)); + else + f = new File(replace(pattern, i)); + if (!f.exists()) { + _rotationNum = i; + return f; + } + } + + // all exist, pick the oldest to replace + File oldest = null; + for (int i = 0; i < max; i++) { + File f; + if (base != null) + f = new File(base, replace(pattern, i)); + else + f = new File(replace(pattern, i)); + if (oldest == null) { + oldest = f; + } else { + if (f.lastModified() < oldest.lastModified()) { + _rotationNum = i; + oldest = f; + } + } + } + return oldest; + } + + private static final String replace(String pattern, int num) { + char c[] = pattern.toCharArray(); + StringBuilder buf = new StringBuilder(); + for (int i = 0; i < c.length; i++) { + if ( (c[i] != '#') && (c[i] != '@') ) + buf.append(c[i]); + else + buf.append(num); + } + return buf.toString(); + } +} diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index 86012c025..684d495b1 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -12,6 +12,8 @@ package net.i2p.util; import java.io.File; import java.io.Flushable; import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -163,7 +165,21 @@ public class LogManager implements Flushable { // yeah, this doesn't always work, _writer should be volatile if (_writer != null) return; - _writer = new LogWriter(this); + if (SystemVersion.isAndroid()) { + try { + Class clazz = Class.forName("net.i2p.util.AndroidLogWriter"); + Constructor ctor = clazz.getDeclaredConstructor(LogManager.class); + _writer = (LogWriter) ctor.newInstance(this); + } catch (ClassNotFoundException e) { + } catch (InstantiationException e) { + } catch (IllegalAccessException e) { + } catch (InvocationTargetException e) { + } catch (NoSuchMethodException e) { + } + } + // Default writer + if (_writer == null) + _writer = new FileLogWriter(this); _writer.setFlushInterval(_flushInterval * 1000); // if you enable logging in I2PThread again, you MUST change this back to Thread Thread t = new I2PThread(_writer, "LogWriter"); diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index d44bcb1b0..12571288d 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -9,210 +9,182 @@ package net.i2p.util; * */ -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; +import java.util.Queue; /** - * File-based log writer thread that pulls log records from the LogManager, - * writes them to the current logfile, and rotates the logs as necessary. + * Log writer thread that pulls log records from the LogManager and writes them to + * the log. This also periodically instructs the LogManager to reread its config + * file. * + * @since 0.9.19 pulled from FileLogWriter so Android may extend */ -class LogWriter extends LogWriterBase { - // volatile as it changes on log file rotation - private volatile Writer _currentOut; - private int _rotationNum = -1; - private File _currentFile; - private long _numBytesInCurrentFile; +abstract class LogWriter implements Runnable { + /** every 10 seconds? why? Just have the gui force a reread after a change?? */ + private final static long CONFIG_READ_INTERVAL = 50 * 1000; + final static long FLUSH_INTERVAL = 29 * 1000; + private final static long MIN_FLUSH_INTERVAL = 2*1000; + private final static long MAX_FLUSH_INTERVAL = 5*60*1000; + private long _lastReadConfig; + protected final LogManager _manager; - private static final int MAX_DISKFULL_MESSAGES = 8; - private int _diskFullMessageCount; + protected volatile boolean _write; + private LogRecord _last; + // ms + private volatile long _flushInterval = FLUSH_INTERVAL; public LogWriter(LogManager manager) { - super(manager); + _manager = manager; + _lastReadConfig = Clock.getInstance().now(); + } + + public abstract String currentFile(); + /** + * Write the provided LogRecord to the writer. + * @param rec the LogRecord to write. + * @param formatted a String pre-formatted from rec, may be ignored. + */ + protected abstract void writeRecord(LogRecord rec, String formatted); + /** + * Write a single String verbatim to the writer. + * @param priority the level to log the line at. + * @param line the String to write. + */ + protected abstract void writeRecord(int priority, String line); + protected abstract void flushWriter(); + protected abstract void closeWriter(); + + public void stopWriting() { + _write = false; } /** - * File may not exist or have old logs in it if not opened yet + * @param interval ms + * @since 0.9.18 */ - public synchronized String currentFile() { - if (_currentFile != null) - return _currentFile.getAbsolutePath(); - String rv = getNextFile().getAbsolutePath(); - // so it doesn't increment every time we call this - _rotationNum = -1; - return rv; + public void setFlushInterval(long interval) { + _flushInterval = Math.min(MAX_FLUSH_INTERVAL, Math.max(MIN_FLUSH_INTERVAL, interval)); } - protected void writeRecord(LogRecord rec, String formatted) { - writeRecord(rec.getPriority(), formatted); - } - - protected synchronized void writeRecord(int priority, String val) { - if (val == null) return; - if (_currentOut == null) { - rotateFile(); - if (_currentOut == null) - return; // hosed - } - + public void run() { + _write = true; + // don't bother on Android + final boolean shouldReadConfig = !SystemVersion.isAndroid(); try { - _currentOut.write(val); - // may be a little off if a lot of multi-byte chars, but unlikely - _numBytesInCurrentFile += val.length(); - } catch (Throwable t) { - if (!_write) - return; - if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) - System.err.println("Error writing log, disk full? " + t); - //t.printStackTrace(); - } - if (_numBytesInCurrentFile >= _manager.getFileSize()) { - rotateFile(); - } - } - - /** - * @since 0.9.19 - */ - protected void flushWriter() { - try { - if (_currentOut != null) - _currentOut.flush(); - } catch (IOException ioe) { - if (_write && ++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) - System.err.println("Error writing the router log - disk full? " + ioe); - } - } - - /** - * @since 0.9.19 renamed from closeFile() - */ - protected void closeWriter() { - Writer out = _currentOut; - if (out != null) { - try { - out.close(); - } catch (IOException ioe) {} - } - } - - /** - * Rotate to the next file (or the first file if this is the first call) - * - * Caller must synch - */ - private void rotateFile() { - File f = getNextFile(); - _currentFile = f; - _numBytesInCurrentFile = 0; - File parent = f.getParentFile(); - if (parent != null) { - if (!parent.exists()) { - File sd = new SecureDirectory(parent.getAbsolutePath()); - boolean ok = sd.mkdirs(); - if (!ok) { - System.err.println("Unable to create the parent directory: " + parent.getAbsolutePath()); - //System.exit(0); - } - } - if (!parent.isDirectory()) { - System.err.println("Cannot put the logs in a subdirectory of a plain file: " + f.getAbsolutePath()); - //System.exit(0); + while (_write) { + flushRecords(); + if (_write && shouldReadConfig) + rereadConfig(); } + } catch (RuntimeException e) { + System.err.println("Error writing the log: " + e); + e.printStackTrace(); } closeWriter(); + } + + public void flushRecords() { flushRecords(true); } + + public void flushRecords(boolean shouldWait) { try { - _currentOut = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8")); - } catch (IOException ioe) { - if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) - System.err.println("Error creating log file [" + f.getAbsolutePath() + "]" + ioe); - } - } - - /** - * Get the next file in the rotation - * - * Caller must synch - */ - private File getNextFile() { - String pattern = _manager.getBaseLogfilename(); - File f = new File(pattern); - File base = null; - if (!f.isAbsolute()) - base = _manager.getContext().getLogDir(); - - if ( (pattern.indexOf('#') < 0) && (pattern.indexOf('@') <= 0) ) { - if (base != null) - return new File(base, pattern); - else - return f; - } - - int max = _manager.getRotationLimit(); - if (_rotationNum == -1) { - return getFirstFile(base, pattern, max); - } - - // we're in rotation, just go to the next - _rotationNum++; - if (_rotationNum > max) _rotationNum = 0; - - String newf = replace(pattern, _rotationNum); - if (base != null) - return new File(base, newf); - return new File(newf); - } - - /** - * Retrieve the first file, updating the rotation number accordingly - * - * Caller must synch - */ - private File getFirstFile(File base, String pattern, int max) { - for (int i = 0; i < max; i++) { - File f; - if (base != null) - f = new File(base, replace(pattern, i)); - else - f = new File(replace(pattern, i)); - if (!f.exists()) { - _rotationNum = i; - return f; + // zero copy, drain the manager queue directly + Queue records = _manager.getQueue(); + if (records == null) return; + if (!records.isEmpty()) { + if (_last != null && _last.getDate() < _manager.getContext().clock().now() - 30*60*1000) + _last = null; + LogRecord rec; + int dupCount = 0; + while ((rec = records.poll()) != null) { + if (_manager.shouldDropDuplicates() && rec.equals(_last)) { + dupCount++; + } else { + if (dupCount > 0) { + writeDupMessage(dupCount, _last); + dupCount = 0; + } + writeRecord(rec); + } + _last = rec; + } + if (dupCount > 0) { + writeDupMessage(dupCount, _last); + } + flushWriter(); } - } - - // all exist, pick the oldest to replace - File oldest = null; - for (int i = 0; i < max; i++) { - File f; - if (base != null) - f = new File(base, replace(pattern, i)); - else - f = new File(replace(pattern, i)); - if (oldest == null) { - oldest = f; - } else { - if (f.lastModified() < oldest.lastModified()) { - _rotationNum = i; - oldest = f; + } catch (Throwable t) { + t.printStackTrace(); + } finally { + if (shouldWait) { + try { + synchronized (this) { + this.wait(_flushInterval); + } + } catch (InterruptedException ie) { // nop } } } - return oldest; } - private static final String replace(String pattern, int num) { - char c[] = pattern.toCharArray(); - StringBuilder buf = new StringBuilder(); - for (int i = 0; i < c.length; i++) { - if ( (c[i] != '#') && (c[i] != '@') ) - buf.append(c[i]); - else - buf.append(num); + /** + * Write a msg with the date stamp of the last duplicate + * @since 0.9.21 + */ + private void writeDupMessage(int dupCount, LogRecord lastRecord) { + String dmsg = dupMessage(dupCount, lastRecord, false); + writeRecord(lastRecord.getPriority(), dmsg); + if (_manager.getDisplayOnScreenLevel() <= lastRecord.getPriority() && _manager.displayOnScreen()) + System.out.print(dmsg); + dmsg = dupMessage(dupCount, lastRecord, true); + _manager.getBuffer().add(dmsg); + if (lastRecord.getPriority() >= Log.CRIT) + _manager.getBuffer().addCritical(dmsg); + } + + /** + * Return a msg with the date stamp of the last duplicate + * @since 0.9.3 + */ + private String dupMessage(int dupCount, LogRecord lastRecord, boolean reverse) { + String arrows = reverse ? (SystemVersion.isAndroid() ? "vvv" : "↓↓↓") : "^^^"; + return LogRecordFormatter.getWhen(_manager, lastRecord) + ' ' + arrows + ' ' + + _t(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + + LogRecordFormatter.NL; + } + + private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; + + /** + * gettext + * @since 0.9.3 + */ + private String _t(int a, String b, String c) { + return Translate.getString(a, b, c, _manager.getContext(), BUNDLE_NAME); + } + + private void rereadConfig() { + long now = Clock.getInstance().now(); + if (now - _lastReadConfig > CONFIG_READ_INTERVAL) { + _manager.rereadConfig(); + _lastReadConfig = now; + } + } + + private void writeRecord(LogRecord rec) { + String val = LogRecordFormatter.formatRecord(_manager, rec, true); + writeRecord(rec, val); + + // we always add to the console buffer, but only sometimes write to stdout + _manager.getBuffer().add(val); + if (rec.getPriority() >= Log.CRIT) + _manager.getBuffer().addCritical(val); + if (_manager.getDisplayOnScreenLevel() <= rec.getPriority()) { + if (_manager.displayOnScreen()) { + // wrapper and android logs already do time stamps, so reformat without the date + if (_manager.getContext().hasWrapper() || SystemVersion.isAndroid()) + System.out.print(LogRecordFormatter.formatRecord(_manager, rec, false)); + else + System.out.print(val); + } } - return buf.toString(); } } diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java deleted file mode 100644 index 4eb6b8942..000000000 --- a/core/java/src/net/i2p/util/LogWriterBase.java +++ /dev/null @@ -1,190 +0,0 @@ -package net.i2p.util; - -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - -import java.util.Queue; - -/** - * Log writer thread that pulls log records from the LogManager and writes them to - * the log. This also periodically instructs the LogManager to reread its config - * file. - * - * @since 0.9.19 pulled from LogWriter so Android may extend - */ -abstract class LogWriterBase implements Runnable { - /** every 10 seconds? why? Just have the gui force a reread after a change?? */ - private final static long CONFIG_READ_INTERVAL = 50 * 1000; - final static long FLUSH_INTERVAL = 29 * 1000; - private final static long MIN_FLUSH_INTERVAL = 2*1000; - private final static long MAX_FLUSH_INTERVAL = 5*60*1000; - private long _lastReadConfig; - protected final LogManager _manager; - - protected volatile boolean _write; - private LogRecord _last; - // ms - private volatile long _flushInterval = FLUSH_INTERVAL; - - public LogWriterBase(LogManager manager) { - _manager = manager; - _lastReadConfig = Clock.getInstance().now(); - } - - public abstract String currentFile(); - /** - * Write the provided LogRecord to the writer. - * @param rec the LogRecord to write. - * @param formatted a String pre-formatted from rec, may be ignored. - */ - protected abstract void writeRecord(LogRecord rec, String formatted); - /** - * Write a single String verbatim to the writer. - * @param priority the level to log the line at. - * @param line the String to write. - */ - protected abstract void writeRecord(int priority, String line); - protected abstract void flushWriter(); - protected abstract void closeWriter(); - - public void stopWriting() { - _write = false; - } - - /** - * @param interval ms - * @since 0.9.18 - */ - public void setFlushInterval(long interval) { - _flushInterval = Math.min(MAX_FLUSH_INTERVAL, Math.max(MIN_FLUSH_INTERVAL, interval)); - } - - public void run() { - _write = true; - // don't bother on Android - final boolean shouldReadConfig = !SystemVersion.isAndroid(); - try { - while (_write) { - flushRecords(); - if (_write && shouldReadConfig) - rereadConfig(); - } - } catch (RuntimeException e) { - System.err.println("Error writing the log: " + e); - e.printStackTrace(); - } - closeWriter(); - } - - public void flushRecords() { flushRecords(true); } - - public void flushRecords(boolean shouldWait) { - try { - // zero copy, drain the manager queue directly - Queue records = _manager.getQueue(); - if (records == null) return; - if (!records.isEmpty()) { - if (_last != null && _last.getDate() < _manager.getContext().clock().now() - 30*60*1000) - _last = null; - LogRecord rec; - int dupCount = 0; - while ((rec = records.poll()) != null) { - if (_manager.shouldDropDuplicates() && rec.equals(_last)) { - dupCount++; - } else { - if (dupCount > 0) { - writeDupMessage(dupCount, _last); - dupCount = 0; - } - writeRecord(rec); - } - _last = rec; - } - if (dupCount > 0) { - writeDupMessage(dupCount, _last); - } - flushWriter(); - } - } catch (Throwable t) { - t.printStackTrace(); - } finally { - if (shouldWait) { - try { - synchronized (this) { - this.wait(_flushInterval); - } - } catch (InterruptedException ie) { // nop - } - } - } - } - - /** - * Write a msg with the date stamp of the last duplicate - * @since 0.9.21 - */ - private void writeDupMessage(int dupCount, LogRecord lastRecord) { - String dmsg = dupMessage(dupCount, lastRecord, false); - writeRecord(lastRecord.getPriority(), dmsg); - if (_manager.getDisplayOnScreenLevel() <= lastRecord.getPriority() && _manager.displayOnScreen()) - System.out.print(dmsg); - dmsg = dupMessage(dupCount, lastRecord, true); - _manager.getBuffer().add(dmsg); - if (lastRecord.getPriority() >= Log.CRIT) - _manager.getBuffer().addCritical(dmsg); - } - - /** - * Return a msg with the date stamp of the last duplicate - * @since 0.9.3 - */ - private String dupMessage(int dupCount, LogRecord lastRecord, boolean reverse) { - String arrows = reverse ? (SystemVersion.isAndroid() ? "vvv" : "↓↓↓") : "^^^"; - return LogRecordFormatter.getWhen(_manager, lastRecord) + ' ' + arrows + ' ' + - _t(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + - LogRecordFormatter.NL; - } - - private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; - - /** - * gettext - * @since 0.9.3 - */ - private String _t(int a, String b, String c) { - return Translate.getString(a, b, c, _manager.getContext(), BUNDLE_NAME); - } - - private void rereadConfig() { - long now = Clock.getInstance().now(); - if (now - _lastReadConfig > CONFIG_READ_INTERVAL) { - _manager.rereadConfig(); - _lastReadConfig = now; - } - } - - private void writeRecord(LogRecord rec) { - String val = LogRecordFormatter.formatRecord(_manager, rec, true); - writeRecord(rec, val); - - // we always add to the console buffer, but only sometimes write to stdout - _manager.getBuffer().add(val); - if (rec.getPriority() >= Log.CRIT) - _manager.getBuffer().addCritical(val); - if (_manager.getDisplayOnScreenLevel() <= rec.getPriority()) { - if (_manager.displayOnScreen()) { - // wrapper and android logs already do time stamps, so reformat without the date - if (_manager.getContext().hasWrapper() || SystemVersion.isAndroid()) - System.out.print(LogRecordFormatter.formatRecord(_manager, rec, false)); - else - System.out.print(val); - } - } - } -} diff --git a/debian-alt/README.txt b/debian-alt/README.txt index 7ceec4197..2e1810568 100644 --- a/debian-alt/README.txt +++ b/debian-alt/README.txt @@ -1,9 +1,7 @@ The files in ../debian/ are for jessie/stable. Alternates are in the subdirectories here. -trusty may be copied to utopic and vivid. -They do not have libjetty8-java. -wily has libjetty8-java. +trusty may be copied to utopic, vivid, wily, xenial. tails-jessie and tails-wheezy are currently the same as jessie and wheezy, respectively. If they diverge, put the changes here. diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt index 60a71e624..d95482f6c 100644 --- a/debian-alt/doc/launchpad.txt +++ b/debian-alt/doc/launchpad.txt @@ -39,20 +39,21 @@ Generate files to upload - export TZ=UTC - cd i2p.i2p.foobar +- copy debian-alt/(series)/changelog to debian/ - edit debian/changelog to add the release at the top * version MUST be 0.9.XX-1ubuntu1 next version for fixes would be 0.9.XX-2ubunutu1 - * series MUST be trusty + * series MUST be trusty (or precise) * name and email MUST EXACTLY match what's in your GPG keyring or the signing will fail. (or add -kkeyid argument to debuild, which you must do if you want to sign with a subkey) run gpg -K to list your private keys -- edit debian/control to uncomment libservice-wrapper-java line - ant debian-release-tarball this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/ and a tarball ../i2p_0.9.XX.orig.tar.bz2 - cp debian/changelog ../i2p-0.9.XX-0-xxxxxxxx/debian/ +- cp debian-alt/(series)/(other files besides changelog) to ../i2p-0.9.XX-0-xxxxxxxx/debian/ - cd ../i2p-0.9.XX-0-xxxxxxxx/ - Build the *1ubuntu1* files: If you have NOT done a successful dput for this release yet: diff --git a/debian-alt/precise/control b/debian-alt/precise/control index c3f2e7009..5df01192d 100644 --- a/debian-alt/precise/control +++ b/debian-alt/precise/control @@ -4,7 +4,7 @@ Section: net Standards-Version: 3.9.6 Priority: optional Bugs: mailto:zzz@i2pmail.org -Homepage: https://geti2p.net +Homepage: https://geti2p.net/ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) ,ant-optional @@ -13,9 +13,11 @@ Build-Depends: debhelper (>= 7.0.50~) # Ant requires java 6 tools.jar: # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar ,openjdk-6-jdk + ,glassfish-javaee ,dh-apparmor ,gettext - ,libgmp3-dev + ,libgetopt-java + ,libgmp-dev (>= 2:5.0.2) ,libservice-wrapper-java ,hardening-wrapper ,po-debconf @@ -45,7 +47,7 @@ Architecture: any Section: java Priority: optional Depends: ${shlibs:Depends}, i2p-router -Homepage: http://www.i2p2.de/jbigi +Homepage: https://geti2p.net/ Description: Java Big Integer library This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid). . @@ -72,7 +74,12 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java + openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, + libecj-java, + geoip-database, + gettext-base, + libgetopt-java, + glassfish-javaee Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, ttf-dejavu diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install new file mode 100644 index 000000000..a159682ac --- /dev/null +++ b/debian-alt/precise/i2p-router.install @@ -0,0 +1,72 @@ +# history.txt is installed to /usr/share/i2p because +# it's shown in the router console at http://127.0.0.1:7657 +# (this is also why I don't use dh_installchangelogs -k for it) +history.txt usr/share/i2p + +pkg-temp/blocklist.txt usr/share/i2p +pkg-temp/certificates usr/share/i2p +pkg-temp/clients.config usr/share/i2p +pkg-temp/docs usr/share/i2p/ +pkg-temp/eepget usr/bin +pkg-temp/eepsite usr/share/i2p +pkg-temp/geoip usr/share/i2p +pkg-temp/hosts.txt usr/share/i2p +pkg-temp/i2prouter-nowrapper usr/bin +pkg-temp/i2psnark.config usr/share/i2p +pkg-temp/i2ptunnel.config usr/share/i2p +pkg-temp/router.config usr/share/i2p +pkg-temp/systray.config usr/share/i2p +pkg-temp/webapps usr/share/i2p + + +pkg-temp/lib/BOB.jar usr/share/i2p/lib +pkg-temp/lib/desktopgui.jar usr/share/i2p/lib +pkg-temp/lib/i2p.jar usr/share/i2p/lib +pkg-temp/lib/i2psnark.jar usr/share/i2p/lib +pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib +pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib +pkg-temp/lib/jrobin.jar usr/share/i2p/lib +pkg-temp/lib/mstreaming.jar usr/share/i2p/lib +pkg-temp/lib/routerconsole.jar usr/share/i2p/lib +pkg-temp/lib/router.jar usr/share/i2p/lib +pkg-temp/lib/sam.jar usr/share/i2p/lib +pkg-temp/lib/streaming.jar usr/share/i2p/lib +pkg-temp/lib/systray.jar usr/share/i2p/lib + + +# uncomment if not building with libjetty8-java +# ubuntu: in trusty vivid wily xenial +# debian: in wheezy jessie stretch sid +pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib +pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib +pkg-temp/lib/jetty-http.jar usr/share/i2p/lib +pkg-temp/lib/jetty-io.jar usr/share/i2p/lib +pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib +pkg-temp/lib/jetty-security.jar usr/share/i2p/lib +pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib +pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib +pkg-temp/lib/jetty-start.jar usr/share/i2p/lib +pkg-temp/lib/jetty-util.jar usr/share/i2p/lib +pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib +pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib +pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib +pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib +# following two are from libservlet3.0-java which is a dependency of libjetty8-java +pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib + + +# uncomment if not building with either libtomcat6-java or libtomcat7-java +pkg-temp/lib/commons-el.jar usr/share/i2p/lib +# legacy name, contains only tomcat-juli, not commons-logging +pkg-temp/lib/commons-logging.jar usr/share/i2p/lib +pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib + + +# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java +# ubuntu and debian: everywhere +#pkg-temp/lib/jstl.jar usr/share/i2p/lib + + +# uncomment if not building with either glassfish-javaee or libjstl1.1-java +# ubuntu and debian: everywhere +#pkg-temp/lib/standard.jar usr/share/i2p/lib diff --git a/debian-alt/precise/i2p-router.links b/debian-alt/precise/i2p-router.links new file mode 100644 index 000000000..ce86a8ead --- /dev/null +++ b/debian-alt/precise/i2p-router.links @@ -0,0 +1,100 @@ +usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt +usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt +usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt +usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt + +usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar + + +# comment out if not building with libjetty8-java +# ubuntu: in trusty vivid wily xenial +# debian: in wheezy jessie stretch sid +#usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar +#usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar +#usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar +#usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar +# legacy name in lib/ +#usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar +#usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar +#usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar +#usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar +#usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar +#usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar +#usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar +#usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar +# legacy name in lib/ +#usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar +# legacy name in lib/ +#usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar +# following two are from libservlet3.0-java which is a dependency of libjetty8-java +# legacy name in lib/ +#usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar +# combined into javax.servlet.jar in non-package builds +#usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar + + +# comment out if not building with libtomcat6-java +# ubuntu: only in precise trusty vivid +# debian: only in wheezy +# legacy name, contains only tomcat-juli, not commons-logging +#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar +#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar +# combined into jasper-runtime.jar in non-package builds +#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +# combined into commons-el.jar in non-package builds +#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar +# following is from libservlet2.5-java which is a dependency of libtomcat6-java +# legacy name in lib/ +#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar + + +# comment out if not building with libtomcat7-java +# ubuntu: only in precise trusty vivid +# debian: only in wheezy +# legacy name, contains only tomcat-juli, not commons-logging +#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar +#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +# combined into jasper-runtime.jar in non-package builds +#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +# tomcat 7 only +#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar +#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar +# combined into commons-el.jar in non-package builds +#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +# following is from libservlet3.0-java which is a dependency of libtomcat7-java +# legacy name in lib/ +#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar + + +# comment out if not building with glassfish-javaee +usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar +usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar + + +# comment out if not building with libjakarta-taglibs-standard-java +# ubuntu and debian: everywhere +#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar + + +# comment out if not building with libjstl1.1-java +# ubuntu and debian: everywhere +#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar + + +# comment out if not building with gettext-base +# ubuntu and debian: everywhere +usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar + + +# comment out if not building with libgetopt-java +# ubuntu and debian: everywhere +usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar + + +# comment out if not building with libhttpclient-java and libhttpcore-java +# 2 MB of dependencies vs. 20 KB of copied source +# Requires 4.4 or higher. +# Debian: Not in wheezy/jessie +# Ubuntu: Only in wily and later +#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar +#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules index a527fc1bf..e8141ee51 100755 --- a/debian-alt/precise/rules +++ b/debian-alt/precise/rules @@ -34,6 +34,9 @@ export DEB_BUILD_HARDENING=1 #export EXTRAPREFIX := deb export JAVA_HOME I2P export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/') +# required for jbigi/jcpuid build +export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) +#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) %: dh $@ @@ -62,8 +65,6 @@ binary-indep: build-indep build-indep: dh_prep mkdir -p $(CURDIR)/installer/lib/wrapper/all - mkdir -p $(CURDIR)/installer/lib/launch4j/lib/ - ln -sf /usr/share/java/commons-logging.jar $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ @@ -74,11 +75,92 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" else @echo "Already found deb in version, not doing anything" endif - # build options + @# build options @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties + + @# ubuntu: not in precise + @# debian: in wheezy jessie stretch sid + @#/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/apps/jetty/jettylib + @#ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar + @#ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar + @#ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar + @#ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar + @#ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar + @#ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar + @#ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar + @#ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar + @#ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar + @#ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar + @#ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar + @#ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar + @#ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar + @#ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar + @# following two are from libservlet3.0-java which is a dependency of libjetty8-java + @#ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + @#ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + + @# ubuntu: only in precise trusty vivid + @# debian: only in wheezy + @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/apps/jetty/jettylib + @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + @# following is from libservlet2.5-java which is a dependency of libtomcat6-java + @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/apps/jetty/jettylib + @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + @# following is from libservlet3.0-java which is a dependency of libtomcat7-java + @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties + ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties + @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties + @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar + + @# 2 MB of dependencies vs. 20 KB of copied source + @# Requires 4.4 or higher. + @# Debian: Not in wheezy/jessie + @# Ubuntu: Only in wily and later + @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/core/java/build + @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar + @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar + TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules new file mode 100755 index 000000000..345aa3b05 --- /dev/null +++ b/debian-alt/trusty/rules @@ -0,0 +1,213 @@ +#!/usr/bin/make -f + +# Quoting Policy version 3.9.2.0, 2011-04-07 section 4.9: + +# /start quote +# For some packages, notably ones where the same source tree is compiled in +# different ways to produce two binary packages, the build target does not make +# much sense. For these packages it is good enough to provide two (or more) +# targets (build-a and build-b or whatever) for each of the ways of building the +# package, and a build target that does nothing. The binary target will have to +# build the package in each of the possible ways and make the binary package out +# of each. +# ... +# When a package has a configuration and build routine which takes a long time, +# or when the makefiles are poorly designed, or when build needs to run clean +# first, it is a good idea to touch build when the build process is complete. +# This will ensure that if debian/rules build is run again it will not rebuild +# the whole program. +# /end quote + +# Since that fits building I2P very well, we override the build target. +# + +build: + @echo 'The build target is disabled. Use the appropriate binary target.' + +JAVA_HOME=/usr/lib/jvm/default-java +I2P=$(CURDIR)/pkg-temp +ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java +export DEB_BUILD_HARDENING=1 + +# I2P's version will be displayed in the router console as "$I2PVERSION-$EXTRAPREFIX$DEBIANVERSION", eg. 0.8.12-0-deb1 +#export EXTRAPREFIX := deb +export JAVA_HOME I2P +export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/') +# required for jbigi/jcpuid build +export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) +#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +%: + dh $@ --with systemd + +clean: createcopyright + +override_dh_auto_clean: + -[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION) + dh_auto_clean + ant distclean + find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \; + rm -rf $(CURDIR)/core/c/jcpuid/lib/ + rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar + rm -rf $(CURDIR)/debian/python-i2p + rm -f $(CURDIR)/override.properties + debconf-updatepo + +override_dh_auto_build: + +override_dh_systemd_enable: + # We purposely do not set I2P to start at boot. + # This matches the behavior of the initscript + # and the setting RUN_DAEMON=false in /etc/default/i2p + +binary-indep: build-indep +build-indep: + dh_prep + mkdir -p $(CURDIR)/installer/lib/wrapper/all + ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar + if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \ + cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ + fi +ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" + sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp + mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) +else + @echo "Already found deb in version, not doing anything" +endif + @# build options + @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties + @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties + @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties + @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties + + @# ubuntu: not in precise + @# debian: in wheezy jessie stretch sid + @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties + mkdir -p $(CURDIR)/apps/jetty/jettylib + ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar + ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar + ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar + ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar + ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar + ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar + ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar + ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar + ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar + ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar + ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar + ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar + ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar + ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar + @# following two are from libservlet3.0-java which is a dependency of libjetty8-java + ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + + @# ubuntu: only in precise trusty vivid + @# debian: only in wheezy + @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/apps/jetty/jettylib + @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + @# following is from libservlet2.5-java which is a dependency of libtomcat6-java + @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/apps/jetty/jettylib + @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + @# following is from libservlet3.0-java which is a dependency of libtomcat7-java + @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties + ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties + @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar + + @# debian and ubuntu: everywhere + @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties + @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar + + @# 2 MB of dependencies vs. 20 KB of copied source + @# Requires 4.4 or higher. + @# Debian: Not in wheezy/jessie + @# Ubuntu: Only in wily and later + @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/core/java/build + @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar + @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar + + TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc + echo router.updateDisabled=true > $(I2P)/router.config + mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper + +binary-arch: build-arch +build-arch: + # build jbigi + cd $(CURDIR)/core/c/jbigi && ./build_jbigi.sh dynamic + # build jcpuid + cd $(CURDIR)/core/c/jcpuid && ./build.sh + +binary: binary-arch binary-indep + +createcopyright: + @echo " *** Creating debian/copyright*** " + @rm -f $(CURDIR)/debian/copyright + @/bin/echo -e "This package was Debianized by kytv " >> $(CURDIR)/debian/copyright + @/bin/echo -e "Sun, 23 Jan 2011 20:26:51 +0000" >> $(CURDIR)/debian/copyright + @/bin/echo -e "\nIt was downloaded from https://geti2p.net" >> $(CURDIR)/debian/copyright + @/bin/echo -e "\nI2P is tracked upstream using the Monotone VCS" >> $(CURDIR)/debian/copyright + @/bin/echo -e "Complete information on fetching the source with monotone can be found" >> $(CURDIR)/debian/copyright + @/bin/echo -e "at https://geti2p.net/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright + @/bin/cat $(CURDIR)/LICENSE.txt >> $(CURDIR)/debian/copyright + @/bin/echo -e "\n\n The debian packaging has been released into the public domain." >> $(CURDIR)/debian/copyright + +override_dh_compress: + dh_compress -X.xsl -X.xml + +override_dh_install: + dh_install --list-missing + dh_apparmor --profile-name=system_i2p -pi2p + dh_apparmor --profile-name=usr.bin.i2prouter -pi2p + +override_dh_installchangelogs: + dh_installchangelogs history.txt + +override_dh_installdocs: + dh_installdocs -pi2p -plibjbigi-jni --link-doc=i2p-router + dh_installdocs --remaining-packages + +override_dh_dhlibdeps: + dh_shlibdeps -llibjbigi-jni debian/libjbigi-jni/usr/lib/jni/*.so + +#override_dh_installinit: +# dh_installinit -r + +override_dh_builddeb: + dh_builddeb -- -Zxz + +get-orig-source: + uscan --verbose --rename --destdir $(CURDIR)/.. --watchfile debian/watch --force-download diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index 9ab41c037..1c1746e75 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -371,16 +371,16 @@ Debian wrapper.config to try to prevent confusion. @@ -185,7 +185,7 @@ msgstr "" - #: ../i2prouter:1864 + #: ../i2prouter:1875 -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:1869 + #: ../i2prouter:1880 @@ -193,5 +193,5 @@ msgstr "" - #: ../i2prouter:1872 + #: ../i2prouter:1883 -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/rules b/debian/rules index e3b5ce80b..0cc4ff914 100755 --- a/debian/rules +++ b/debian/rules @@ -33,6 +33,8 @@ export DEB_BUILD_HARDENING=1 #export EXTRAPREFIX := deb export JAVA_HOME I2P export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/') +# required for jbigi/jcpuid build +export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) %: diff --git a/history.txt b/history.txt index cd9fcbd37..98820fe0e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2016-05-25 zzz + * DesktopGui: Add monochrome icons for Windows and Mac + * Reseed: + - Require two sources minimum (ticket #1794) + - Update list of sources requiring SNI + * Translations: Update English po files + 2016-05-20 zzz * DesktopGui: - Fix systray menu redraw on Mac; diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po index 813b061ea..b21cff59c 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: 2015-07-17 01:16+0000\n" +"POT-Creation-Date: 2016-05-25 12:29+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:221 +#: ../i2prouter:224 msgid "Failed to load the wrapper" msgstr "" -#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 -#: ../i2prouter:1129 +#: ../i2prouter:989 ../i2prouter:1017 ../i2prouter:1091 ../i2prouter:1119 +#: ../i2prouter:1140 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "" -#: ../i2prouter:989 +#: ../i2prouter:1000 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1013 +#: ../i2prouter:1024 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1060 +#: ../i2prouter:1071 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "" -#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 +#: ../i2prouter:1085 ../i2prouter:1113 ../i2prouter:1319 ../i2prouter:1608 msgid "Must be root to perform this action." msgstr "" -#: ../i2prouter:1118 +#: ../i2prouter:1129 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1140 +#: ../i2prouter:1151 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 +#: ../i2prouter:1155 ../i2prouter:1223 ../i2prouter:1776 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "" -#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 +#: ../i2prouter:1168 ../i2prouter:1176 ../i2prouter:1238 ../i2prouter:1246 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1183 +#: ../i2prouter:1194 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "" -#: ../i2prouter:1197 +#: ../i2prouter:1208 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1200 +#: ../i2prouter:1211 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1208 +#: ../i2prouter:1219 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "" -#: ../i2prouter:1254 +#: ../i2prouter:1265 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "" -#: ../i2prouter:1259 +#: ../i2prouter:1270 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "" -#: ../i2prouter:1262 +#: ../i2prouter:1273 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" -#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 -#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 -#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 +#: ../i2prouter:1326 ../i2prouter:1338 ../i2prouter:1357 ../i2prouter:1374 +#: ../i2prouter:1441 ../i2prouter:1461 ../i2prouter:1475 ../i2prouter:1489 +#: ../i2prouter:1517 ../i2prouter:1555 ../i2prouter:1590 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "" -#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 -#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 -#: ../i2prouter:1582 +#: ../i2prouter:1329 ../i2prouter:1344 ../i2prouter:1446 ../i2prouter:1478 +#: ../i2prouter:1492 ../i2prouter:1506 ../i2prouter:1520 ../i2prouter:1558 +#: ../i2prouter:1593 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1589 +#: ../i2prouter:1600 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 -#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 -#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 +#: ../i2prouter:1616 ../i2prouter:1629 ../i2prouter:1643 ../i2prouter:1652 +#: ../i2prouter:1662 ../i2prouter:1686 ../i2prouter:1699 ../i2prouter:1711 +#: ../i2prouter:1729 ../i2prouter:1742 ../i2prouter:1756 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 -#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 -#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 +#: ../i2prouter:1622 ../i2prouter:1637 ../i2prouter:1646 ../i2prouter:1656 +#: ../i2prouter:1667 ../i2prouter:1680 ../i2prouter:1692 ../i2prouter:1705 +#: ../i2prouter:1723 ../i2prouter:1736 ../i2prouter:1750 ../i2prouter:1761 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "" -#: ../i2prouter:1754 +#: ../i2prouter:1765 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1841 +#: ../i2prouter:1852 msgid "Commands:" msgstr "" -#: ../i2prouter:1842 +#: ../i2prouter:1853 msgid "Launch in the current console." msgstr "" -#: ../i2prouter:1843 +#: ../i2prouter:1854 msgid "Start in the background as a daemon process." msgstr "" -#: ../i2prouter:1844 +#: ../i2prouter:1855 msgid "Stop if running as a daemon or in another console." msgstr "" -#: ../i2prouter:1845 +#: ../i2prouter:1856 msgid "Stop gracefully, may take up to 11 minutes." msgstr "" -#: ../i2prouter:1846 +#: ../i2prouter:1857 msgid "Stop if running and then start." msgstr "" -#: ../i2prouter:1847 +#: ../i2prouter:1858 msgid "Restart only if already running." msgstr "" -#: ../i2prouter:1848 +#: ../i2prouter:1859 msgid "Query the current status." msgstr "" -#: ../i2prouter:1849 +#: ../i2prouter:1860 msgid "Install to start automatically when system boots." msgstr "" -#: ../i2prouter:1850 +#: ../i2prouter:1861 msgid "Uninstall." msgstr "" -#: ../i2prouter:1851 +#: ../i2prouter:1862 msgid "Request a Java thread dump if running." msgstr "" -#: ../i2prouter:1864 +#: ../i2prouter:1875 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "" -#: ../i2prouter:1869 +#: ../i2prouter:1880 msgid "Running I2P as the root user is *not* recommended." msgstr "" -#: ../i2prouter:1872 +#: ../i2prouter:1883 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e36cd3b14..7f4edb975 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 = 12; + public final static long BUILD = 13; /** for example "-test" */ public final static String EXTRA = ""; 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 6737bc261..2e569239c 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -63,6 +63,8 @@ public class Reseeder { private static final boolean ENABLE_SU3 = true; /** if false, use su3 only, and disable fallback reading directory index and individual dat files */ private static final boolean ENABLE_NON_SU3 = false; + private static final int MIN_RI_WANTED = 100; + private static final int MIN_RESEED_SERVERS = 2; /** * NOTE - URLs that are in both the standard and SSL groups must use the same hostname, @@ -241,6 +243,9 @@ public class Reseeder { * Since Java 7 or Android 2.3 (API 9), * which is the lowest Android we support anyway. * + * Not guaranteed to be correct, e.g. FreeBSD: + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=201446 + * * @since 0.9.20 */ private static boolean isSNISupported() { @@ -500,6 +505,9 @@ public class Reseeder { } if (!isSNISupported()) { try { + URLList.remove(new URI("https://i2p.manas.ca:8443/")); + URLList.remove(new URI("https://i2p-0.manas.ca:8443/")); + URLList.remove(new URI("https://download.xxlspeed.com/")); URLList.remove(new URI("https://netdb.i2p2.no/")); } catch (URISyntaxException mue) {} } @@ -521,6 +529,7 @@ public class Reseeder { */ private int reseed(List URLList, boolean echoStatus) { int total = 0; + int fetched_reseed_servers = 0; for (int i = 0; i < URLList.size() && _isRunning; i++) { if (_context.router().gracefulShutdownInProgress()) { System.out.println("Reseed aborted, shutdown in progress"); @@ -539,8 +548,9 @@ public class Reseeder { } if (dl > 0) { total += dl; + fetched_reseed_servers++; // Don't go on to the next URL if we have enough - if (total >= 100) + if (total >= MIN_RI_WANTED && fetched_reseed_servers >= MIN_RESEED_SERVERS) break; // remove alternate versions if we haven't tried them yet for (int j = i + 1; j < URLList.size(); ) {