Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.i2p

.tx/config

@@ -18,6 +18,7 @@ trans.es_AR = apps/i2ptunnel/locale/messages_es_AR.po
 trans.fa = apps/i2ptunnel/locale/messages_fa.po
 trans.fi = apps/i2ptunnel/locale/messages_fi.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
+trans.gan = apps/i2ptunnel/locale/messages_gan.po
 trans.hu = apps/i2ptunnel/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/i2ptunnel/locale/messages_in.po
@@ -54,6 +55,7 @@ trans.es_AR = apps/i2ptunnel/locale-proxy/messages_es_AR.po
 trans.fa = apps/i2ptunnel/locale-proxy/messages_fa.po
 trans.fi = apps/i2ptunnel/locale-proxy/messages_fi.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
+trans.gan = apps/i2ptunnel/locale-proxy/messages_gan.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
@@ -92,6 +94,7 @@ trans.et_EE = core/locale/messages_et.po
 trans.fa = core/locale/messages_fa.po
 trans.fi = core/locale/messages_fi.po
 trans.fr = core/locale/messages_fr.po
+trans.gan = core/locale/messages_gan.po
 trans.hu = core/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = core/locale/messages_in.po
@@ -132,6 +135,7 @@ trans.et_EE = router/locale/messages_et.po
 trans.fa = router/locale/messages_fa.po
 trans.fi = router/locale/messages_fi.po
 trans.fr = router/locale/messages_fr.po
+trans.gan = router/locale/messages_gan.po
 trans.hu = router/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = router/locale/messages_in.po
@@ -171,6 +175,7 @@ trans.et_EE = apps/routerconsole/locale/messages_et.po
 trans.fa = apps/routerconsole/locale/messages_fa.po
 trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
+trans.gan = apps/routerconsole/locale/messages_gan.po
 trans.hu = apps/routerconsole/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/routerconsole/locale/messages_in.po
@@ -205,6 +210,7 @@ trans.es_AR = apps/routerconsole/locale-news/messages_es_AR.po
 trans.fa = apps/routerconsole/locale-news/messages_fa.po
 trans.fi = apps/routerconsole/locale-news/messages_fi.po
 trans.fr = apps/routerconsole/locale-news/messages_fr.po
+trans.gan = apps/routerconsole/locale-news/messages_gan.po
 trans.gl = apps/routerconsole/locale-news/messages_gl.po
 ;; Java converts he to iw
 trans.he = apps/routerconsole/locale-news/messages_iw.po
@@ -299,6 +305,7 @@ trans.es_AR = apps/i2psnark/locale/messages_es_AR.po
 trans.fa = apps/i2psnark/locale/messages_fa.po
 trans.fi = apps/i2psnark/locale/messages_fi.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
+trans.gan = apps/i2psnark/locale/messages_gan.po
 trans.hu = apps/i2psnark/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/i2psnark/locale/messages_in.po
@@ -335,6 +342,7 @@ trans.es_AR = apps/susidns/locale/messages_es_AR.po
 trans.fa = apps/susidns/locale/messages_fa.po
 trans.fi = apps/susidns/locale/messages_fi.po
 trans.fr = apps/susidns/locale/messages_fr.po
+trans.gan = apps/susidns/locale/messages_gan.po
 trans.gl = apps/susidns/locale/messages_gl.po
 trans.hu = apps/susidns/locale/messages_hu.po
 ;; Java converts id to in
@@ -372,6 +380,7 @@ trans.es_AR = apps/desktopgui/locale/messages_es_AR.po
 trans.fa = apps/desktopgui/locale/messages_fa.po
 trans.fi = apps/desktopgui/locale/messages_fi.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
+trans.gan = apps/desktopgui/locale/messages_gan.po
 trans.gl = apps/desktopgui/locale/messages_gl.po
 trans.hu = apps/desktopgui/locale/messages_hu.po
 ;; Java converts id to in
@@ -418,6 +427,7 @@ trans.et_EE = apps/susimail/locale/messages_et.po
 trans.fa = apps/susimail/locale/messages_fa.po
 trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
+trans.gan = apps/susimail/locale/messages_gan.po
 trans.gl = apps/susimail/locale/messages_gl.po
 trans.hr = apps/susimail/locale/messages_hr.po
 trans.hu = apps/susimail/locale/messages_hu.po
@@ -497,6 +507,7 @@ trans.es = installer/resources/locale/po/messages_es.po
 trans.es_AR = installer/resources/locale/po/messages_es_AR.po
 trans.fi = installer/resources/locale/po/messages_fi.po
 trans.fr = installer/resources/locale/po/messages_fr.po
+trans.gan = installer/resources/locale/po/messages_gan.po
 trans.hu = installer/resources/locale/po/messages_hu.po
 trans.id = installer/resources/locale/po/messages_id.po
 trans.it = installer/resources/locale/po/messages_it.po
@@ -584,6 +595,7 @@ trans.es_AR = apps/ministreaming/locale/messages_es_AR.po
 trans.fa = apps/ministreaming/locale/messages_fa.po
 trans.fi = apps/ministreaming/locale/messages_fi.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
+trans.gan = apps/ministreaming/locale/messages_gan.po
 trans.gl = apps/ministreaming/locale/messages_gl.po
 trans.hu = apps/ministreaming/locale/messages_hu.po
 ;; Java converts id to in
@@ -622,6 +634,7 @@ trans.es = installer/resources/locale-man/man_es.po
 trans.es_AR = installer/resources/locale-man/man_es_AR.po
 trans.fi = installer/resources/locale-man/man_fi.po
 trans.fr = installer/resources/locale-man/man_fr.po
+trans.gan = installer/resources/locale-man/man_gan.po
 trans.hu = installer/resources/locale-man/man_hu.po
 trans.id = installer/resources/locale-man/man_id.po
 trans.it = installer/resources/locale-man/man_it.po
@@ -657,6 +670,7 @@ trans.el = installer/resources/eepsite/docroot/help/index_el.html
 trans.es = installer/resources/eepsite/docroot/help/index_es.html
 trans.fa = installer/resources/eepsite/docroot/help/index_fa.html
 trans.fr = installer/resources/eepsite/docroot/help/index_fr.html
+trans.gan = installer/resources/eepsite/docroot/help/index_gan.html
 trans.hu = installer/resources/eepsite/docroot/help/index_hu.html
 ;; Java converts id to in
 trans.id = installer/resources/eepsite/docroot/help/index_in.html
@@ -688,6 +702,7 @@ trans.ar = apps/routerconsole/resources/docs/readme_ar.html
 trans.cs = apps/routerconsole/resources/docs/readme_cs.html
 trans.de = apps/routerconsole/resources/docs/readme_de.html
 trans.fr = apps/routerconsole/resources/docs/readme_fr.html
+trans.gan = apps/routerconsole/resources/docs/readme_gan.html
 trans.hu = apps/routerconsole/resources/docs/readme_hu.html
 ;; Java converts id to in
 trans.id = apps/routerconsole/resources/docs/readme_in.html

apps/desktopgui/locale/messages_gan.po

@@ -0,0 +1,102 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui 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: 2023-03-06 14:52+0000\n"
+"PO-Revision-Date: 2011-02-13 12:05+0000\n"
+"Last-Translator: duck <[email protected]>\n"
+"Language-Team: Chinese (Gan) (http://app.transifex.com/otf/I2P/language/gan/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gan\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+msgid "Start I2P"
+msgstr "啟動I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+msgid "I2P is starting!"
+msgstr " I2P 正在启动!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+msgid "Starting"
+msgstr "開始"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:221
+msgid "Launch I2P Browser"
+msgstr "启动 I2P 浏览器"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:242
+msgid "Configure I2P System Tray"
+msgstr "設定I2P系統文件夾"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:88
+#: src/net/i2p/desktopgui/InternalTrayManager.java:244
+msgid "Disable system tray"
+msgstr "禁用系统托盘"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:104
+#: src/net/i2p/desktopgui/InternalTrayManager.java:260
+msgid "Restart I2P"
+msgstr "重啟I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:121
+#: src/net/i2p/desktopgui/InternalTrayManager.java:277
+msgid "Stop I2P"
+msgstr "停止I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:137
+#: src/net/i2p/desktopgui/InternalTrayManager.java:293
+msgid "Restart I2P Immediately"
+msgstr "強制重啟I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:154
+#: src/net/i2p/desktopgui/InternalTrayManager.java:310
+msgid "Stop I2P Immediately"
+msgstr "強制終止I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:168
+#: src/net/i2p/desktopgui/InternalTrayManager.java:324
+msgid "Cancel I2P Shutdown"
+msgstr "取消停止I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:381
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "關閉於 {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:383
+msgid "Shutdown imminent"
+msgstr "強制關閉"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:388
+msgid "Network"
+msgstr "网络"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:75
+msgid "I2P: Right-click for menu"
+msgstr "I2P：右鍵開啟選單"
+
+#: src/net/i2p/desktopgui/TrayManager.java:310
+#: src/net/i2p/desktopgui/TrayManager.java:347
+msgid "Enable notifications"
+msgstr "启用通知"
+
+#: src/net/i2p/desktopgui/TrayManager.java:325
+#: src/net/i2p/desktopgui/TrayManager.java:362
+msgid "Disable notifications"
+msgstr "禁用通知"

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/server/Dispatcher.java

@@ -162,6 +162,7 @@ public NotificationHandler getNotificationHandler(final String notificationName)
 	/**
 	 * @deprecated
 	 */
+	@Deprecated
 	public JSONRPC2Response dispatch(final JSONRPC2Request request, final MessageContext requestCtx) {
 
 		return process(request, requestCtx);
@@ -209,6 +210,7 @@ public JSONRPC2Response process(final JSONRPC2Request request, final MessageCont
 	/**
 	 * @deprecated
 	 */
+	@Deprecated
 	public void dispatch(final JSONRPC2Notification notification, final MessageContext notificationCtx) {
 
 		process(notification, notificationCtx);

apps/i2psnark/java/build.xml

@@ -261,6 +261,11 @@
             <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
             <attribute name="X-Compile-Source-JDK" value="${javac.version}" />
             <attribute name="X-Compile-Target-JDK" value="${javac.version}" />
+            <!--
+               Suppress JNI warning in JRE 24+, and eventual restriction
+               See https://openjdk.org/jeps/472
+             -->
+            <attribute name="Enable-Native-Access" value="ALL-UNNAMED" />
             <!-- this is so Jetty will report its version correctly -->
             <section name="org/eclipse/jetty/server/" >
                 <attribute name="Implementation-Vendor" value="Eclipse.org - Jetty" />

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

@@ -252,7 +252,7 @@ else if ("".equals(line) || "help".equals(line))
   /**
    * from main() via parseArguments() single torrent
    *
-   * @deprecated unused
+   * unused
    */
 /****
   Snark(I2PSnarkUtil util, String torrent, String ip, int user_port,
@@ -264,7 +264,7 @@ else if ("".equals(line) || "help".equals(line))
   /**
    * single torrent - via router
    *
-   * @deprecated unused
+   * unused
    */
 /****
   public Snark(I2PAppContext ctx, Properties opts, String torrent,

apps/i2psnark/java/src/org/klomp/snark/standalone/ConfigUIHelper.java

@@ -32,6 +32,7 @@ public class ConfigUIHelper {
         { "cs", "cz", "Čeština", null },
         { "zh", "cn", "Chinese 中文", null },
         { "zh_TW", "tw", "Chinese 中文", "Taiwan" },
+        { "gan", "cn", "Gan Chinese 赣语", null },
         { "da", "dk", "Dansk", null },
         { "de", "de", "Deutsch", null },
         //{ "et", "ee", "Eesti", null },

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -2206,6 +2206,8 @@ else if ("LVhE".equals(ch))
                         client = "Transmission";
                     else if ("LUtU".equals(ch))
                         client = "KTorrent";
+                    else if ("LUVU".equals(ch))  // ET
+                        client = "EepTorrent";
                     // libtorrent and downstreams
                     // https://www.libtorrent.org/projects.html
                     else if ("LURF".equals(ch))  // DL