propagate from branch 'i2p.i2p' (head fea8e3400c114ad820bf3f0eb7d18336b85027cb)

to branch 'i2p.i2p.slumlord' (head 472429fc9d4d273e0d05de5ae0c075c5ebfca45f)

.tx/config

@@ -36,6 +36,7 @@ source_lang = en
 trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
 trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
 trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
+trans.el = apps/i2ptunnel/locale-proxy/messages_el.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
 trans.fi = apps/i2ptunnel/locale-proxy/messages_fi.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
@@ -46,6 +47,7 @@ trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
 trans.ko = apps/i2ptunnel/locale-proxy/messages_ko.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
+trans.nn = apps/i2ptunnel/locale-proxy/messages_nn.po
 trans.pl = apps/i2ptunnel/locale-proxy/messages_pl.po
 trans.pt = apps/i2ptunnel/locale-proxy/messages_pt.po
 trans.pt_BR = apps/i2ptunnel/locale-proxy/messages_pt_BR.po
@@ -140,6 +142,7 @@ trans.fa = apps/routerconsole/locale-countries/messages_fa.po
 trans.fi = apps/routerconsole/locale-countries/messages_fi.po
 trans.fr = apps/routerconsole/locale-countries/messages_fr.po
 trans.gl = apps/routerconsole/locale-countries/messages_gl.po
+trans.hr = apps/routerconsole/locale-countries/messages_hr.po
 trans.hu = apps/routerconsole/locale-countries/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/routerconsole/locale-countries/messages_in.po
@@ -169,6 +172,7 @@ source_lang = en
 trans.ar = apps/i2psnark/locale/messages_ar.po
 trans.cs = apps/i2psnark/locale/messages_cs.po
 trans.de = apps/i2psnark/locale/messages_de.po
+trans.el = apps/i2psnark/locale/messages_el.po
 trans.es = apps/i2psnark/locale/messages_es.po
 trans.fi = apps/i2psnark/locale/messages_fi.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
@@ -187,6 +191,7 @@ trans.ro = apps/i2psnark/locale/messages_ro.po
 trans.ru_RU = apps/i2psnark/locale/messages_ru.po
 trans.sk = apps/i2psnark/locale/messages_sk.po
 trans.sv_SE = apps/i2psnark/locale/messages_sv.po
+trans.sq = apps/i2psnark/locale/messages_sq.po
 trans.tr_TR = apps/i2psnark/locale/messages_tr.po
 trans.uk_UA = apps/i2psnark/locale/messages_uk.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
@@ -341,6 +346,7 @@ trans.id = installer/resources/locale/po/messages_id.po
 trans.it = installer/resources/locale/po/messages_it.po
 trans.ja = installer/resources/locale/po/messages_ja.po
 trans.ko = installer/resources/locale/po/messages_ko.po
+trans.nb = installer/resources/locale/po/messages_nb.po
 trans.nl = installer/resources/locale/po/messages_nl.po
 trans.pl = installer/resources/locale/po/messages_pl.po
 trans.pt = installer/resources/locale/po/messages_pt.po
@@ -430,10 +436,13 @@ trans.uk_UA = apps/ministreaming/locale/messages_uk.po
 trans.zh_CN = apps/ministreaming/locale/messages_zh.po
 
 [I2P.manpages]
+;;
+;; after adding languages here, add to debian/*.manpages also
+;;
 type = PO
 source_file = installer/resources/locale-man/man.pot
 source_lang = en
-; after adding languages here, add to debian/*.manpages also
+trans.az = installer/resources/locale-man/man_az.po
 trans.de = installer/resources/locale-man/man_de.po
 trans.es = installer/resources/locale-man/man_es.po
 trans.fi = installer/resources/locale-man/man_fi.po
@@ -447,6 +456,7 @@ trans.pt = installer/resources/locale-man/man_pt.po
 trans.pt_BR = installer/resources/locale-man/man_pt_BR.po
 trans.ru_RU = installer/resources/locale-man/man_ru.po
 trans.sv_SE = installer/resources/locale-man/man_sv.po
+trans.tr_TR = installer/resources/locale-man/man_tr.po
 trans.zh_CN = installer/resources/locale-man/man_zh.po
 
 [I2P.eepsite]
@@ -463,6 +473,7 @@ trans.de = installer/resources/eepsite/docroot/help/index_de.html
 ;; not yet translated on TX, use old page
 ;;trans.es = installer/resources/eepsite/docroot/help/index_es.html
 trans.fr = installer/resources/eepsite/docroot/help/index_fr.html
+trans.it = installer/resources/eepsite/docroot/help/index_it.html
 ;; not yet translated on TX, use old page
 ;;trans.nl = installer/resources/eepsite/docroot/help/index_nl.html
 trans.pl = installer/resources/eepsite/docroot/help/index_nl.html
@@ -470,6 +481,7 @@ trans.pt = installer/resources/eepsite/docroot/help/index_nl.html
 trans.ru_RU = installer/resources/eepsite/docroot/help/index_ru.html
 ;; not yet translated on TX, use old page
 ;;trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
+trans.tr_TR = installer/resources/eepsite/docroot/help/index_tr.html
 ;; not yet translated on TX, use old page
 ;;trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
 
@@ -480,6 +492,11 @@ trans.ru_RU = installer/resources/eepsite/docroot/help/index_ru.html
 type = HTML
 source_file = installer/resources/readme/readme.html
 source_lang = en
+trans.de = installer/resources/readme/readme_de.html
+trans.it = installer/resources/readme/readme_it.html
+trans.ja = installer/resources/readme/readme_ja.html
+trans.pl = installer/resources/readme/readme_pl.html
+trans.tr_TR = installer/resources/readme/readme_tr.html
 
 [main]
 host = https://www.transifex.com

LICENSE.txt

@@ -233,7 +233,7 @@ Applications:
      Zxing 3.3.0:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.24.v20180105 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
    (not included in most distribution packages, except for jetty-i2p.jar)
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -176,7 +176,7 @@ class Daemon {
     private static void update(NamingService router, Set<String> knownNames,
                                NamingService publishedNS, AddressBook addressbook,
                                Iterator<Map.Entry<String, HostTxtEntry>> iter, Log log) {
-            long start = System.currentTimeMillis();
+            long start = DEBUG ? System.currentTimeMillis() : 0;
             int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
             int deleted = 0;
             while(iter.hasNext()) {
@@ -189,7 +189,7 @@ class Daemon {
                 Destination oldDest;
                 if (knownNames != null) {
                     oldDest = null;
-                    isKnown = key != null ? knownNames.contains(key) : null;
+                    isKnown = key != null ? knownNames.contains(key) : false;
                 } else {
                     oldDest = key != null ? router.lookup(key) : null;
                     isKnown = oldDest != null;
@@ -803,7 +803,7 @@ class Daemon {
      */
     public static void main(String[] args) {
         Daemon daemon = new Daemon();
-        if (args != null && args.length > 0 && args[0].equals("test"))
+        if (args.length > 0 && args[0].equals("test"))
             daemon.test(args);
         else
             daemon.run(args);
@@ -823,11 +823,14 @@ class Daemon {
         ctx.logManager().flush();
     }
     
+    /**
+     *  @param args may be null
+     */
     public void run(String[] args) {
         _running = true;
         String settingsLocation = "config.txt";
         File homeFile;
-        if (args.length > 0) {
+        if (args != null && args.length > 0) {
             homeFile = new SecureDirectory(args[0]);
             if (!homeFile.isAbsolute())
                 homeFile = new SecureDirectory(I2PAppContext.getGlobalContext().getRouterDir(), args[0]);

apps/addressbook/java/src/net/metanotion/io/block/BlockFile.java

@@ -590,12 +590,7 @@ public class BlockFile implements Closeable {
 		_isClosed = true;
 		metaIndex.close();
 
-		Set<String> oi = openIndices.keySet();
+		for (BSkipList bsl : openIndices.values()) {
-		Iterator<String> i = oi.iterator();
-		Object k;
-		while(i.hasNext()) {
-			k = i.next();
-			BSkipList bsl = openIndices.get(k);
 			bsl.close();
 		}
 

apps/desktopgui/locale/messages_ja.po

@@ -5,13 +5,14 @@
 # 
 # Translators:
 # タカハシ <indexial@outlook.jp>, 2013
+# Masayuki Hatta <mhatta@mhatta.org>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2017-06-30 21:32+0000\n"
+"PO-Revision-Date: 2018-08-17 22:08+0000\n"
-"Last-Translator: zzzi2p\n"
+"Last-Translator: Masayuki Hatta <mhatta@mhatta.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr "I2P を開始"
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
-msgstr "I2P 起動中！"
+msgstr "I2P を起動中！"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
@@ -42,7 +43,7 @@ msgstr "I2P ブラウザを起動"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:76
 #: src/net/i2p/desktopgui/InternalTrayManager.java:228
 msgid "Configure I2P System Tray"
-msgstr ""
+msgstr "I2P システムトレイを設定"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:77
 #: src/net/i2p/desktopgui/InternalTrayManager.java:229
@@ -62,17 +63,17 @@ msgstr "I2P を停止"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:126
 #: src/net/i2p/desktopgui/InternalTrayManager.java:278
 msgid "Restart I2P Immediately"
-msgstr ""
+msgstr "すぐに I2P を再起動"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:143
 #: src/net/i2p/desktopgui/InternalTrayManager.java:295
 msgid "Stop I2P Immediately"
-msgstr ""
+msgstr "すぐに I2P を停止"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:157
 #: src/net/i2p/desktopgui/InternalTrayManager.java:309
 msgid "Cancel I2P Shutdown"
-msgstr ""
+msgstr "I2P のシャットダウンを中止"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:363
 #, java-format
@@ -91,4 +92,4 @@ 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 ""
+msgstr "I2P: 右クリックでメニュー"

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

@@ -201,7 +201,7 @@ public class SnarkManager implements CompleteListener, ClientApp {
     public static final Set<String> DEFAULT_TRACKER_ANNOUNCES;
 
     /** host names for config form */
-    public static final Set<String> KNOWN_OPENTRACKERS = new HashSet<String>(Arrays.asList(new String[] {
+    static final Set<String> KNOWN_OPENTRACKERS = new HashSet<String>(Arrays.asList(new String[] {
         "tracker.welterde.i2p", "cfmqlafjfmgkzbt4r3jsfyhgsr5abgxryl6fnz3d3y5a365di5aa.b32.i2p",
         "opentracker.dg2.i2p", "w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p",
         "tracker.thebland.i2p", "s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq.b32.i2p",

apps/i2psnark/java/src/org/klomp/snark/comments/Comment.java

@@ -10,7 +10,11 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 
 /**
- * Store comments
+ * Store a single comment and/or rating.
+ * Unmodifiable except for marking as hidden.
+ * Stores a one-second timestamp but designed so identical
+ * comments within a certain time frame (bucket) are equal.
+ * Don't store in a plain set - see equals().
  *
  * @since 0.9.31
  */
@@ -30,6 +34,7 @@ public class Comment implements Comparable<Comment> {
     private static final int MAX_TEXT_LEN = 512;
     private static final int BUCKET_SIZE = 10*60*1000;
     private static final long TIME_SHRINK = 1000L;
+    private static final int MAX_SKEW = (int) (BUCKET_SIZE / TIME_SHRINK);
     // 1/1/2005
     private static final long TIME_OFFSET = 1104537600000L;
 
@@ -181,26 +186,29 @@ public class Comment implements Comparable<Comment> {
         }
     }
 
-
+    /**
+     *  @return bucket number
+     */
     @Override
     public int hashCode() {
-        return time / (BUCKET_SIZE / (int) TIME_SHRINK);
+        return time / MAX_SKEW;
     }
 
     /**
-     *  Comments in the same 10-minute bucket and otherwise equal
+     *  Comments within 10 minutes (not necessarily in same bucket)
-     *  are considered equal. This will result in duplicates
+     *  and otherwise equal are considered equal.
-     *  near the border.
+     *  Violates contract, as equal objects may have different hashcodes and
+     *  be in adjacent buckets.
      */
     @Override
     public boolean equals(Object o) {
         if (o == null) return false;
         if (!(o instanceof Comment)) return false;
         Comment c = (Comment) o;
-        return rating == c.rating &&
+        int tdiff = time - c.time;
-               eq(text, c.text) &&
+        if (tdiff > MAX_SKEW || tdiff < 0 - MAX_SKEW)
-               eq(name, c.name) &&
+            return false;
-               hashCode() == c.hashCode();
+        return equalsIgnoreTimestamp(c);
     }
 
     /**

apps/i2psnark/java/src/org/klomp/snark/comments/CommentSet.java

@@ -58,7 +58,7 @@ public class CommentSet extends AbstractSet<Comment> {
     // Assume most comments are short or null.
     private static final int MAX_TOTAL_TEXT_LEN = MAX_SIZE * 16;
 
-    public CommentSet() {
+    private CommentSet() {
         super();
         map = new HashMap<Integer, List<Comment>>(4);
     }
@@ -129,7 +129,18 @@ public class CommentSet extends AbstractSet<Comment> {
         // If isMine and no text and rating changed, don't bother
         if (c.isMine() && c.getText() == null && c.getRating() == myRating)
             return false;
-        Integer hc = Integer.valueOf(c.hashCode());
+        int hCode = c.hashCode();
+        // check previous and next buckets
+        Integer phc = Integer.valueOf(hCode - 1);
+        List<Comment> plist = map.get(phc);
+        if (plist != null && plist.contains(c))
+            return false;
+        Integer nhc = Integer.valueOf(hCode + 1);
+        List<Comment> nxlist = map.get(nhc);
+        if (nxlist != null && nxlist.contains(c))
+            return false;
+        // check this bucket
+        Integer hc = Integer.valueOf(hCode);
         List<Comment> list = map.get(hc);
         if (list == null) {
             list = Collections.singletonList(c);

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

@@ -604,7 +604,7 @@ public class TunnelConfig {
             if (TunnelController.TYPE_HTTP_CLIENT.equals(_type))
                 _booleanOptions.add(I2PTunnelHTTPClient.PROP_SSL_SET);
             for (String p : _booleanClientOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+                config.setProperty(OPT + p, Boolean.toString(_booleanOptions.contains(p)));
             for (String p : _otherClientOpts) {
                 if (_otherOptions.containsKey(p))
                     config.setProperty(OPT + p, _otherOptions.get(p));
@@ -616,7 +616,7 @@ public class TunnelConfig {
             // see TunnelController.setConfig()
             _booleanOptions.add(TunnelController.PROP_LIMITS_SET);
             for (String p : _booleanServerOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+                config.setProperty(OPT + p, Boolean.toString(_booleanOptions.contains(p)));
             for (String p : _otherServerOpts) {
                 if (_otherOptions.containsKey(p))
                     config.setProperty(OPT + p, _otherOptions.get(p));
@@ -634,7 +634,7 @@ public class TunnelConfig {
         if (TunnelController.TYPE_HTTP_CLIENT.equals(_type) || TunnelController.TYPE_CONNECT.equals(_type) || 
             TunnelController.TYPE_SOCKS.equals(_type) ||TunnelController.TYPE_SOCKS_IRC.equals(_type)) {
             for (String p : _booleanProxyOpts)
-                config.setProperty(OPT + p, "" + _booleanOptions.contains(p));
+                config.setProperty(OPT + p, Boolean.toString(_booleanOptions.contains(p)));
             if (_proxyList != null)
                 config.setProperty(TunnelController.PROP_PROXIES, _proxyList);
         }
@@ -705,7 +705,7 @@ public class TunnelConfig {
         if (TunnelController.TYPE_IRC_CLIENT.equals(_type)) {
             boolean dcc = _booleanOptions.contains(I2PTunnelIRCClient.PROP_DCC);
             config.setProperty(OPT + I2PTunnelIRCClient.PROP_DCC,
-                               "" + dcc);
+                               Boolean.toString(dcc));
             // add some sane server options since they aren't in the GUI (yet)
             if (dcc) {
                 config.setProperty(OPT + PROP_MAX_CONNS_MIN, "3");
@@ -811,8 +811,8 @@ public class TunnelConfig {
         "proxyUsername", "proxyPassword"
         };
 
-    public static final Set<String> _noShowSet = new HashSet<String>(128);
+    static final Set<String> _noShowSet = new HashSet<String>(128);
-    public static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
+    static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
     static {
         _noShowSet.addAll(Arrays.asList(_noShowOpts));
         _noShowSet.addAll(Arrays.asList(_booleanClientOpts));

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -61,7 +61,7 @@ public class EditBean extends IndexBean {
 
     public String getTargetPort(int tunnel) {
         int port = _helper.getTargetPort(tunnel);
-        return port > 0 ? "" + port : "";
+        return port > 0 ? Integer.toString(port) : "";
     }
 
     public String getPrivateKeyFile(int tunnel) {

apps/i2ptunnel/locale-proxy/messages_el.po

@@ -0,0 +1,594 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# LaScapigliata <ditri2000@hotmail.com>, 2015
+# LOUKAS SKOUROLIAKOS, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-05 23:01+0000\n"
+"PO-Revision-Date: 2017-09-19 18:30+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Greek (http://www.transifex.com/otf/I2P/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+msgid "Website Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:43
+#: ../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:107
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:129
+#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:162 ../java/build/Proxy.java:175
+#: ../java/build/Proxy.java:188 ../java/build/Proxy.java:198
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:214
+msgid "Router Console"
+msgstr "Κονσόλα Router"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../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:108
+#: ../java/build/Proxy.java:121 ../java/build/Proxy.java:130
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:150
+#: ../java/build/Proxy.java:163 ../java/build/Proxy.java:176
+#: ../java/build/Proxy.java:189 ../java/build/Proxy.java:199
+msgid "I2P Router Console"
+msgstr "Κονσόλα I2P Router"
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:57 ../java/build/Proxy.java:66
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:109
+#: ../java/build/Proxy.java:122 ../java/build/Proxy.java:131
+#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:151
+#: ../java/build/Proxy.java:164 ../java/build/Proxy.java:177
+#: ../java/build/Proxy.java:190 ../java/build/Proxy.java:200
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Configuration"
+msgstr "Ρυθμίσεις"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:67
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:98 ../java/build/Proxy.java:110
+#: ../java/build/Proxy.java:123 ../java/build/Proxy.java:132
+#: ../java/build/Proxy.java:142 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:165 ../java/build/Proxy.java:178
+#: ../java/build/Proxy.java:191 ../java/build/Proxy.java:201
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:68
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:133
+#: ../java/build/Proxy.java:143 ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:166 ../java/build/Proxy.java:179
+#: ../java/build/Proxy.java:192 ../java/build/Proxy.java:202
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Addressbook"
+msgstr "Βιβλίο διευθύνσεων"
+
+#: ../java/build/Proxy.java:12
+msgid "The website was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:116
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:52
+#: ../java/build/Proxy.java:104 ../java/build/Proxy.java:117
+msgid "You may want to retry."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:29
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:186
+msgid "Could not find the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:148 ../java/build/Proxy.java:154
+msgid "Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid ""
+"The HTTP outproxy was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"The outproxy is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:26 ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:183 ../java/build/Proxy.java:205
+#, 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:27 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:184 ../java/build/Proxy.java:206
+#, java-format
+msgid ""
+"You may want to retry as this will randomly reselect an outproxy from the "
+"pool you have defined {0}here{1} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:185 ../java/build/Proxy.java:207
+#, 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:30
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:38
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:41
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:49
+msgid "The website was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid ""
+"The website is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:60
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:61
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:62
+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:63
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:72
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:78
+msgid "Website Not Found in Addressbook"
+msgstr "Η ιστοσελίδα δεν βρέθηκε στο Βιβλίο Διευθύνσεων"
+
+#: ../java/build/Proxy.java:79
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
+msgstr ""
+
+#: ../java/build/Proxy.java:83
+#, 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:92
+msgid ""
+"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:93 ../java/build/Proxy.java:208
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+#: ../java/build/Proxy.java:174 ../java/build/Proxy.java:180
+msgid "Connection Reset"
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid "The connection to the website was reset while the page was loading."
+msgstr ""
+
+#: ../java/build/Proxy.java:102
+msgid ""
+"The website could be temporarily unavailable, too busy, or it has blocked "
+"your access."
+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:119 ../java/build/Proxy.java:125
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:126
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:134
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:135
+msgid ""
+"The address helper link you followed specifies a different destination key "
+"than the entry in your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:136
+msgid ""
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr "Κάποιος θα μπορούσε να προσποιείτε μια ιστοσελίδα ή δύο άτομα να έχουν δώσει στις δύο ιστοσελίδες ίδια ονόματα."
+
+#: ../java/build/Proxy.java:137
+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:138 ../java/build/Proxy.java:144
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:145
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:146
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:147
+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:155
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:156
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Warning: Request Denied"
+msgstr "Προσοχή:Αίτημα Απορίφθηκε"
+
+#: ../java/build/Proxy.java:168
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:169
+msgid "Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:170
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:171
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:172
+#, 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:173
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:181
+msgid "The connection to the proxy was reset."
+msgstr ""
+
+#: ../java/build/Proxy.java:182
+msgid ""
+"The proxy could be temporarily unavailable, too busy, or it has blocked your"
+" access."
+msgstr ""
+
+#: ../java/build/Proxy.java:187 ../java/build/Proxy.java:193
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:194
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:195
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+msgstr ""
+
+#: ../java/build/Proxy.java:196
+msgid "Other protocols such as FTP are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:197 ../java/build/Proxy.java:203
+msgid "Outproxy Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:204
+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:643
+msgid "This seems to be a bad destination:"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:644
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:719
+#, java-format
+msgid ""
+"To visit the destination in your address book, click <a "
+"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
+"click <a href=\"{1}\">here</a>."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:744
+#, java-format
+msgid "Destination for {0} in address book"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:747
+msgid "Conflicting address helper destination"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1194
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
+msgid "Host"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1354
+msgid "Base 32"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1358
+msgid "Destination"
+msgstr "Προορισμός"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1364
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1365
+msgid ""
+"You can browse to the site without saving it to the address book. The "
+"address will be remembered until you restart your I2P router."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1366
+msgid "Continue without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1373
+#, java-format
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1374
+msgid ""
+"This address will be saved to your Router address book where your "
+"subscription-based addresses are stored."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1376
+msgid ""
+"If you want to keep track of sites you have added manually, add to your "
+"Master or Private address book instead."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1379
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1387
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1392
+msgid "Save & continue"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1384
+#, java-format
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1385
+msgid ""
+"This address will be saved to your Master address book. Select this option "
+"for addresses you wish to keep separate from the main router address book, "
+"but don't mind publishing."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1389
+#, java-format
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1390
+msgid ""
+"This address will be saved to your Private address book, ensuring it is "
+"never published."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:175
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:177
+msgid "Added via address helper"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:194
+msgid "router"
+msgstr "δρομολογητής"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "master"
+msgstr "κύριος"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198
+msgid "private"
+msgstr "ιδιωτικός"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208
+#, java-format
+msgid "Redirecting to {0}"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:220
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:221
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:223
+msgid "Click here if you are not redirected automatically."
+msgstr ""

apps/i2ptunnel/locale-proxy/messages_nn.po

@@ -0,0 +1,592 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the i2ptunnel package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-05 23:01+0000\n"
+"PO-Revision-Date: 2017-09-19 18:30+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/I2P/language/nn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../java/build/Proxy.java:5 ../java/build/Proxy.java:11
+#: ../java/build/Proxy.java:42 ../java/build/Proxy.java:48
+#: ../java/build/Proxy.java:85 ../java/build/Proxy.java:91
+msgid "Website Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:6 ../java/build/Proxy.java:18
+#: ../java/build/Proxy.java:31 ../java/build/Proxy.java:43
+#: ../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:107
+#: ../java/build/Proxy.java:120 ../java/build/Proxy.java:129
+#: ../java/build/Proxy.java:139 ../java/build/Proxy.java:149
+#: ../java/build/Proxy.java:162 ../java/build/Proxy.java:175
+#: ../java/build/Proxy.java:188 ../java/build/Proxy.java:198
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:214
+msgid "Router Console"
+msgstr "Ruterkonsoll"
+
+#: ../java/build/Proxy.java:7 ../java/build/Proxy.java:19
+#: ../java/build/Proxy.java:32 ../java/build/Proxy.java:44
+#: ../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:108
+#: ../java/build/Proxy.java:121 ../java/build/Proxy.java:130
+#: ../java/build/Proxy.java:140 ../java/build/Proxy.java:150
+#: ../java/build/Proxy.java:163 ../java/build/Proxy.java:176
+#: ../java/build/Proxy.java:189 ../java/build/Proxy.java:199
+msgid "I2P Router Console"
+msgstr ""
+
+#: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20
+#: ../java/build/Proxy.java:33 ../java/build/Proxy.java:45
+#: ../java/build/Proxy.java:57 ../java/build/Proxy.java:66
+#: ../java/build/Proxy.java:75 ../java/build/Proxy.java:88
+#: ../java/build/Proxy.java:97 ../java/build/Proxy.java:109
+#: ../java/build/Proxy.java:122 ../java/build/Proxy.java:131
+#: ../java/build/Proxy.java:141 ../java/build/Proxy.java:151
+#: ../java/build/Proxy.java:164 ../java/build/Proxy.java:177
+#: ../java/build/Proxy.java:190 ../java/build/Proxy.java:200
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: ../java/build/Proxy.java:9 ../java/build/Proxy.java:21
+#: ../java/build/Proxy.java:34 ../java/build/Proxy.java:46
+#: ../java/build/Proxy.java:58 ../java/build/Proxy.java:67
+#: ../java/build/Proxy.java:76 ../java/build/Proxy.java:89
+#: ../java/build/Proxy.java:98 ../java/build/Proxy.java:110
+#: ../java/build/Proxy.java:123 ../java/build/Proxy.java:132
+#: ../java/build/Proxy.java:142 ../java/build/Proxy.java:152
+#: ../java/build/Proxy.java:165 ../java/build/Proxy.java:178
+#: ../java/build/Proxy.java:191 ../java/build/Proxy.java:201
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../java/build/Proxy.java:10 ../java/build/Proxy.java:22
+#: ../java/build/Proxy.java:35 ../java/build/Proxy.java:47
+#: ../java/build/Proxy.java:59 ../java/build/Proxy.java:68
+#: ../java/build/Proxy.java:77 ../java/build/Proxy.java:90
+#: ../java/build/Proxy.java:99 ../java/build/Proxy.java:111
+#: ../java/build/Proxy.java:124 ../java/build/Proxy.java:133
+#: ../java/build/Proxy.java:143 ../java/build/Proxy.java:153
+#: ../java/build/Proxy.java:166 ../java/build/Proxy.java:179
+#: ../java/build/Proxy.java:192 ../java/build/Proxy.java:202
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:215
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: ../java/build/Proxy.java:12
+msgid "The website was not reachable."
+msgstr ""
+
+#: ../java/build/Proxy.java:13
+msgid ""
+"The website is offline, there is network congestion, or your router is not "
+"yet well-integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:14 ../java/build/Proxy.java:51
+#: ../java/build/Proxy.java:103 ../java/build/Proxy.java:116
+#, java-format
+msgid "You may want to {0}retry{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:15 ../java/build/Proxy.java:52
+#: ../java/build/Proxy.java:104 ../java/build/Proxy.java:117
+msgid "You may want to retry."
+msgstr ""
+
+#: ../java/build/Proxy.java:16 ../java/build/Proxy.java:29
+#: ../java/build/Proxy.java:53 ../java/build/Proxy.java:84
+#: ../java/build/Proxy.java:105 ../java/build/Proxy.java:118
+#: ../java/build/Proxy.java:160 ../java/build/Proxy.java:186
+msgid "Could not find the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23
+#: ../java/build/Proxy.java:148 ../java/build/Proxy.java:154
+msgid "Outproxy Not Found"
+msgstr ""
+
+#: ../java/build/Proxy.java:24
+msgid ""
+"The HTTP outproxy was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:25
+msgid ""
+"The outproxy is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:26 ../java/build/Proxy.java:157
+#: ../java/build/Proxy.java:183 ../java/build/Proxy.java:205
+#, 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:27 ../java/build/Proxy.java:158
+#: ../java/build/Proxy.java:184 ../java/build/Proxy.java:206
+#, java-format
+msgid ""
+"You may want to retry as this will randomly reselect an outproxy from the "
+"pool you have defined {0}here{1} (if you have more than one configured)."
+msgstr ""
+
+#: ../java/build/Proxy.java:28 ../java/build/Proxy.java:159
+#: ../java/build/Proxy.java:185 ../java/build/Proxy.java:207
+#, 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:30
+msgid "Information: New Host Name"
+msgstr ""
+
+#: ../java/build/Proxy.java:36
+msgid "Information: New Host Name with Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:37
+msgid ""
+"The address helper link you followed is for a new host name that is not in "
+"your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:38
+msgid "You may save this host name to your local address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:39
+msgid ""
+"If you save it to your address book, you will not see this message again."
+msgstr ""
+
+#: ../java/build/Proxy.java:40
+msgid ""
+"If you do not save it, the host name will be forgotten after the next router"
+" restart."
+msgstr ""
+
+#: ../java/build/Proxy.java:41
+msgid ""
+"If you do not wish to visit this host, click the \"back\" button on your "
+"browser."
+msgstr ""
+
+#: ../java/build/Proxy.java:49
+msgid "The website was not reachable, because its lease set was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:50
+msgid ""
+"The website is probably down, but there could also be network congestion."
+msgstr ""
+
+#: ../java/build/Proxy.java:54 ../java/build/Proxy.java:60
+msgid "Warning: Invalid Request URI"
+msgstr ""
+
+#: ../java/build/Proxy.java:61
+msgid "The request URI is invalid, and probably contains illegal characters."
+msgstr ""
+
+#: ../java/build/Proxy.java:62
+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:63
+msgid "Error: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:69
+msgid "Error: Local Access"
+msgstr ""
+
+#: ../java/build/Proxy.java:70
+msgid "Your browser is misconfigured."
+msgstr ""
+
+#: ../java/build/Proxy.java:71
+msgid ""
+"Do not use the proxy to access the router console, localhost, or local LAN "
+"destinations."
+msgstr ""
+
+#: ../java/build/Proxy.java:72
+msgid "Website Unknown"
+msgstr ""
+
+#: ../java/build/Proxy.java:78
+msgid "Website Not Found in Addressbook"
+msgstr ""
+
+#: ../java/build/Proxy.java:79
+msgid "The website was not found in your router's addressbook."
+msgstr ""
+
+#: ../java/build/Proxy.java:80
+msgid "Check the link or find a Base 32 or Base 64 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:81
+#, java-format
+msgid "If you have the Base 64 address, {0}add it to your addressbook{1}."
+msgstr ""
+
+#: ../java/build/Proxy.java:82
+msgid ""
+"Otherwise, find a Base 32 or address helper link, or use a jump service link"
+" below."
+msgstr ""
+
+#: ../java/build/Proxy.java:83
+#, 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:92
+msgid ""
+"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:93 ../java/build/Proxy.java:208
+msgid "Could not connect to the following destination:"
+msgstr ""
+
+#: ../java/build/Proxy.java:94 ../java/build/Proxy.java:100
+#: ../java/build/Proxy.java:174 ../java/build/Proxy.java:180
+msgid "Connection Reset"
+msgstr ""
+
+#: ../java/build/Proxy.java:101
+msgid "The connection to the website was reset while the page was loading."
+msgstr ""
+
+#: ../java/build/Proxy.java:102
+msgid ""
+"The website could be temporarily unavailable, too busy, or it has blocked "
+"your access."
+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:119 ../java/build/Proxy.java:125
+msgid "Warning: No Outproxy Configured"
+msgstr ""
+
+#: ../java/build/Proxy.java:126
+msgid ""
+"Your request was for a site outside of I2P, but you have no HTTP outproxy "
+"configured."
+msgstr ""
+
+#: ../java/build/Proxy.java:127
+msgid "Please configure an outproxy in I2PTunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:128 ../java/build/Proxy.java:134
+msgid "Warning: Destination Key Conflict"
+msgstr ""
+
+#: ../java/build/Proxy.java:135
+msgid ""
+"The address helper link you followed specifies a different destination key "
+"than the entry in your address book."
+msgstr ""
+
+#: ../java/build/Proxy.java:136
+msgid ""
+"Someone could be trying to impersonate another website, or people have given"
+" two websites identical names."
+msgstr ""
+
+#: ../java/build/Proxy.java:137
+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:138 ../java/build/Proxy.java:144
+msgid "Warning: Bad Address Helper"
+msgstr ""
+
+#: ../java/build/Proxy.java:145
+#, java-format
+msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
+msgstr ""
+
+#: ../java/build/Proxy.java:146
+msgid "It seems to be garbage data, or a mistyped Base 32 address."
+msgstr ""
+
+#: ../java/build/Proxy.java:147
+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:155
+msgid "The HTTP Outproxy was not found."
+msgstr ""
+
+#: ../java/build/Proxy.java:156
+msgid ""
+"It is offline, there is network congestion, or your router is not yet well-"
+"integrated with peers."
+msgstr ""
+
+#: ../java/build/Proxy.java:161 ../java/build/Proxy.java:167
+msgid "Warning: Request Denied"
+msgstr ""
+
+#: ../java/build/Proxy.java:168
+msgid "You attempted to connect to a non-I2P website or location."
+msgstr ""
+
+#: ../java/build/Proxy.java:169
+msgid "Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:170
+msgid "I2P HTTP Proxy Authorization Required"
+msgstr ""
+
+#: ../java/build/Proxy.java:171
+msgid ""
+"This proxy is configured to require a username and password for access."
+msgstr ""
+
+#: ../java/build/Proxy.java:172
+#, 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:173
+#, java-format
+msgid ""
+"To disable authorization, remove the configuration "
+"{0}i2ptunnel.proxy.auth=basic{1}, then stop and restart the HTTP Proxy "
+"tunnel."
+msgstr ""
+
+#: ../java/build/Proxy.java:181
+msgid "The connection to the proxy was reset."
+msgstr ""
+
+#: ../java/build/Proxy.java:182
+msgid ""
+"The proxy could be temporarily unavailable, too busy, or it has blocked your"
+" access."
+msgstr ""
+
+#: ../java/build/Proxy.java:187 ../java/build/Proxy.java:193
+msgid "Warning: Non-HTTP Protocol"
+msgstr ""
+
+#: ../java/build/Proxy.java:194
+msgid "The request uses a bad protocol."
+msgstr ""
+
+#: ../java/build/Proxy.java:195
+msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only."
+msgstr ""
+
+#: ../java/build/Proxy.java:196
+msgid "Other protocols such as FTP are not allowed."
+msgstr ""
+
+#: ../java/build/Proxy.java:197 ../java/build/Proxy.java:203
+msgid "Outproxy Unreachable"
+msgstr ""
+
+#: ../java/build/Proxy.java:204
+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:643
+msgid "This seems to be a bad destination:"
+msgstr "Dette ser ut til å vera ei feilaktig målside:"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:644
+msgid "i2paddresshelper cannot help you with a destination like that!"
+msgstr "i2paddresshelper kan ikkje hjelpa med ei sånn målside!"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:719
+#, java-format
+msgid ""
+"To visit the destination in your address book, click <a "
+"href=\"{0}\">here</a>. To visit the conflicting addresshelper destination, "
+"click <a href=\"{1}\">here</a>."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:744
+#, java-format
+msgid "Destination for {0} in address book"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:747
+msgid "Conflicting address helper destination"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1194
+msgid "Destination lease set not found"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1350
+msgid "Host"
+msgstr "Tenar"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1354
+msgid "Base 32"
+msgstr "Base 32"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1358
+msgid "Destination"
+msgstr "Målside"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1364
+#, java-format
+msgid "Continue to {0} without saving"
+msgstr "Fortset til {0} utan å lagra"
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1365
+msgid ""
+"You can browse to the site without saving it to the address book. The "
+"address will be remembered until you restart your I2P router."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1366
+msgid "Continue without saving"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1373
+#, java-format
+msgid "Save {0} to router address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1374
+msgid ""
+"This address will be saved to your Router address book where your "
+"subscription-based addresses are stored."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1376
+msgid ""
+"If you want to keep track of sites you have added manually, add to your "
+"Master or Private address book instead."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1379
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1387
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1392
+msgid "Save & continue"
+msgstr ""
+
+#. only blockfile supports multiple books
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1384
+#, java-format
+msgid "Save {0} to master address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1385
+msgid ""
+"This address will be saved to your Master address book. Select this option "
+"for addresses you wish to keep separate from the main router address book, "
+"but don't mind publishing."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1389
+#, java-format
+msgid "Save {0} to private address book and continue to website"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1390
+msgid ""
+"This address will be saved to your Private address book, ensuring it is "
+"never published."
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:175
+#, java-format
+msgid "Added via address helper from {0}"
+msgstr "Lagt til via adressehjelpar frå {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:177
+msgid "Added via address helper"
+msgstr "Lagt til med adressehjelpar"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:194
+msgid "router"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:196
+msgid "master"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198
+msgid "private"
+msgstr ""
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208
+#, java-format
+msgid "Redirecting to {0}"
+msgstr "Vidaresender til {0}"
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:220
+#, java-format
+msgid "Saved {0} to the {1} addressbook, redirecting now."
+msgstr "Lagra {0} til adresseboka {1}, vidaresender no."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:221
+#, java-format
+msgid "Failed to save {0} to the {1} addressbook, redirecting now."
+msgstr "Klarte ikkje å lagra {0} til adresseboka {1}, vidaresender no."
+
+#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:223
+msgid "Click here if you are not redirected automatically."
+msgstr "Klikk her om du ikkje blir vidaresendt."

apps/i2ptunnel/locale-proxy/messages_tr.po

@@ -4,7 +4,7 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
-# Kaya Zeren <kayazeren@gmail.com>, 2016-2017
+# Kaya Zeren <kayazeren@gmail.com>, 2016-2018
 # Ozancan Karataş <ozancankaratas96@outlook.com>, 2015
 # zzzi2p, 2018
 msgid ""
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-06-05 23:01+0000\n"
-"PO-Revision-Date: 2018-02-11 15:33+0000\n"
+"PO-Revision-Date: 2018-08-12 21:29+0000\n"
-"Last-Translator: zzzi2p\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,17 +204,17 @@ msgstr "Web sitesi büyük olasılıkla çalışmıyor ancak bir ağ tıkanıkl
 
 #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:60
 msgid "Warning: Invalid Request URI"
-msgstr "Uyarı: İstek İnternet Adresi Geçersiz"
+msgstr "Uyarı: İstek Adresi Geçersiz"
 
 #: ../java/build/Proxy.java:61
 msgid "The request URI is invalid, and probably contains illegal characters."
-msgstr "İstek İnternet adresi geçersiz ve büyük olasılıkla uygun olmayan karakterler içeriyor."
+msgstr "İstek adresi geçersiz ve büyük olasılıkla uygun olmayan karakterler içeriyor."
 
 #: ../java/build/Proxy.java:62
 msgid ""
 "If you clicked a link, check the end of the URI for any characters the "
 "browser has mistakenly added on."
-msgstr "Bir bağlantıya tıkladıysanız, İnternet adresinin sonuna bakarak hatalı eklenmiş karakterler olup olmadığını denetleyin."
+msgstr "Bir bağlantıya tıkladıysanız, adresin sonuna bakarak hatalı eklenmiş karakterler olup olmadığını denetleyin."
 
 #: ../java/build/Proxy.java:63
 msgid "Error: Request Denied"
@@ -357,7 +357,7 @@ msgstr "Uyarı: Kötü Adres Yardımcısı"
 #: ../java/build/Proxy.java:145
 #, java-format
 msgid "The helper key in the URL ({0}i2paddresshelper={1}) is not resolvable."
-msgstr "İnternet adresindeki ({0}i2paddresshelper={1}) çözümlenemedi."
+msgstr "Adresteki ({0}i2paddresshelper={1}) çözümlenemedi."
 
 #: ../java/build/Proxy.java:146
 msgid "It seems to be garbage data, or a mistyped Base 32 address."
@@ -367,7 +367,7 @@ msgstr "Anlamsız bir veri ya da hatalı yazılmış bir Base 32 adresi gibi gö
 msgid ""
 "Check your URL to try and fix the helper key to be a valid Base 32 hostname "
 "or Base 64 key."
-msgstr "İnternet adresini denetleyip, yardımcı anahtarı geçerli bir Base 32 sunucu adı ya da Base 64 anahtarı olacak şekilde düzeltmeyi deneyin."
+msgstr "Adresi denetleyip, yardımcı anahtarı geçerli bir Base 32 sunucu adı ya da Base 64 anahtarı olacak şekilde düzeltmeyi deneyin."
 
 #: ../java/build/Proxy.java:155
 msgid "The HTTP Outproxy was not found."

apps/i2ptunnel/locale/messages_fi.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-13 18:18+0000\n"
-"PO-Revision-Date: 2018-06-13 18:35+0000\n"
+"PO-Revision-Date: 2018-08-16 05:55+0000\n"
-"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
+"Last-Translator: Panu Ahvenharju\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/I2P/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1413,7 +1413,7 @@ msgstr "Kohde"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:365
 msgid "Hostname"
-msgstr ""
+msgstr "Tietokoneen nimi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:377
 msgid "New hidden service"

apps/i2ptunnel/locale/messages_pt.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # kgtm <fabio.h.f.antunes@gmail.com>, 2014
-# Manuela Silva <manuela.silva@sky.com>, 2017
+# Manuela Silva <manuela.silva@sky.com>, 2017-2018
 # Manuela Silva <manuela.silva@sky.com>, 2016
 # Rafael Ferrari, 2013
 # Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-13 18:18+0000\n"
-"PO-Revision-Date: 2018-06-13 18:35+0000\n"
+"PO-Revision-Date: 2018-08-17 14:56+0000\n"
-"Last-Translator: Martus Translations <translations@martus.org>\n"
+"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/I2P/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,15 +33,15 @@ msgstr "interno"
 #, java-format
 msgid "{0} inbound tunnel"
 msgid_plural "{0} inbound tunnels"
-msgstr[0] ""
+msgstr[0] "{0} túnel de entrada"
-msgstr[1] ""
+msgstr[1] "{0} túneis de entrada"
 
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:483
 #, java-format
 msgid "{0} outbound tunnel"
 msgid_plural "{0} outbound tunnels"
-msgstr[0] ""
+msgstr[0] "{0} túnel de saída"
-msgstr[1] ""
+msgstr[1] "{0} túneis de saída"
 
 #: ../java/src/net/i2p/i2ptunnel/web/EditBean.java:485
 #, java-format

apps/i2ptunnel/locale/messages_ru.po

@@ -32,8 +32,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-13 18:18+0000\n"
-"PO-Revision-Date: 2018-06-13 18:35+0000\n"
+"PO-Revision-Date: 2018-07-18 19:52+0000\n"
-"Last-Translator: Sergey Leschina <mail@putnik.tech>\n"
+"Last-Translator: ValdikSS <iam@valdikss.org.ru>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -895,7 +895,7 @@ msgstr "Список адресов jump-сервисов"
 msgid ""
 "List of helper URLs providing jump links when a host is not found in your "
 "addressbook"
-msgstr ""
+msgstr "Список ссылок на ссылки-помощники (jumplinks), которые будут предлагаться пользователю на странице ошибки в случае отсутствия адреса в адресной книге"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:825
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1861
@@ -905,7 +905,7 @@ msgstr "Дополнительные параметры"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:827
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1863
 msgid "Advanced tunnel, streaming, and I2CP options"
-msgstr ""
+msgstr "Расширенные настройки туннелей, стриминга и I2CP"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:831
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1867
@@ -1012,12 +1012,12 @@ msgstr "Аутентификация регистрации"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1120
 msgid "HTTPS configuration"
-msgstr ""
+msgstr "Настройка HTTPS"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1125
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:207
 msgid "SSL Wizard"
-msgstr ""
+msgstr "Мастер настройки SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1135
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1851
@@ -1672,7 +1672,7 @@ msgstr "Сгенерировать аутентификацию"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:166
 msgid "SSL Helper"
-msgstr ""
+msgstr "Помощник SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:632
 msgid "Experts only!"
@@ -1684,24 +1684,24 @@ msgstr "Base 32"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:676
 msgid "Alt Base 32"
-msgstr ""
+msgstr "Альтернативный адрес Base 32"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:685
 msgid "Incoming I2P Port Routing"
-msgstr ""
+msgstr "Маршрутизирование входящего порта I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:687
 msgid "I2P Port"
-msgstr ""
+msgstr "Порт I2P"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:689
 msgid "Virtual Host"
-msgstr ""
+msgstr "Виртуальный хост"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:691
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:769
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:693
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:763
@@ -1714,11 +1714,11 @@ msgstr "По умолчанию"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:761
 msgid "Jetty Server"
-msgstr ""
+msgstr "Сервер Jetty"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:765
 msgid "Configuration Files"
-msgstr ""
+msgstr "Конфигурационные файлы"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:767
 msgid "Enabled"
@@ -1730,7 +1730,7 @@ msgstr "Веб-сервер I2P (eepsite)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:973
 msgid "SSL is enabled"
-msgstr ""
+msgstr "SSL включён"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:975
 msgid "Disable SSL"
@@ -1738,23 +1738,23 @@ msgstr "Отключить SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:981
 msgid "SSL is disabled"
-msgstr ""
+msgstr "SSL отключён"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:983
 msgid "Enable SSL"
-msgstr ""
+msgstr "Включить SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:989
 msgid "New Certificate Password"
-msgstr ""
+msgstr "Новый пароль сертификата"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:997
 msgid "Generate new SSL certificate"
-msgstr ""
+msgstr "Сгенерировать новый SSL-сертификат"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:1003
 msgid "Generate SSL certificate and enable"
-msgstr ""
+msgstr "Сгенерировать SSL-сертификат и включить SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"

apps/i2ptunnel/locale/messages_tr.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-13 18:18+0000\n"
-"PO-Revision-Date: 2018-06-13 18:35+0000\n"
+"PO-Revision-Date: 2018-08-15 05:50+0000\n"
 "Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -869,7 +869,7 @@ msgstr "Sıçrama Adresi Listesi"
 msgid ""
 "List of helper URLs providing jump links when a host is not found in your "
 "addressbook"
-msgstr ""
+msgstr "Bir sunucu adres defterinde bulunamadığında sıçrama bağlantıları için kullanılacak yardımcı adreslerin listesi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:825
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1861
@@ -879,7 +879,7 @@ msgstr "Özel ayarlar"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:827
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1863
 msgid "Advanced tunnel, streaming, and I2CP options"
-msgstr ""
+msgstr "Gelişmiş tünel, akış ve I2CO ayarları"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:831
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1867
@@ -986,12 +986,12 @@ msgstr "Kayıt Kimlik Doğrulaması"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1120
 msgid "HTTPS configuration"
-msgstr ""
+msgstr "HTTPS yapılandırması"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1125
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:207
 msgid "SSL Wizard"
-msgstr ""
+msgstr "SSL Yardımcısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1135
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1851
@@ -999,7 +999,7 @@ msgid ""
 "Note: In order to enable QR code generation or registration authentication, "
 "configure the Website Hostname field (for websites) or the Name field "
 "(everything else) above with an .i2p suffixed hostname e.g. mynewserver.i2p"
-msgstr ""
+msgstr "Not: QR kodu oluşturulmasını ya da kayıt kimlik doğrulamasını etkinleştirmek için, Web Sitesi Sunucu Adı alanına (web siteleri için) ya da Ad alanına (diğerleri için) .I2p son eki ile biten sunucu adı yazın. Örnek yenisunucum.I2p"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1153
 msgid "Inbound"
@@ -1008,7 +1008,7 @@ msgstr "Gelen"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1206
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1355
 msgid "Level of Randomization for Tunnel Depth"
-msgstr ""
+msgstr "Tünel Derinliği Rastlantısallaştırma Düzeyi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1320
 msgid "Outbound"
@@ -1020,11 +1020,11 @@ msgstr "Kiralama Kümesini Şifrele"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1489
 msgid "Only clients with the encryption key will be able to connect"
-msgstr ""
+msgstr "Yalnız şifreleme anahtarı bulunan istemciler bağlanabilir"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1493
 msgid "Only allow clients with the encryption key to connect to this server"
-msgstr ""
+msgstr "Bu sunucuya yalnız şifreleme anahtarı bulunan istemciler bağlanabilsin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1495
 msgid "Encryption Key"
@@ -1036,15 +1036,15 @@ msgstr "Yeni Anahtar Üret"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1499
 msgid "Tunnel must be stopped first"
-msgstr ""
+msgstr "Önce tünel durdurulmalıdır"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1501
 msgid "Encryption key required to access this service"
-msgstr ""
+msgstr "Bu hizmete erişmek için şifreleme anahtarı gereklidir"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1505
 msgid "Generate new encryption key"
-msgstr ""
+msgstr "Yeni şifreleme anahtarı üret"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1508
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:583
@@ -1057,11 +1057,11 @@ msgstr "Kısıtlanmış Erişim Listesi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1512
 msgid "Allow all clients to connect to this service"
-msgstr ""
+msgstr "Bu hizmete tüm istemciler bağlanabilsin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1518
 msgid "Prevent listed clients from connecting to this service"
-msgstr ""
+msgstr "Listedeki istemciler bu hizmete bağlanamasın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1522
 msgid "Blacklist"
@@ -1069,7 +1069,7 @@ msgstr "Kara liste"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1524
 msgid "Only allow listed clients to connect to this service"
-msgstr ""
+msgstr "Yalnız listedeki istemciler bu hizmete bağlanabilsin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1528
 msgid "Whitelist"
@@ -1081,31 +1081,31 @@ msgstr "Erişim Listesi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1532
 msgid "Specify clients, 1 per line"
-msgstr ""
+msgstr "Her satıra bir istemci yazın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1534
 msgid "Control access to this service"
-msgstr ""
+msgstr "Bu hizmete erişimi yapılandırın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1538
 msgid "Server Access Options"
-msgstr ""
+msgstr "Sunucu Erişimi Ayarları"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1543
 msgid "Prevent clients from accessing this service via an inproxy"
-msgstr ""
+msgstr "Bir giriş vekil sunucusundan gelen istemciler bu hizmete erişemesin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1547
 msgid "Block Access via Inproxies"
-msgstr "Erişimi Giriş Vekil Sunucuları ile Engelle"
+msgstr "Giriş Vekil Sunucularından Gelenlerin Erişimini Engelle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1551
 msgid "Block Accesses containing Referers"
-msgstr "Şu Referrer Bilgisiyle Gelen Erişimleri Engelle"
+msgstr "Şu Referrer Bilgisiyle Gelenlerin Erişimlerini Engelle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1553
 msgid "Deny User-Agents matching these strings (probably from inproxies)"
-msgstr ""
+msgstr "User-Agent bilgisi şu dizgelere uyanların erişimini engelle (olasılıkla gelen vekil sunucularından)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1557
 msgid "Block these User-Agents"
@@ -1113,13 +1113,13 @@ msgstr "Şu User-Agent Bilgisiyle Gelen Erişimleri Engelle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1559
 msgid "comma separated, e.g. Mozilla,Opera (case-sensitive)"
-msgstr ""
+msgstr "virgül ile ayırarak yazın. Örnek: Mozilla,Opera (büyük küçük harfe duyarlıdır)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1566
 msgid ""
 "Use unique IP addresses for each connecting client (local non-SSL servers "
 "only)"
-msgstr ""
+msgstr "Bağlanan her istemci için ayrı IP adresi kullanılsın (yalnız yerel ve SSL olmayan sunucular)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1570
 msgid "Unique Local Address per Client"
@@ -1127,7 +1127,7 @@ msgstr "Her İstemci için Tekil Yerel Adres"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1572
 msgid "Only enable if you are hosting this service on multiple routers"
-msgstr ""
+msgstr "Bu seçeneği yalnız bu hizmeti birden çok yöneltici üzerinden sunuyorsanız etkinleştirin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1576
 msgid "Optimize for Multihoming"
@@ -1135,7 +1135,7 @@ msgstr "Çoklu Ev için İyileştirilsin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1578
 msgid "Server Throttling"
-msgstr ""
+msgstr "Sunucu Hızını Yavaşlatma"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1580
 msgid "Inbound connection limits (0=unlimited)"
@@ -1143,38 +1143,38 @@ msgstr "Genel bağlantı sınırlaması (0=sınırsız)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1582
 msgid "Per Minute"
-msgstr ""
+msgstr "Bir Dakikada"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1584
 msgid "Per Hour"
-msgstr ""
+msgstr "Bir Saatte"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1586
 msgid "Per Day"
-msgstr ""
+msgstr "Bir Günde"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1588
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1631
 msgid "Per Client"
-msgstr ""
+msgstr "Bir İstemcide"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1590
 msgid ""
 "Maximum number of web page requests per minute for a unique client before "
 "access to the server is blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir dakikada yapabileceği en fazla web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1594
 msgid ""
 "Maximum number of web page requests per hour for a unique client before "
 "access to the server is blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir saatte yapabileceği en fazla web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1598
 msgid ""
 "Maximum number of web page requests per day for a unique client before "
 "access to the server is blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir günde yapabileceği en fazla web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1602
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1643
@@ -1185,19 +1185,19 @@ msgstr "Toplam"
 msgid ""
 "Total number of web page requests per minute before access to the server is "
 "blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir dakikada yapabileceği toplam web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1608
 msgid ""
 "Total number of web page requests per hour before access to the server is "
 "blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir saatte yapabileceği toplam web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1612
 msgid ""
 "Total number of web page requests per day before access to the server is "
 "blocked"
-msgstr ""
+msgstr "Bir istemcinin erişiminin engellenmesinden önce sunucudan bir günde yapabileceği toplam web sayfası isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1616
 msgid "Max concurrent connections (0=unlimited)"
@@ -1205,7 +1205,7 @@ msgstr "En fazla eşzamanlı bağlantı sayısı (0=sınırsız)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1618
 msgid "Maximum number of simultaneous client connections"
-msgstr ""
+msgstr "En fazla eşzamanlı istemci bağlantısı sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1625
 msgid "POST limits (0=unlimited)"
@@ -1213,23 +1213,23 @@ msgstr "POST sınırlaması (0=sınırsız)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1627
 msgid "Per Period"
-msgstr ""
+msgstr "Bir Dönemde"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1629
 msgid "Ban Duration"
-msgstr ""
+msgstr "Engelleme Süresi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1633
 msgid ""
 "Maximum number of post requests permitted for a unique client for the "
 "configured timespan"
-msgstr ""
+msgstr "Belirtilen zaman aralığında tekil bir istemci için izin verilen en fazla ileti isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1637
 msgid ""
 "If a client exceeds the maximum number of post requests per allocated "
 "period, enforce a ban for this number of minutes"
-msgstr ""
+msgstr "Bir istemci belirlenen zaman aralığında en fazla ileti isteği sayısını aşarsa, bu kadar dakika süreyle engellenir"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1641
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1653
@@ -1240,47 +1240,47 @@ msgstr "dakika"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1645
 msgid "Total number of post requests permitted for the configured timespan"
-msgstr ""
+msgstr "Belirtilen zaman aralığında izin verilen toplam ileti isteği sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1649
 msgid ""
 "If the maximum number of post requests per allocated period is exceeded, "
 "enforce a global access ban for this number of minutes"
-msgstr ""
+msgstr "Belirlenen zaman aralığında toplam ileti isteği sayısı aşılırsa, bu kadar dakika süreyle genel engelleme uygulanır"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1655
 msgid "POST limit period"
-msgstr ""
+msgstr "POST sınırı zaman aralığı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1657
 msgid ""
 "Timespan for the maximum number of post requests to be reached before a ban "
 "is triggered"
-msgstr ""
+msgstr "En fazla ileti sayısı isteği aşıldığında engellemenin yapılacağı zaman aralığı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1674
 msgid "Number of tunnels to keep open to maintain availability of service"
-msgstr ""
+msgstr "Hizmet sürekliliğini sağlamak için açık tutulacak tünel sayısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1680
 msgid "Period of inactivity before tunnel number is reduced"
-msgstr ""
+msgstr "Etkinlik olmadığında tünel sayısının azaltılması için beklenecek zaman aralığı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1791
 msgid "Alternate private key file"
-msgstr ""
+msgstr "Alternatif özel anahtar dosyası"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1802
 msgid "Alternate local destination"
-msgstr ""
+msgstr "Alternatif yerel hedef"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1804
 msgid "Read Only: Alternate Local Destination"
-msgstr ""
+msgstr "Salt Okunur: Alternatif Yerel Hedef"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/edit_jsp.java:1886
 msgid "Tunnels not initialized yet; please retry in a few moments."
-msgstr ""
+msgstr "Henüz tüneller oluşturulmamış. Lütfen kısa süre sonra yeniden deneyin."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:165
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:617
@@ -1297,7 +1297,7 @@ msgstr "Temizle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:191
 msgid "Global Tunnel Control"
-msgstr ""
+msgstr "Genel Tünel Denetimi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:193
 msgid "Tunnel Wizard"
@@ -1340,19 +1340,19 @@ msgstr "Denetim"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:229
 msgid "Edit Server Tunnel Settings for"
-msgstr ""
+msgstr "Şunun İçin Sunucu Tünel Ayarlarını Düzenle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:244
 msgid "Test HTTPS server, bypassing I2P"
-msgstr ""
+msgstr "I2P üzerinden geçmeden HTTPS sunucuyu sına"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:252
 msgid "Test HTTP server, bypassing I2P"
-msgstr ""
+msgstr "I2P üzerinden geçmeden HTTP sunucuyu sına"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:273
 msgid "Test HTTP server through I2P"
-msgstr ""
+msgstr "I2P üzerinden HTTP sunucuyu sına"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:282
 msgid "Base32 Address"
@@ -1373,7 +1373,7 @@ msgstr "Başlatılıyor..."
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:322
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:442
 msgid "Stop this Tunnel"
-msgstr ""
+msgstr "Bu Tüneli Durdur"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:310
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:329
@@ -1400,7 +1400,7 @@ msgstr "Durduruldu"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:341
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:495
 msgid "Start this Tunnel"
-msgstr ""
+msgstr "Bu Tüneli Başlat"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:348
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:502
@@ -1445,7 +1445,7 @@ msgstr "Arayüz"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:404
 msgid "Edit Tunnel Settings for"
-msgstr ""
+msgstr "Şunun İçin Tünel Ayarlarını Düzenle"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:456
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:459
@@ -1483,7 +1483,7 @@ msgstr "Uygun kimlik doğrulama verilerinin tamamını kopyalayıp sık kulland
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:233
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:679
 msgid "Tunnel name"
-msgstr ""
+msgstr "Tünel adı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:241
 msgid "Website name"
@@ -1491,7 +1491,7 @@ msgstr "Web sitesi adı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:249
 msgid "Local Destination"
-msgstr ""
+msgstr "Yerel Hedef"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:257
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:647
@@ -1519,7 +1519,7 @@ msgstr "Hedef imzalama anahtarı yok. Tüneli başlatın."
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:289
 #, java-format
 msgid "Authentication for adding host {0}"
-msgstr ""
+msgstr "{0} sunucusunu eklemek için kimlik doğrulaması"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:291
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:306
@@ -1530,7 +1530,7 @@ msgstr ""
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:481
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:520
 msgid "Copy and paste this to the registration site"
-msgstr ""
+msgstr "Bunu kopyalayıp kayıt sunucusuna yapıştırın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:296
 msgid "Advanced authentication strings"
@@ -1539,7 +1539,7 @@ msgstr "Gelişmiş kimlik doğrulama dizgeleri"
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:304
 #, java-format
 msgid "Authentication for removing host {0}"
-msgstr ""
+msgstr "{0} sunucusunu kaldırmak için kimlik doğrulaması"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:335
 msgid "Authentication for changing name"
@@ -1558,7 +1558,7 @@ msgstr "Bu tünel yeni bir sunucu adına göre ayarlanmalıdır."
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:357
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:390
 msgid "Enter old hostname below."
-msgstr ""
+msgstr "Aşağıya eski sunucu adını yazın."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:368
 msgid "Authentication for adding alias"
@@ -1634,7 +1634,7 @@ msgstr "Gerekli ögeler için yukarıya bakın."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:572
 msgid "Old hostname"
-msgstr ""
+msgstr "Eski sunucu adı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:576
 msgid "Private Key File for old Destination"
@@ -1642,11 +1642,11 @@ msgstr "Eski Hedefin Kişisel Anahtar Dosyası"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/register_jsp.java:580
 msgid "Generate Authentication"
-msgstr ""
+msgstr "Kimlik Doğrulaması Üret"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:166
 msgid "SSL Helper"
-msgstr ""
+msgstr "SSL Yardımcısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:632
 msgid "Experts only!"
@@ -1658,24 +1658,24 @@ msgstr "Base 32"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:676
 msgid "Alt Base 32"
-msgstr ""
+msgstr "Alt Base 32"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:685
 msgid "Incoming I2P Port Routing"
-msgstr ""
+msgstr "Gelen I2P Kapı Yöneltmesi"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:687
 msgid "I2P Port"
-msgstr ""
+msgstr "I2P Kapısı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:689
 msgid "Virtual Host"
-msgstr ""
+msgstr "Sanal Sunucu"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:691
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:769
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:693
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:763
@@ -1688,11 +1688,11 @@ msgstr "Varsayılan"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:761
 msgid "Jetty Server"
-msgstr ""
+msgstr "Jetty Sunucusu"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:765
 msgid "Configuration Files"
-msgstr ""
+msgstr "Yapılandırma Dosyaları"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:767
 msgid "Enabled"
@@ -1704,31 +1704,31 @@ msgstr "I2P web sunucusu (eepsitesi)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:973
 msgid "SSL is enabled"
-msgstr ""
+msgstr "SSL etkin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:975
 msgid "Disable SSL"
-msgstr ""
+msgstr "SSL Devre Dışı Bırakılsın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:981
 msgid "SSL is disabled"
-msgstr ""
+msgstr "SSL devre dışı"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:983
 msgid "Enable SSL"
-msgstr ""
+msgstr "SSL Etkinleştirilsin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:989
 msgid "New Certificate Password"
-msgstr ""
+msgstr "Yeni Sertifika Parolası"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:997
 msgid "Generate new SSL certificate"
-msgstr ""
+msgstr "Yeni SSL sertifikası üret"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/ssl_jsp.java:1003
 msgid "Generate SSL certificate and enable"
-msgstr ""
+msgstr "SSL sertifikası üret ve etkinleştir"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:178
 msgid "I2P Tunnel Manager - Tunnel Creation Wizard"
@@ -1934,7 +1934,7 @@ msgstr "Streamr için isteğe göre uyarlanmış bir sunucu tüneli."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:350
 msgid "Select tunnel type"
-msgstr ""
+msgstr "Tünel türünü seçin"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:383
 msgid "Choose a name and description for your tunnel."
@@ -1960,7 +1960,7 @@ msgstr "Virgül ile ayırarak birden çok sunucu yazabilirsiniz."
 msgid ""
 "List of I2P outproxy destinations, separated with commas (e.g. "
 "proxy1.i2p,proxy2.i2p)"
-msgstr ""
+msgstr "I2P giden vekil sunucu hedeflerinin listesini virgül ile ayırarak yazın (Örnek: vekilsunucu1.i2p,vekilsunucu2.i2p)"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:441
 msgid ""
@@ -1972,11 +1972,11 @@ msgstr "Bu istemci tünelinin bağlanması gereken I2P hedef hizmetini yazın."
 msgid ""
 "This could be the full base 64 destination key, or an I2P URL from your "
 "address book."
-msgstr "Tam Base 64 hedef anahtarı, ya da adres defterinizdeki bir I2P İnternet adresi olabilir."
+msgstr "Tam Base 64 hedef anahtarı, ya da adres defterinizdeki bir I2P adresi olabilir."
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:447
 msgid "Enter a b64 or .i2p address here"
-msgstr ""
+msgstr "Buraya bir b64 ya da .i2p adresi yazın"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:478
 msgid ""
@@ -2057,15 +2057,15 @@ msgstr "Aşağıda belirttiğiniz ayarların özetini görebilirsiniz:"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:683
 msgid "Tunnel description"
-msgstr ""
+msgstr "Tünel açıklaması"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:709
 msgid "Binding address"
-msgstr ""
+msgstr "Bağlanacak adres"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:717
 msgid "Tunnel port"
-msgstr ""
+msgstr "Tünel kapı numarası"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:751
 msgid ""
@@ -2082,11 +2082,11 @@ msgstr "Yardımcı gelişmiş ayarlar için makul varsayılan değerler kullanı
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:790
 msgid "Cancel the wizard and return to Tunnel Manager home page"
-msgstr ""
+msgstr "Yardımcıyı iptal et ve Tünel Yöneticisi ana sayfasına geri dön"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:797
 msgid "Return to previous page"
-msgstr ""
+msgstr "Önceki sayfaya dön"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:800
 msgid "Previous"
@@ -2094,7 +2094,7 @@ msgstr "Önceki"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:808
 msgid "Save tunnel configuration"
-msgstr ""
+msgstr "Tünel yapılandırmasını kaydet"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:811
 msgid "Save Tunnel"
@@ -2102,7 +2102,7 @@ msgstr "Tüneli Kaydet"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:817
 msgid "Finish Wizard and review tunnel settings"
-msgstr ""
+msgstr "Yardımcıyı tamamla ve tünel ayarlarını gözden geçir"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:820
 msgid "Finish"
@@ -2110,7 +2110,7 @@ msgstr "Tamam"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:826
 msgid "Advance to next page"
-msgstr ""
+msgstr "Sonraki sayfaya geç"
 
 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/wizard_jsp.java:829
 msgid "Next"

apps/jetty/build.xml

@@ -18,7 +18,7 @@
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
-    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
+    <property name="jetty.sha1" value="086212b8536faa9a584777ebd59618fa4d7176a0" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
     <!-- change jetty.ver to jetty.branch for 9.3 -->
     <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" />

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java

@@ -169,8 +169,8 @@ public class I2PSocketEepGet extends EepGet {
                 // This currently duplicates what SocketTimeout is doing in EepGet,
                 // but when that's ripped out of EepGet to use setsotimeout, we'll need this.
                 Properties props = new Properties();
-                props.setProperty(I2PSocketOptions.PROP_CONNECT_TIMEOUT, "" + CONNECT_TIMEOUT);
+                props.setProperty(I2PSocketOptions.PROP_CONNECT_TIMEOUT, Integer.toString(CONNECT_TIMEOUT));
-                props.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, "" + INACTIVITY_TIMEOUT);
+                props.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, Integer.toString(INACTIVITY_TIMEOUT));
                 // This is important - even if the underlying socket doesn't have a connect delay,
                 // we want to set it for this connection, so the request headers will go out
                 // in the SYN packet, saving one RTT.

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

@@ -240,7 +240,7 @@ public class I2PSocketManagerFactory {
         if (i2cpHost != null)
             opts.setProperty(I2PClient.PROP_TCP_HOST, i2cpHost);
         if (i2cpPort > 0)
-            opts.setProperty(I2PClient.PROP_TCP_PORT, "" + i2cpPort);
+            opts.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(i2cpPort));
         
         I2PSession session = client.createSession(myPrivateKeyStream, opts);
         if (connect)

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

@@ -130,7 +130,7 @@ public class CSSHelper extends HelperBase {
     public void setRefresh(String r) {
         try {
             if (Integer.parseInt(r) < MIN_REFRESH)
-                r = "" + MIN_REFRESH;
+                r = Integer.toString(MIN_REFRESH);
             _context.router().saveConfig(PROP_REFRESH, r);
         } catch (RuntimeException e) {
         }
@@ -141,9 +141,9 @@ public class CSSHelper extends HelperBase {
         String r = _context.getProperty(PROP_REFRESH, DEFAULT_REFRESH);
         try {
             if (Integer.parseInt(r) < MIN_REFRESH)
-                r = "" + MIN_REFRESH;
+                r = Integer.toString(MIN_REFRESH);
         } catch (RuntimeException e) {
-            r = "" + MIN_REFRESH;
+            r = Integer.toString(MIN_REFRESH);
         }
         return r;
     }

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

@@ -55,7 +55,7 @@ public class ConfigUpdateHandler extends FormHandler {
     public static final String DEFAULT_PROXY_HOST = "127.0.0.1";
     public static final String PROP_PROXY_PORT = "router.updateProxyPort";
     public static final int DEFAULT_PROXY_PORT_INT = 4444;
-    public static final String DEFAULT_PROXY_PORT = "" + DEFAULT_PROXY_PORT_INT;
+    public static final String DEFAULT_PROXY_PORT = Integer.toString(DEFAULT_PROXY_PORT_INT);
     /** default false */
     public static final String PROP_UPDATE_UNSIGNED = "router.updateUnsigned";
     /** default false - use for distros */
@@ -251,7 +251,7 @@ public class ConfigUpdateHandler extends FormHandler {
         long oldFreq = DEFAULT_REFRESH_FREQ;
         try { oldFreq = Long.parseLong(oldFreqStr); } catch (NumberFormatException nfe) {}
         if (_refreshFrequency != oldFreq) {
-            changes.put(PROP_REFRESH_FREQUENCY, ""+_refreshFrequency);
+            changes.put(PROP_REFRESH_FREQUENCY, Long.toString(_refreshFrequency));
             addFormNoticeNoEscape(_t("Updating refresh frequency to {0}",
                             _refreshFrequency <= 0 ? _t("Never") : DataHelper.formatDuration2(_refreshFrequency)));
         }

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

@@ -176,6 +176,17 @@ public class SummaryListener implements RateSummaryListener {
                 rrdFile.delete();
         } catch (IOException ioe) {
             _log.error("Error starting RRD for stat " + baseName, ioe);
+        } catch (NoSuchMethodError nsme) {
+            // Covariant fail Java 8/9/10
+            // java.lang.NoSuchMethodError: java.nio.MappedByteBuffer.position(I)Ljava/nio/MappedByteBuffer;
+            // see e.g. https://jira.mongodb.org/browse/JAVA-2559
+            _log.error("Error starting RRD for stat " + baseName, nsme);
+            String s = "Error:" +
+                       "\nCompiler JDK mismatch with JRE version " + System.getProperty("java.version") +
+                       " and no bootclasspath specified when building." +
+                       "\nContact packager.";
+            _log.log(Log.CRIT, s);
+            System.out.println(s);
         } catch (Throwable t) {
             _log.error("Error starting RRD for stat " + baseName, t);
         }

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java

@@ -107,7 +107,6 @@ public class ConfigAdvancedHandler extends FormHandler {
         boolean saved = _context.router().saveConfig(ConfigAdvancedHelper.PROP_FLOODFILL_PARTICIPANT, _ff);
         if (_ff.equals("false") || _ff.equals("true")) {
             FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb();
-            boolean wasFF = fndf.floodfillEnabled();
             boolean isFF = _ff.equals("true");
             // this will rebuild the RI, log in the event log, etc.
             fndf.setFloodfillEnabled(isFF);

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHandler.java

@@ -361,7 +361,7 @@ public class ConfigClientsHandler extends FormHandler {
             String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
             Object val = _settings.get(app + ".enabled");
             if (! RouterConsoleRunner.ROUTERCONSOLE.equals(app))
-                props.setProperty(name, "" + (val != null));
+                props.setProperty(name, Boolean.toString(val != null));
         }
         RouterConsoleRunner.storeWebAppProperties(_context, props);
         addFormNotice(_t("WebApp configuration saved."));
@@ -375,7 +375,7 @@ public class ConfigClientsHandler extends FormHandler {
                 continue;
             String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));
             Object val = _settings.get(app + ".enabled");
-            props.setProperty(name, "" + (val != null));
+            props.setProperty(name, Boolean.toString(val != null));
         }
         PluginStarter.storePluginProperties(props);
         addFormNotice(_t("Plugin configuration saved."));

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java

@@ -148,7 +148,8 @@ public class ConfigClientsHelper extends HelperBase {
                 showStart = clientApp == null;
                 showStop = clientApp != null && clientApp.getState() == ClientAppState.RUNNING;
             }
-            renderForm(buf, ""+cur, ca.clientName,
+            String scur = Integer.toString(cur);
+            renderForm(buf, scur, ca.clientName,
                        // urlify, enabled
                        false, !ca.disabled,
                        // read only, preventDisable
@@ -158,7 +159,7 @@ public class ConfigClientsHelper extends HelperBase {
                        // description
                        DataHelper.escapeHTML(ca.className + ((ca.args != null) ? " " + ca.args : "")),
                        // edit
-                       allowEdit && (""+cur).equals(_edit),
+                       allowEdit && scur.equals(_edit),
                        // show edit button, show update button
                        // Don't allow edit if it's running, or else we would lose the "handle" to the ClientApp to stop it.
                        allowEdit && !showStop, false, 
@@ -169,7 +170,7 @@ public class ConfigClientsHelper extends HelperBase {
         }
         
         if (allowEdit && "new".equals(_edit))
-            renderForm(buf, "" + clients.size(), "", false, false, false, false, "", true, false, false, false, false, false);
+            renderForm(buf, Integer.toString(clients.size()), "", false, false, false, false, "", true, false, false, false, false, false);
         buf.append("</table>\n");
         return buf.toString();
     }

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigHomeHandler.java

@@ -27,7 +27,7 @@ public class ConfigHomeHandler extends FormHandler {
             boolean old = _context.getBooleanProperty(HomeHelper.PROP_OLDHOME);
             boolean nnew = getJettyString("oldHome") != null;
             if (old != nnew) {
-                _context.router().saveConfig(HomeHelper.PROP_OLDHOME, "" + nnew);
+                _context.router().saveConfig(HomeHelper.PROP_OLDHOME, Boolean.toString(nnew));
                 addFormNotice(_t("Home page changed"));
             }
         } else if (adding || deleting || restoring) {

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java

@@ -282,7 +282,7 @@ public class ConfigNetHandler extends FormHandler {
                 }
                 if (valid) {
                     changes.put(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_IP, _ntcpAutoIP);
-                    changes.put(TransportManager.PROP_ENABLE_NTCP, "" + !"disabled".equals(_ntcpAutoIP));
+                    changes.put(TransportManager.PROP_ENABLE_NTCP, Boolean.toString(!"disabled".equals(_ntcpAutoIP)));
                     restartRequired = true;
                 }
             }
@@ -304,7 +304,7 @@ public class ConfigNetHandler extends FormHandler {
                     removes.add(ConfigNetHelper.PROP_I2NP_NTCP_PORT);
                     addFormNotice(_t("Updating inbound TCP port to auto"));
                 }
-                changes.put(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, "" + _ntcpAutoPort);
+                changes.put(ConfigNetHelper.PROP_I2NP_NTCP_AUTO_PORT, Boolean.toString(_ntcpAutoPort));
                 restartRequired = true;
             }
 
@@ -339,15 +339,15 @@ public class ConfigNetHandler extends FormHandler {
             // If hidden mode value changes, restart is required
             switchRequired = _hiddenMode != _context.router().isHidden();
             if (switchRequired) {
-                changes.put(PROP_HIDDEN, "" + _hiddenMode);
+                changes.put(PROP_HIDDEN, Boolean.toString(_hiddenMode));
                 if (_hiddenMode)
                     addFormError(_t("Gracefully restarting into Hidden Router Mode"));
                 else
                     addFormError(_t("Gracefully restarting to exit Hidden Router Mode"));
             }
 
-            changes.put(Router.PROP_REBUILD_KEYS, "" + switchRequired);
+            changes.put(Router.PROP_REBUILD_KEYS, Boolean.toString(switchRequired));
-            changes.put(Router.PROP_DYNAMIC_KEYS, "" + _dynamicKeys);
+            changes.put(Router.PROP_DYNAMIC_KEYS, Boolean.toString(_dynamicKeys));
 
             if (_context.getBooleanPropertyDefaultTrue(TransportManager.PROP_ENABLE_UPNP) !=
                 _upnp) {
@@ -358,7 +358,7 @@ public class ConfigNetHandler extends FormHandler {
                     addFormNotice(_t("Disabling UPnP"));
                 addFormNotice(_t("Restart required to take effect"));
             }
-            changes.put(TransportManager.PROP_ENABLE_UPNP, "" + _upnp);
+            changes.put(TransportManager.PROP_ENABLE_UPNP, Boolean.toString(_upnp));
 
             if (Boolean.parseBoolean(_context.getProperty(UDPTransport.PROP_LAPTOP_MODE)) !=
                 _laptop) {
@@ -368,7 +368,7 @@ public class ConfigNetHandler extends FormHandler {
                 else
                     addFormNotice(_t("Disabling laptop mode"));
             }
-            changes.put(UDPTransport.PROP_LAPTOP_MODE, "" + _laptop);
+            changes.put(UDPTransport.PROP_LAPTOP_MODE, Boolean.toString(_laptop));
 
             if (Boolean.parseBoolean(_context.getProperty(TransportUtil.PROP_IPV4_FIREWALLED)) !=
                 _ipv4Firewalled) {
@@ -378,7 +378,7 @@ public class ConfigNetHandler extends FormHandler {
                     addFormNotice(_t("Enabling inbound IPv4"));
                 restartRequired = true;
             }
-            changes.put(TransportUtil.PROP_IPV4_FIREWALLED, "" + _ipv4Firewalled);
+            changes.put(TransportUtil.PROP_IPV4_FIREWALLED, Boolean.toString(_ipv4Firewalled));
 
             if (Boolean.parseBoolean(_context.getProperty(TransportUtil.PROP_IPV6_FIREWALLED)) !=
                 _ipv6Firewalled) {
@@ -388,7 +388,7 @@ public class ConfigNetHandler extends FormHandler {
                     addFormNotice(_t("Enabling inbound IPv6"));
                 restartRequired = true;
             }
-            changes.put(TransportUtil.PROP_IPV6_FIREWALLED, "" + _ipv6Firewalled);
+            changes.put(TransportUtil.PROP_IPV6_FIREWALLED, Boolean.toString(_ipv6Firewalled));
 
             if (_context.getBooleanPropertyDefaultTrue(TransportManager.PROP_ENABLE_UDP) !=
                 !_udpDisabled) {
@@ -398,7 +398,7 @@ public class ConfigNetHandler extends FormHandler {
                     addFormNotice(_t("Enabling UDP"));
                 restartRequired = true;
             }
-            changes.put(TransportManager.PROP_ENABLE_UDP, "" + (!_udpDisabled));
+            changes.put(TransportManager.PROP_ENABLE_UDP, Boolean.toString(!_udpDisabled));
 
             if (_requireIntroductions) {
                 changes.put(UDPTransport.PROP_FORCE_INTRODUCERS, "true");

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigStatsHandler.java

@@ -113,7 +113,7 @@ public class ConfigStatsHandler extends FormHandler {
         boolean graphsChanged = !_graphs.equals(_context.getProperty("stat.summaries"));
         changes.put("stat.summaries", _graphs);
         boolean fullChanged = _context.getBooleanProperty(StatManager.PROP_STAT_FULL) != _isFull;
-        changes.put(StatManager.PROP_STAT_FULL, "" + _isFull);
+        changes.put(StatManager.PROP_STAT_FULL, Boolean.toString(_isFull));
         _context.router().saveConfig(changes, null);
         if (!_stats.isEmpty())
             addFormNotice(_t("Stat filter and location updated successfully to") + ": " + stats.toString());

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigSummaryHandler.java

@@ -30,7 +30,7 @@ public class ConfigSummaryHandler extends FormHandler {
             try {
                 int refreshInterval = Integer.parseInt(getJettyString("refreshInterval"));
                 if (refreshInterval >= CSSHelper.MIN_REFRESH) {
-                    _context.router().saveConfig(CSSHelper.PROP_REFRESH, "" + refreshInterval);
+                    _context.router().saveConfig(CSSHelper.PROP_REFRESH, Integer.toString(refreshInterval));
                     addFormNotice(_t("Refresh interval changed"));
                 } else
                     addFormError(_t("Refresh interval must be at least {0} seconds", CSSHelper.MIN_REFRESH));
@@ -102,10 +102,11 @@ public class ConfigSummaryHandler extends FormHandler {
                         continue;
                     }
                 }
-                for (Iterator<Integer> iter = sections.keySet().iterator(); iter.hasNext(); ) {
+                for (Iterator<Map.Entry<Integer, String>> iter = sections.entrySet().iterator(); iter.hasNext(); ) {
-                    int i = iter.next();
+                    Map.Entry<Integer, String> e = iter.next();
+                    Integer i = e.getKey();
                     if (toDelete.contains(i)) {
-                        String removedName = sections.get(i);
+                        String removedName = e.getValue();
                         iter.remove();
                         addFormNotice(_t("Removed") + ": " + removedName);
                     }

apps/routerconsole/java/src/net/i2p/router/web/helpers/GraphHelper.java

@@ -477,13 +477,13 @@ public class GraphHelper extends FormHandler {
             _graphHideLegend != _context.getProperty(PROP_LEGEND, DEFAULT_LEGEND) ||
             _persistent != _context.getBooleanPropertyDefaultTrue(SummaryListener.PROP_PERSISTENT)) {
             Map<String, String> changes = new HashMap<String, String>();
-            changes.put(PROP_X, "" + _width);
+            changes.put(PROP_X, Integer.toString(_width));
-            changes.put(PROP_Y, "" + _height);
+            changes.put(PROP_Y, Integer.toString(_height));
-            changes.put(PROP_PERIODS, "" + _periodCount);
+            changes.put(PROP_PERIODS, Integer.toString(_periodCount));
-            changes.put(PROP_REFRESH, "" + _refreshDelaySeconds);
+            changes.put(PROP_REFRESH, Integer.toString(_refreshDelaySeconds));
-            changes.put(PROP_EVENTS, "" + _showEvents);
+            changes.put(PROP_EVENTS, Boolean.toString(_showEvents));
-            changes.put(PROP_LEGEND, "" + _graphHideLegend);
+            changes.put(PROP_LEGEND, Boolean.toString(_graphHideLegend));
-            changes.put(SummaryListener.PROP_PERSISTENT, "" + _persistent);
+            changes.put(SummaryListener.PROP_PERSISTENT, Boolean.toString(_persistent));
             _context.router().saveConfig(changes, null);
             addFormNotice(_t("Graph settings saved"));
         }

apps/routerconsole/jsp/console.jsp

@@ -47,8 +47,7 @@
     <a href="/console?lang=el&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=gr" title="Greek ελληνικά" alt="Greek ελληνικά"></a>
     <a href="/console?lang=in&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=id" title="bahasa Indonesia" alt="bahasa Indonesia"></a>
     <a href="/console?lang=it&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
-    <a href="/console?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a>
+    <a href="/console?lang=ja&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=jp" title="Japanese 日本語" alt="Japanese 日本語"></a><br>
-<br>
     <a href="/console?lang=ko&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=kr" title="Korean 한국어" alt="Korean 한국어"></a>
     <a href="/console?lang=mg&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=mg" title="Malagasy" alt="Malagasy"></a>
     <a href="/console?lang=hu&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=hu" title="Magyar" alt="Magyar"></a>

apps/routerconsole/locale-countries/messages_hr.po

@@ -0,0 +1,776 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the routerconsole package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# Igor <lyricaltumor@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-17 01:33+0000\n"
+"PO-Revision-Date: 2017-09-22 11:56+0000\n"
+"Last-Translator: Igor <lyricaltumor@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/otf/I2P/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+msgid "Anonymous Proxy"
+msgstr "Anonimni proxy"
+
+msgid "Satellite Provider"
+msgstr "Satelitski davatelj"
+
+msgid "Andorra"
+msgstr "Andora"
+
+msgid "United Arab Emirates"
+msgstr "Ujedinjeni Arapski Emirati"
+
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+msgid "Antigua and Barbuda"
+msgstr "Antigua i Barbuda"
+
+msgid "Anguilla"
+msgstr "Anguilla"
+
+msgid "Albania"
+msgstr "Albanija"
+
+msgid "Armenia"
+msgstr "Armenija"
+
+msgid "Netherlands Antilles"
+msgstr "Nizozemski Antili"
+
+msgid "Angola"
+msgstr "Angola"
+
+msgid "Asia/Pacific Region"
+msgstr "Regija Azija/Pacifik"
+
+msgid "Antarctica"
+msgstr "Antarktika"
+
+msgid "Argentina"
+msgstr "Argentina"
+
+msgid "American Samoa"
+msgstr "Američka Samoa"
+
+msgid "Austria"
+msgstr "Austrija"
+
+msgid "Australia"
+msgstr "Australija"
+
+msgid "Aruba"
+msgstr "Aruba"
+
+msgid "Åland Islands"
+msgstr "Alandski otoci"
+
+msgid "Azerbaijan"
+msgstr "Azerbajdžan"
+
+msgid "Bosnia and Herzegovina"
+msgstr "Bosna i Hercegovina"
+
+msgid "Barbados"
+msgstr "Barbados"
+
+msgid "Bangladesh"
+msgstr "Bangladeš"
+
+msgid "Belgium"
+msgstr "Belgija"
+
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+msgid "Bulgaria"
+msgstr "Bugarska"
+
+msgid "Bahrain"
+msgstr "Bahrein"
+
+msgid "Burundi"
+msgstr "Burundi"
+
+msgid "Benin"
+msgstr "Benin"
+
+msgid "Saint Barthélemy"
+msgstr "Sveti Bartolomej"
+
+msgid "Bermuda"
+msgstr "Bermudi"
+
+msgid "Brunei Darussalam"
+msgstr "Brunej"
+
+msgid "Bolivia"
+msgstr "Bolivija"
+
+msgid "Bonaire"
+msgstr "Bonaire"
+
+msgid "Brazil"
+msgstr "Brazil"
+
+msgid "Bahamas"
+msgstr "Bahami"
+
+msgid "Bhutan"
+msgstr "Butan"
+
+msgid "Bouvet Island"
+msgstr "Otok Bouvet"
+
+msgid "Botswana"
+msgstr "Bocvana"
+
+msgid "Belarus"
+msgstr "Bjelorusija"
+
+msgid "Belize"
+msgstr "Belize"
+
+msgid "Canada"
+msgstr "Kanada"
+
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosov (Keeling) otok"
+
+msgid "Congo"
+msgstr "Kongo"
+
+msgid "Central African Republic"
+msgstr "Srednjoafrička Republika"
+
+msgid "Switzerland"
+msgstr "Švicarska"
+
+msgid "Cote D'Ivoire"
+msgstr "Obala Bjelokosti"
+
+msgid "Cook Islands"
+msgstr "Cookovo otočje"
+
+msgid "Chile"
+msgstr "Čile"
+
+msgid "Cameroon"
+msgstr "Kamerun"
+
+msgid "China"
+msgstr "Kina"
+
+msgid "Colombia"
+msgstr "Kolumbija"
+
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+msgid "Serbia and Montenegro"
+msgstr "Srbija i Crna Gora"
+
+msgid "Cuba"
+msgstr "Kuba"
+
+msgid "Cape Verde"
+msgstr "Cape Verde"
+
+msgid "Curaçao"
+msgstr "Curaçao"
+
+msgid "Christmas Island"
+msgstr "Božićni otok"
+
+msgid "Cyprus"
+msgstr "Cipar"
+
+msgid "Czech Republic"
+msgstr "Češka Republika"
+
+msgid "Germany"
+msgstr "Njemačka"
+
+msgid "Djibouti"
+msgstr "Djibouti"
+
+msgid "Denmark"
+msgstr "Danska"
+
+msgid "Dominica"
+msgstr "Dominika"
+
+msgid "Dominican Republic"
+msgstr "Dominikanska Republika"
+
+msgid "Algeria"
+msgstr "Alžir"
+
+msgid "Ecuador"
+msgstr "Ekvador"
+
+msgid "Estonia"
+msgstr "Estonija"
+
+msgid "Egypt"
+msgstr "Egipat"
+
+msgid "Western Sahara"
+msgstr "Zapadna Sahara"
+
+msgid "Eritrea"
+msgstr "Eritreja"
+
+msgid "Spain"
+msgstr "Španjolska"
+
+msgid "Ethiopia"
+msgstr "Etiopija"
+
+msgid "European Union"
+msgstr "Europska Unija"
+
+msgid "Finland"
+msgstr "Finska"
+
+msgid "Fiji"
+msgstr "Fidži"
+
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falklandski otoci (Malvini)"
+
+msgid "Micronesia"
+msgstr "Mikronezija"
+
+msgid "Faroe Islands"
+msgstr "Farski otoci"
+
+msgid "France"
+msgstr "Francuska"
+
+msgid "Gabon"
+msgstr "Gabon"
+
+msgid "United Kingdom"
+msgstr "Ujedinjno Kraljevstvo"
+
+msgid "Grenada"
+msgstr "Grenada"
+
+msgid "Georgia"
+msgstr "Gruzija"
+
+msgid "French Guiana"
+msgstr "Francuska Gvineja"
+
+msgid "Guernsey"
+msgstr "Guernsey"
+
+msgid "Ghana"
+msgstr "Gana"
+
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+msgid "Greenland"
+msgstr "Grenland"
+
+msgid "Gambia"
+msgstr "Gambija"
+
+msgid "Guinea"
+msgstr "Gvineja"
+
+msgid "Guadeloupe"
+msgstr "Gvadalupa"
+
+msgid "Equatorial Guinea"
+msgstr "Ekvatorska Gvineja"
+
+msgid "Greece"
+msgstr "Grčka"
+
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Južna Georgija i otočje Južni Sandwich"
+
+msgid "Guatemala"
+msgstr "Gvatemala"
+
+msgid "Guam"
+msgstr "Guam"
+
+msgid "Guinea-Bissau"
+msgstr "Gvineja Bisau"
+
+msgid "Guyana"
+msgstr "Gvajana"
+
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+msgid "Honduras"
+msgstr "Honduras"
+
+msgid "Croatia"
+msgstr "Hrvatska"
+
+msgid "Haiti"
+msgstr "Haiti"
+
+msgid "Hungary"
+msgstr "Mađarska"
+
+msgid "Indonesia"
+msgstr "Indonezija"
+
+msgid "Ireland"
+msgstr "Irska"
+
+msgid "Israel"
+msgstr "Izrael"
+
+msgid "Isle of Man"
+msgstr "Otok Man"
+
+msgid "India"
+msgstr "Indija"
+
+msgid "British Indian Ocean Territory"
+msgstr "Britanski Indijskooceanski teritorij"
+
+msgid "Iraq"
+msgstr "Irak"
+
+msgid "Iran"
+msgstr "Iran"
+
+msgid "Iceland"
+msgstr "Island"
+
+msgid "Italy"
+msgstr "Italija"
+
+msgid "Jersey"
+msgstr "Jersey"
+
+msgid "Jamaica"
+msgstr "Jamajka"
+
+msgid "Jordan"
+msgstr "Jordan"
+
+msgid "Japan"
+msgstr "Japan"
+
+msgid "Kenya"
+msgstr "Kenija"
+
+msgid "Kyrgyzstan"
+msgstr "Kirgistan"
+
+msgid "Cambodia"
+msgstr "Kambodža"
+
+msgid "Kiribati"
+msgstr "Kiribati"
+
+msgid "Comoros"
+msgstr "Komori"
+
+msgid "Saint Kitts and Nevis"
+msgstr "Sveti Kristofor i Nevis"
+
+msgid "North Korea"
+msgstr "Sjeverna Koreja"
+
+msgid "Republic of Korea"
+msgstr "Južna Koreja"
+
+msgid "Kuwait"
+msgstr "Kuvajt"
+
+msgid "Cayman Islands"
+msgstr "Kajmanski otoci"
+
+msgid "Kazakhstan"
+msgstr "Kazahstan"
+
+msgid "Lao People's Democratic Republic"
+msgstr "Laos"
+
+msgid "Lebanon"
+msgstr "Libanon"
+
+msgid "Saint Lucia"
+msgstr "Sveta Lucija"
+
+msgid "Liechtenstein"
+msgstr "Lihtenštajn"
+
+msgid "Sri Lanka"
+msgstr "Šri Lanka"
+
+msgid "Liberia"
+msgstr "Liberija"
+
+msgid "Lesotho"
+msgstr "Lesoto"
+
+msgid "Lithuania"
+msgstr "Litva"
+
+msgid "Luxembourg"
+msgstr "Luksemburg"
+
+msgid "Latvia"
+msgstr "Latvija"
+
+msgid "Libya"
+msgstr "Libija"
+
+msgid "Morocco"
+msgstr "Maroko"
+
+msgid "Monaco"
+msgstr "Monako"
+
+msgid "Moldova"
+msgstr "Moldavija"
+
+msgid "Montenegro"
+msgstr "Crna Gora"
+
+msgid "Saint Martin"
+msgstr "Sveti Martin"
+
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+msgid "Marshall Islands"
+msgstr "Marshallovi otoci"
+
+msgid "Macedonia"
+msgstr "Makedonija"
+
+msgid "Mali"
+msgstr "Mali"
+
+msgid "Myanmar"
+msgstr "Mjanmar"
+
+msgid "Mongolia"
+msgstr "Mongolija"
+
+msgid "Macau"
+msgstr "Makau"
+
+msgid "Northern Mariana Islands"
+msgstr "Sjevernomarijanski otoci"
+
+msgid "Martinique"
+msgstr "Martinique"
+
+msgid "Mauritania"
+msgstr "Mauretanija"
+
+msgid "Montserrat"
+msgstr "Montserrat"
+
+msgid "Malta"
+msgstr "Malta"
+
+msgid "Mauritius"
+msgstr "Mauricijus"
+
+msgid "Maldives"
+msgstr "Maldivi"
+
+msgid "Malawi"
+msgstr "Malavi"
+
+msgid "Mexico"
+msgstr "Meksiko"
+
+msgid "Malaysia"
+msgstr "Malazija"
+
+msgid "Mozambique"
+msgstr "Mozambik"
+
+msgid "Namibia"
+msgstr "Namibija"
+
+msgid "New Caledonia"
+msgstr "Nova Kaledonija"
+
+msgid "Niger"
+msgstr "Niger"
+
+msgid "Norfolk Island"
+msgstr "Otok Norfolk"
+
+msgid "Nigeria"
+msgstr "Nigerija"
+
+msgid "Nicaragua"
+msgstr "Nikaragva"
+
+msgid "Netherlands"
+msgstr "Nizozemska"
+
+msgid "Norway"
+msgstr "Norveška"
+
+msgid "Nepal"
+msgstr "Nepal"
+
+msgid "Nauru"
+msgstr "Nauru"
+
+msgid "Niue"
+msgstr "Niue"
+
+msgid "New Zealand"
+msgstr "Novi Zeland"
+
+msgid "Oman"
+msgstr "Oman"
+
+msgid "Panama"
+msgstr "Panama"
+
+msgid "Peru"
+msgstr "Peru"
+
+msgid "French Polynesia"
+msgstr "Francuska Polinezija"
+
+msgid "Papua New Guinea"
+msgstr "Papua Nova Gvineja"
+
+msgid "Philippines"
+msgstr "Filipini"
+
+msgid "Pakistan"
+msgstr "Pakistan"
+
+msgid "Poland"
+msgstr "Poljska"
+
+msgid "Saint Pierre and Miquelon"
+msgstr "Sveti Petar i Mikelon"
+
+msgid "Pitcairn Islands"
+msgstr "Pitcairnovo otočje"
+
+msgid "Puerto Rico"
+msgstr "Portoriko"
+
+msgid "Palestinian Territory"
+msgstr "Palestinski teritorij"
+
+msgid "Portugal"
+msgstr "Portugal"
+
+msgid "Palau"
+msgstr "Palau"
+
+msgid "Paraguay"
+msgstr "Paragvaj"
+
+msgid "Qatar"
+msgstr "Katar"
+
+msgid "Réunion"
+msgstr "Réunion"
+
+msgid "Romania"
+msgstr "Rumunjska"
+
+msgid "Serbia"
+msgstr "Srbija"
+
+msgid "Russian Federation"
+msgstr "Ruska Federacija"
+
+msgid "Rwanda"
+msgstr "Ruanda"
+
+msgid "Saudi Arabia"
+msgstr "Saudijska Arabija"
+
+msgid "Solomon Islands"
+msgstr "Solomonovi otoci"
+
+msgid "Seychelles"
+msgstr "Sejšeli"
+
+msgid "Sudan"
+msgstr "Sudan"
+
+msgid "Sweden"
+msgstr "Švedska"
+
+msgid "Singapore"
+msgstr "Singapur"
+
+msgid "Saint Helena"
+msgstr "Sveta Helena"
+
+msgid "Slovenia"
+msgstr "Slovenija"
+
+msgid "Svalbard and Jan Mayen"
+msgstr "Svalbard"
+
+msgid "Slovakia"
+msgstr "Slovačka"
+
+msgid "Sierra Leone"
+msgstr "Sijera Leone"
+
+msgid "San Marino"
+msgstr "San Marino"
+
+msgid "Senegal"
+msgstr "Senegal"
+
+msgid "Somalia"
+msgstr "Somalija"
+
+msgid "Suriname"
+msgstr "Surinam"
+
+msgid "South Sudan"
+msgstr "Južni Sudan"
+
+msgid "Sao Tome and Principe"
+msgstr "Sveti Toma i Princip"
+
+msgid "El Salvador"
+msgstr "Salvador"
+
+msgid "Sint Maarten"
+msgstr "Sint Maarten"
+
+msgid "Syria"
+msgstr "Sirija"
+
+msgid "Swaziland"
+msgstr "Svaziland"
+
+msgid "Turks and Caicos Islands"
+msgstr "Otoci Turks i Caicos"
+
+msgid "Chad"
+msgstr "Čad"
+
+msgid "French Southern Territories"
+msgstr "Francuski južni teritoriji"
+
+msgid "Togo"
+msgstr "Togo"
+
+msgid "Thailand"
+msgstr "Tajland"
+
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+msgid "Tokelau"
+msgstr "Tokelau"
+
+msgid "Timor-Leste"
+msgstr "Istočni timor"
+
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+msgid "Tunisia"
+msgstr "Tunis"
+
+msgid "Tonga"
+msgstr "Tonga"
+
+msgid "Turkey"
+msgstr "Turska"
+
+msgid "Trinidad and Tobago"
+msgstr "Trinidad i Tobago"
+
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+msgid "Taiwan"
+msgstr "Tajvan"
+
+msgid "Tanzania"
+msgstr "Tanzanija"
+
+msgid "Ukraine"
+msgstr "Ukrajina"
+
+msgid "Uganda"
+msgstr "Uganda"
+
+msgid "United States Minor Outlying Islands"
+msgstr "Američki manji vanjski otoci"
+
+msgid "United States"
+msgstr "Sjedinjene Američke Države"
+
+msgid "Uruguay"
+msgstr "Urugvaj"
+
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+msgid "Vatican"
+msgstr "Vatikan"
+
+msgid "Saint Vincent and the Grenadines"
+msgstr "Sveti Vincent i Grenadini"
+
+msgid "Venezuela"
+msgstr "Venecuela"
+
+msgid "Virgin Islands"
+msgstr "Djevičanski otoci"
+
+msgid "Vietnam"
+msgstr "Vjetnam"
+
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+msgid "Wallis and Futuna"
+msgstr "Wallis i Futuna"
+
+msgid "Samoa"
+msgstr "Samoa"
+
+msgid "Yemen"
+msgstr "Jemen"
+
+msgid "Mayotte"
+msgstr "Mayotte"
+
+msgid "South Africa"
+msgstr "Južna Afrika"
+
+msgid "Zambia"
+msgstr "Zambija"
+
+msgid "Zimbabwe"
+msgstr "Zimbabve"

apps/routerconsole/locale-countries/messages_ja.po

@@ -5,13 +5,14 @@
 # 
 # Translators:
 # タカハシ <indexial@outlook.jp>, 2013-2014
+# Masayuki Hatta <mhatta@mhatta.org>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-17 01:33+0000\n"
-"PO-Revision-Date: 2017-06-30 21:33+0000\n"
+"PO-Revision-Date: 2018-08-17 22:07+0000\n"
-"Last-Translator: kytv <killyourtv@i2pmail.org>\n"
+"Last-Translator: Masayuki Hatta <mhatta@mhatta.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgid "Anonymous Proxy"
 msgstr "匿名プロキシ"
 
 msgid "Satellite Provider"
-msgstr "衛星プロバイダー"
+msgstr "衛星プロバイダ"
 
 msgid "Andorra"
 msgstr "アンドラ"
@@ -53,7 +54,7 @@ msgid "Angola"
 msgstr "アンゴラ"
 
 msgid "Asia/Pacific Region"
-msgstr ""
+msgstr "アジア太平洋地域"
 
 msgid "Antarctica"
 msgstr "南極"
@@ -107,7 +108,7 @@ msgid "Benin"
 msgstr "ベナン"
 
 msgid "Saint Barthélemy"
-msgstr ""
+msgstr "サン・バルテルミー島"
 
 msgid "Bermuda"
 msgstr "バミューダ"
@@ -119,7 +120,7 @@ msgid "Bolivia"
 msgstr "ボリビア"
 
 msgid "Bonaire"
-msgstr ""
+msgstr "ボネール島"
 
 msgid "Brazil"
 msgstr "ブラジル"
@@ -251,7 +252,7 @@ msgid "Falkland Islands (Malvinas)"
 msgstr "フォークランド諸島 (マルビナス)"
 
 msgid "Micronesia"
-msgstr ""
+msgstr "ミクロネシア連邦"
 
 msgid "Faroe Islands"
 msgstr "フェロー諸島"
@@ -353,7 +354,7 @@ msgid "Iraq"
 msgstr "イラク"
 
 msgid "Iran"
-msgstr ""
+msgstr "イラン"
 
 msgid "Iceland"
 msgstr "アイスランド"
@@ -392,7 +393,7 @@ msgid "Saint Kitts and Nevis"
 msgstr "セントクリストファー・ネイビス"
 
 msgid "North Korea"
-msgstr ""
+msgstr "北朝鮮"
 
 msgid "Republic of Korea"
 msgstr "大韓民国"
@@ -437,7 +438,7 @@ msgid "Latvia"
 msgstr "ラトビア"
 
 msgid "Libya"
-msgstr ""
+msgstr "リビア"
 
 msgid "Morocco"
 msgstr "モロッコ"
@@ -446,7 +447,7 @@ msgid "Monaco"
 msgstr "モナコ"
 
 msgid "Moldova"
-msgstr ""
+msgstr "モルドヴァ"
 
 msgid "Montenegro"
 msgstr "モンテネグロ"
@@ -461,7 +462,7 @@ msgid "Marshall Islands"
 msgstr "マーシャル諸島"
 
 msgid "Macedonia"
-msgstr ""
+msgstr "マケドニア"
 
 msgid "Mali"
 msgstr "マリ"
@@ -473,7 +474,7 @@ msgid "Mongolia"
 msgstr "モンゴル"
 
 msgid "Macau"
-msgstr ""
+msgstr "マカオ"
 
 msgid "Northern Mariana Islands"
 msgstr "北マリアナ諸島連邦"
@@ -653,7 +654,7 @@ msgid "Suriname"
 msgstr "スリナム"
 
 msgid "South Sudan"
-msgstr ""
+msgstr "南スーダン"
 
 msgid "Sao Tome and Principe"
 msgstr "サントメ・プリンシペ"
@@ -662,10 +663,10 @@ msgid "El Salvador"
 msgstr "エルサルバドル"
 
 msgid "Sint Maarten"
-msgstr ""
+msgstr "セント・マーチン島"
 
 msgid "Syria"
-msgstr ""
+msgstr "シリア"
 
 msgid "Swaziland"
 msgstr "スワジランド"
@@ -716,7 +717,7 @@ msgid "Taiwan"
 msgstr "台湾"
 
 msgid "Tanzania"
-msgstr ""
+msgstr "タンザニア"
 
 msgid "Ukraine"
 msgstr "ウクライナ"
@@ -737,7 +738,7 @@ msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
 msgid "Vatican"
-msgstr ""
+msgstr "バチカン"
 
 msgid "Saint Vincent and the Grenadines"
 msgstr "セントビンセントおよびグレナディーン諸島"
@@ -749,7 +750,7 @@ msgid "Virgin Islands"
 msgstr "バージン諸島"
 
 msgid "Vietnam"
-msgstr ""
+msgstr "ヴェトナム"
 
 msgid "Vanuatu"
 msgstr "バヌアツ"

apps/routerconsole/locale-news/messages_ja.po

@@ -5,13 +5,14 @@
 # 
 # Translators:
 # タカハシ <indexial@outlook.jp>, 2013-2014
+# Masayuki Hatta <mhatta@mhatta.org>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-13 21:46+0000\n"
-"PO-Revision-Date: 2017-06-30 21:33+0000\n"
+"PO-Revision-Date: 2018-08-17 19:05+0000\n"
-"Last-Translator: タカハシ <indexial@outlook.jp>\n"
+"Last-Translator: Masayuki Hatta <mhatta@mhatta.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +21,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "Congratulations on getting I2P installed!"
-msgstr "I2P のインストールに際する設定"
+msgstr "I2P のインストールおめでとうございます！"
 
 msgid "Welcome to I2P!"
 msgstr "I2P にようこそ！"
 
 #, java-format
 msgid "Please {0}have patience{1} as I2P boots up and finds peers."
-msgstr "I2P が起動し、ピアを検索するまで{0}お待ちください{1}。"
+msgstr "I2P が起動し、ピアを見つけるまで{0}お待ちください{1}。"
 
 #, java-format
 msgid ""
@@ -37,12 +38,12 @@ msgstr "お待ちの間、{2}設定ページ{3}で{0}帯域幅設定を調整{1}
 
 msgid ""
 "Also you can setup your browser to use the I2P proxy to reach eepsites."
-msgstr "また、 eepsite に到達するために I2P プロキシを使用するためにブラウザをセットアップしてください。"
+msgstr "また、 eepsite に到達するために I2P プロキシを使用するよう、ブラウザをセットアップしてください。"
 
 msgid ""
 "Just enter 127.0.0.1 (or localhost) port 4444 as a http proxy into your "
 "browser settings."
-msgstr "127.0.0.1 (または localhost) ポート 4444番をHTTPプロキシとして、ブラウザ設定に入力してください。"
+msgstr "127.0.0.1 (または localhost) ポート 4444をHTTPプロキシとして、ブラウザ設定に入力してください。"
 
 msgid "Do not use SOCKS for this."
 msgstr "これには SOCKS を使用しないでください。"