aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-03 21:16:47 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-04-03 21:16:47 +0200
commitf13792325fc3f7e49ec2b0880eb4f1aa978e00d7 (patch)
tree1451ec07f6181707b224a165fb5171a02c85d93b
parentcd3db61291fd47b5acde1ae3add16c7ccfc2f996 (diff)
parent186199e3b42e2d9ead8072b605b06b9e76619084 (diff)
downloadgnunet-f13792325fc3f7e49ec2b0880eb4f1aa978e00d7.tar.gz
gnunet-f13792325fc3f7e49ec2b0880eb4f1aa978e00d7.zip
merge
-rw-r--r--po/de.po123
-rw-r--r--po/es.po148
-rw-r--r--po/fr.po110
-rw-r--r--po/it.po91
-rw-r--r--po/sv.po110
-rw-r--r--po/vi.po110
-rw-r--r--po/zh_CN.po114
-rw-r--r--src/transport/gnunet-service-tng.c537
8 files changed, 424 insertions, 919 deletions
diff --git a/po/de.po b/po/de.po
index 926a30f75..679e7b0db 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
10msgstr "" 10msgstr ""
11"Project-Id-Version: gnunet 0.10.1\n" 11"Project-Id-Version: gnunet 0.10.1\n"
12"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 12"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
13"POT-Creation-Date: 2019-04-03 14:36+0200\n" 13"POT-Creation-Date: 2019-04-03 16:13+0200\n"
14"PO-Revision-Date: 2015-03-08 16:16+0100\n" 14"PO-Revision-Date: 2015-03-08 16:16+0100\n"
15"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" 15"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
16"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" 16"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -226,7 +226,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
226msgstr "" 226msgstr ""
227 227
228#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 228#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
229#: src/transport/plugin_transport_xt.c:1120
230#: src/transport/tcp_service_legacy.c:557 229#: src/transport/tcp_service_legacy.c:557
231#, c-format 230#, c-format
232msgid "" 231msgid ""
@@ -237,9 +236,6 @@ msgstr ""
237#: src/transport/plugin_transport_tcp.c:1139 236#: src/transport/plugin_transport_tcp.c:1139
238#: src/transport/plugin_transport_tcp.c:1145 237#: src/transport/plugin_transport_tcp.c:1145
239#: src/transport/plugin_transport_tcp.c:3835 238#: src/transport/plugin_transport_tcp.c:3835
240#: src/transport/plugin_transport_xt.c:1139
241#: src/transport/plugin_transport_xt.c:1145
242#: src/transport/plugin_transport_xt.c:3833
243#: src/transport/tcp_service_legacy.c:576 239#: src/transport/tcp_service_legacy.c:576
244#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 240#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
245#: src/util/service.c:1162 241#: src/util/service.c:1162
@@ -248,7 +244,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
248msgstr "" 244msgstr ""
249 245
250#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 246#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
251#: src/transport/plugin_transport_xt.c:1176
252#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 247#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
253#: src/util/service.c:1201 248#: src/util/service.c:1201
254#, c-format 249#, c-format
@@ -256,7 +251,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
256msgstr "" 251msgstr ""
257 252
258#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 253#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
259#: src/transport/plugin_transport_xt.c:1180
260#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 254#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
261#: src/util/service.c:1206 255#: src/util/service.c:1206
262#, c-format 256#, c-format
@@ -264,7 +258,6 @@ msgid "Using `%s' instead\n"
264msgstr "" 258msgstr ""
265 259
266#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 260#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
267#: src/transport/plugin_transport_xt.c:1211
268#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 261#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
269#, c-format 262#, c-format
270msgid "" 263msgid ""
@@ -273,7 +266,6 @@ msgid ""
273msgstr "" 266msgstr ""
274 267
275#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 268#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
276#: src/transport/plugin_transport_xt.c:1228
277#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 269#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
278#, c-format 270#, c-format
279msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 271msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -282,7 +274,6 @@ msgstr ""
282#: src/arm/gnunet-service-arm.c:556 274#: src/arm/gnunet-service-arm.c:556
283#: src/transport/plugin_transport_http_server.c:2688 275#: src/transport/plugin_transport_http_server.c:2688
284#: src/transport/plugin_transport_tcp.c:1259 276#: src/transport/plugin_transport_tcp.c:1259
285#: src/transport/plugin_transport_xt.c:1259
286#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 277#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
287#, c-format 278#, c-format
288msgid "Failed to resolve `%s': %s\n" 279msgid "Failed to resolve `%s': %s\n"
@@ -291,7 +282,6 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
291#: src/arm/gnunet-service-arm.c:575 282#: src/arm/gnunet-service-arm.c:575
292#: src/transport/plugin_transport_http_server.c:2706 283#: src/transport/plugin_transport_http_server.c:2706
293#: src/transport/plugin_transport_tcp.c:1278 284#: src/transport/plugin_transport_tcp.c:1278
294#: src/transport/plugin_transport_xt.c:1278
295#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 285#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
296#, fuzzy, c-format 286#, fuzzy, c-format
297msgid "Failed to find %saddress for `%s'.\n" 287msgid "Failed to find %saddress for `%s'.\n"
@@ -7487,8 +7477,6 @@ msgstr ""
7487#: src/transport/plugin_transport_http_server.c:3530 7477#: src/transport/plugin_transport_http_server.c:3530
7488#: src/transport/plugin_transport_tcp.c:3901 7478#: src/transport/plugin_transport_tcp.c:3901
7489#: src/transport/plugin_transport_tcp.c:3908 7479#: src/transport/plugin_transport_tcp.c:3908
7490#: src/transport/plugin_transport_xt.c:3899
7491#: src/transport/plugin_transport_xt.c:3906
7492msgid "TCP_STEALTH not supported on this platform.\n" 7480msgid "TCP_STEALTH not supported on this platform.\n"
7493msgstr "" 7481msgstr ""
7494 7482
@@ -7558,7 +7546,6 @@ msgstr ""
7558 7546
7559#: src/transport/plugin_transport_http_server.c:2905 7547#: src/transport/plugin_transport_http_server.c:2905
7560#: src/transport/plugin_transport_udp.c:3627 7548#: src/transport/plugin_transport_udp.c:3627
7561#: src/transport/plugin_transport_xu.c:2049
7562msgid "Disabling IPv6 since it is not supported on this system!\n" 7549msgid "Disabling IPv6 since it is not supported on this system!\n"
7563msgstr "" 7550msgstr ""
7564 7551
@@ -7663,8 +7650,6 @@ msgstr "# Bytes verworfen von SMTP (ausgehend)"
7663 7650
7664#: src/transport/plugin_transport_tcp.c:1557 7651#: src/transport/plugin_transport_tcp.c:1557
7665#: src/transport/plugin_transport_tcp.c:2883 7652#: src/transport/plugin_transport_tcp.c:2883
7666#: src/transport/plugin_transport_xt.c:1553
7667#: src/transport/plugin_transport_xt.c:2879
7668#, c-format 7653#, c-format
7669msgid "Unexpected address length: %u bytes\n" 7654msgid "Unexpected address length: %u bytes\n"
7670msgstr "" 7655msgstr ""
@@ -7673,9 +7658,6 @@ msgstr ""
7673#: src/transport/plugin_transport_tcp.c:1964 7658#: src/transport/plugin_transport_tcp.c:1964
7674#: src/transport/plugin_transport_tcp.c:3147 7659#: src/transport/plugin_transport_tcp.c:3147
7675#: src/transport/plugin_transport_tcp.c:4024 7660#: src/transport/plugin_transport_tcp.c:4024
7676#: src/transport/plugin_transport_xt.c:1736
7677#: src/transport/plugin_transport_xt.c:1960
7678#: src/transport/plugin_transport_xt.c:3143
7679msgid "# TCP sessions active" 7661msgid "# TCP sessions active"
7680msgstr "# aktive TCP-Sitzungen" 7662msgstr "# aktive TCP-Sitzungen"
7681 7663
@@ -7685,87 +7667,66 @@ msgstr "# aktive TCP-Sitzungen"
7685#: src/transport/plugin_transport_tcp.c:2143 7667#: src/transport/plugin_transport_tcp.c:2143
7686#: src/transport/plugin_transport_tcp.c:2243 7668#: src/transport/plugin_transport_tcp.c:2243
7687#: src/transport/plugin_transport_tcp.c:2268 7669#: src/transport/plugin_transport_tcp.c:2268
7688#: src/transport/plugin_transport_xt.c:1778
7689#: src/transport/plugin_transport_xt.c:1942
7690#: src/transport/plugin_transport_xt.c:2066
7691#: src/transport/plugin_transport_xt.c:2139
7692#: src/transport/plugin_transport_xt.c:2239
7693#: src/transport/plugin_transport_xt.c:2264
7694msgid "# bytes currently in TCP buffers" 7670msgid "# bytes currently in TCP buffers"
7695msgstr "# Bytes derzeit in TCP-Puffern" 7671msgstr "# Bytes derzeit in TCP-Puffern"
7696 7672
7697#: src/transport/plugin_transport_tcp.c:1785 7673#: src/transport/plugin_transport_tcp.c:1785
7698#: src/transport/plugin_transport_xt.c:1781
7699msgid "# bytes discarded by TCP (disconnect)" 7674msgid "# bytes discarded by TCP (disconnect)"
7700msgstr "# Bytes verworfen von TCP (unterbrochen)" 7675msgstr "# Bytes verworfen von TCP (unterbrochen)"
7701 7676
7702#: src/transport/plugin_transport_tcp.c:2073 7677#: src/transport/plugin_transport_tcp.c:2073
7703#: src/transport/plugin_transport_xt.c:2069
7704msgid "# bytes discarded by TCP (timeout)" 7678msgid "# bytes discarded by TCP (timeout)"
7705msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)" 7679msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
7706 7680
7707#: src/transport/plugin_transport_tcp.c:2147 7681#: src/transport/plugin_transport_tcp.c:2147
7708#: src/transport/plugin_transport_xt.c:2143
7709msgid "# bytes transmitted via TCP" 7682msgid "# bytes transmitted via TCP"
7710msgstr "# Bytes über TCP übertragen" 7683msgstr "# Bytes über TCP übertragen"
7711 7684
7712#: src/transport/plugin_transport_tcp.c:2545 7685#: src/transport/plugin_transport_tcp.c:2545
7713#: src/transport/plugin_transport_xt.c:2541
7714msgid "# requests to create session with invalid address" 7686msgid "# requests to create session with invalid address"
7715msgstr "" 7687msgstr ""
7716 7688
7717#: src/transport/plugin_transport_tcp.c:2721 7689#: src/transport/plugin_transport_tcp.c:2721
7718#: src/transport/plugin_transport_xt.c:2717
7719msgid "# transport-service disconnect requests for TCP" 7690msgid "# transport-service disconnect requests for TCP"
7720msgstr "" 7691msgstr ""
7721 7692
7722#: src/transport/plugin_transport_tcp.c:3213 7693#: src/transport/plugin_transport_tcp.c:3213
7723#: src/transport/plugin_transport_xt.c:3209
7724#, fuzzy 7694#, fuzzy
7725msgid "# TCP WELCOME messages received" 7695msgid "# TCP WELCOME messages received"
7726msgstr "# verschlüsselter PONG Nachrichten empfangen" 7696msgstr "# verschlüsselter PONG Nachrichten empfangen"
7727 7697
7728#: src/transport/plugin_transport_tcp.c:3419 7698#: src/transport/plugin_transport_tcp.c:3419
7729#: src/transport/plugin_transport_xt.c:3415
7730msgid "# bytes received via TCP" 7699msgid "# bytes received via TCP"
7731msgstr "# Bytes empfangen über TCP" 7700msgstr "# Bytes empfangen über TCP"
7732 7701
7733#: src/transport/plugin_transport_tcp.c:3470 7702#: src/transport/plugin_transport_tcp.c:3470
7734#: src/transport/plugin_transport_tcp.c:3528 7703#: src/transport/plugin_transport_tcp.c:3528
7735#: src/transport/plugin_transport_xt.c:3466
7736#: src/transport/plugin_transport_xt.c:3524
7737#, fuzzy 7704#, fuzzy
7738msgid "# TCP server connections active" 7705msgid "# TCP server connections active"
7739msgstr " Verbindung fehlgeschlagen\n" 7706msgstr " Verbindung fehlgeschlagen\n"
7740 7707
7741#: src/transport/plugin_transport_tcp.c:3474 7708#: src/transport/plugin_transport_tcp.c:3474
7742#: src/transport/plugin_transport_xt.c:3470
7743#, fuzzy 7709#, fuzzy
7744msgid "# TCP server connect events" 7710msgid "# TCP server connect events"
7745msgstr "# verbundener Knoten" 7711msgstr "# verbundener Knoten"
7746 7712
7747#: src/transport/plugin_transport_tcp.c:3480 7713#: src/transport/plugin_transport_tcp.c:3480
7748#: src/transport/plugin_transport_xt.c:3476
7749msgid "TCP connection limit reached, suspending server\n" 7714msgid "TCP connection limit reached, suspending server\n"
7750msgstr "" 7715msgstr ""
7751 7716
7752#: src/transport/plugin_transport_tcp.c:3482 7717#: src/transport/plugin_transport_tcp.c:3482
7753#: src/transport/plugin_transport_xt.c:3478
7754msgid "# TCP service suspended" 7718msgid "# TCP service suspended"
7755msgstr "" 7719msgstr ""
7756 7720
7757#: src/transport/plugin_transport_tcp.c:3522 7721#: src/transport/plugin_transport_tcp.c:3522
7758#: src/transport/plugin_transport_xt.c:3518
7759msgid "# TCP service resumed" 7722msgid "# TCP service resumed"
7760msgstr "" 7723msgstr ""
7761 7724
7762#: src/transport/plugin_transport_tcp.c:3532 7725#: src/transport/plugin_transport_tcp.c:3532
7763#: src/transport/plugin_transport_xt.c:3528
7764msgid "# network-level TCP disconnect events" 7726msgid "# network-level TCP disconnect events"
7765msgstr "" 7727msgstr ""
7766 7728
7767#: src/transport/plugin_transport_tcp.c:3851 7729#: src/transport/plugin_transport_tcp.c:3851
7768#: src/transport/plugin_transport_xt.c:3849
7769msgid "Failed to start service.\n" 7730msgid "Failed to start service.\n"
7770msgstr "Fehler beim Starten des Dienstes.\n" 7731msgstr "Fehler beim Starten des Dienstes.\n"
7771 7732
@@ -7818,7 +7779,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7818msgstr "UDP-Sockets können nicht geöffnet werden\n" 7779msgstr "UDP-Sockets können nicht geöffnet werden\n"
7819 7780
7820#: src/transport/plugin_transport_udp.c:3721 7781#: src/transport/plugin_transport_udp.c:3721
7821#: src/transport/plugin_transport_xu.c:2143
7822msgid "Disabling IPv4 since it is not supported on this system!\n" 7782msgid "Disabling IPv4 since it is not supported on this system!\n"
7823msgstr "" 7783msgstr ""
7824 7784
@@ -7828,19 +7788,15 @@ msgstr "UDP-Sockets können nicht geöffnet werden\n"
7828 7788
7829#: src/transport/plugin_transport_udp.c:3883 7789#: src/transport/plugin_transport_udp.c:3883
7830#: src/transport/plugin_transport_udp.c:3897 7790#: src/transport/plugin_transport_udp.c:3897
7831#: src/transport/plugin_transport_xu.c:2301
7832#: src/transport/plugin_transport_xu.c:2315
7833msgid "must be in [0,65535]" 7791msgid "must be in [0,65535]"
7834msgstr "" 7792msgstr ""
7835 7793
7836#: src/transport/plugin_transport_udp.c:3929 7794#: src/transport/plugin_transport_udp.c:3929
7837#: src/transport/plugin_transport_xu.c:2347
7838#, fuzzy 7795#, fuzzy
7839msgid "must be valid IPv4 address" 7796msgid "must be valid IPv4 address"
7840msgstr "»%s« ist keine gültige IP-Adresse.\n" 7797msgstr "»%s« ist keine gültige IP-Adresse.\n"
7841 7798
7842#: src/transport/plugin_transport_udp.c:3956 7799#: src/transport/plugin_transport_udp.c:3956
7843#: src/transport/plugin_transport_xu.c:2374
7844#, fuzzy 7800#, fuzzy
7845msgid "must be valid IPv6 address" 7801msgid "must be valid IPv6 address"
7846msgstr "»%s« ist keine gültige IP-Adresse.\n" 7802msgstr "»%s« ist keine gültige IP-Adresse.\n"
@@ -7926,55 +7882,6 @@ msgstr ""
7926msgid "# sessions allocated" 7882msgid "# sessions allocated"
7927msgstr "# Sitzungsschlüssel akzeptiert" 7883msgstr "# Sitzungsschlüssel akzeptiert"
7928 7884
7929#: src/transport/plugin_transport_xt.c:4010
7930#, fuzzy, c-format
7931msgid "XT transport listening on port %llu\n"
7932msgstr "TCP-Transportdienst wartet auf Port %llu\n"
7933
7934#: src/transport/plugin_transport_xt.c:4014
7935#, fuzzy
7936msgid "XT transport not listening on any port (client only)\n"
7937msgstr "TCP-Transportdienst wartet auf Port %llu\n"
7938
7939#: src/transport/plugin_transport_xt.c:4018
7940#, fuzzy, c-format
7941msgid "XT transport advertises itself as being on port %llu\n"
7942msgstr "TCP-Transportdienst wartet auf Port %llu\n"
7943
7944#: src/transport/plugin_transport_xt.c:4022
7945#, fuzzy
7946msgid "# XT sessions active"
7947msgstr "# aktive TCP-Sitzungen"
7948
7949#: src/transport/plugin_transport_xu.c:1237
7950#, c-format
7951msgid ""
7952"XU could not transmit message to `%s': Network seems down, please check your "
7953"network configuration\n"
7954msgstr ""
7955
7956#: src/transport/plugin_transport_xu.c:1251
7957msgid ""
7958"XU could not transmit IPv6 message! Please check your network configuration "
7959"and disable IPv6 if your connection does not have a global IPv6 address\n"
7960msgstr ""
7961
7962#: src/transport/plugin_transport_xu.c:2125
7963#: src/transport/plugin_transport_xu.c:2224
7964#, fuzzy, c-format
7965msgid "Failed to bind XU socket to %s: %s\n"
7966msgstr "UDP-Sockets können nicht geöffnet werden\n"
7967
7968#: src/transport/plugin_transport_xu.c:2234
7969#, fuzzy
7970msgid "Failed to open XU sockets\n"
7971msgstr "UDP-Sockets können nicht geöffnet werden\n"
7972
7973#: src/transport/plugin_transport_xu.c:2398
7974#, fuzzy
7975msgid "Failed to create XU network sockets\n"
7976msgstr "UDP-Sockets können nicht geöffnet werden\n"
7977
7978#: src/transport/tcp_connection_legacy.c:452 7885#: src/transport/tcp_connection_legacy.c:452
7979#, c-format 7886#, c-format
7980msgid "Access denied to `%s'\n" 7887msgid "Access denied to `%s'\n"
@@ -9175,6 +9082,34 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
9175msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" 9082msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
9176 9083
9177#, fuzzy 9084#, fuzzy
9085#~ msgid "XT transport listening on port %llu\n"
9086#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
9087
9088#, fuzzy
9089#~ msgid "XT transport not listening on any port (client only)\n"
9090#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
9091
9092#, fuzzy
9093#~ msgid "XT transport advertises itself as being on port %llu\n"
9094#~ msgstr "TCP-Transportdienst wartet auf Port %llu\n"
9095
9096#, fuzzy
9097#~ msgid "# XT sessions active"
9098#~ msgstr "# aktive TCP-Sitzungen"
9099
9100#, fuzzy
9101#~ msgid "Failed to bind XU socket to %s: %s\n"
9102#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
9103
9104#, fuzzy
9105#~ msgid "Failed to open XU sockets\n"
9106#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
9107
9108#, fuzzy
9109#~ msgid "Failed to create XU network sockets\n"
9110#~ msgstr "UDP-Sockets können nicht geöffnet werden\n"
9111
9112#, fuzzy
9178#~ msgid "Print information about DV state" 9113#~ msgid "Print information about DV state"
9179#~ msgstr "Informationen über andere GNUnet Knoten ausgeben." 9114#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
9180 9115
diff --git a/po/es.po b/po/es.po
index 220e7958e..5d48bb5e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: gnunet 0.9.5a\n" 9"Project-Id-Version: gnunet 0.9.5a\n"
10"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 10"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
11"POT-Creation-Date: 2019-04-03 14:36+0200\n" 11"POT-Creation-Date: 2019-04-03 16:13+0200\n"
12"PO-Revision-Date: 2013-02-23 17:50+0100\n" 12"PO-Revision-Date: 2013-02-23 17:50+0100\n"
13"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n" 13"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
14"Language-Team: Spanish <es@li.org>\n" 14"Language-Team: Spanish <es@li.org>\n"
@@ -234,7 +234,6 @@ msgstr ""
234"Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)" 234"Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
235 235
236#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 236#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
237#: src/transport/plugin_transport_xt.c:1120
238#: src/transport/tcp_service_legacy.c:557 237#: src/transport/tcp_service_legacy.c:557
239#, c-format 238#, c-format
240msgid "" 239msgid ""
@@ -247,9 +246,6 @@ msgstr ""
247#: src/transport/plugin_transport_tcp.c:1139 246#: src/transport/plugin_transport_tcp.c:1139
248#: src/transport/plugin_transport_tcp.c:1145 247#: src/transport/plugin_transport_tcp.c:1145
249#: src/transport/plugin_transport_tcp.c:3835 248#: src/transport/plugin_transport_tcp.c:3835
250#: src/transport/plugin_transport_xt.c:1139
251#: src/transport/plugin_transport_xt.c:1145
252#: src/transport/plugin_transport_xt.c:3833
253#: src/transport/tcp_service_legacy.c:576 249#: src/transport/tcp_service_legacy.c:576
254#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 250#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
255#: src/util/service.c:1162 251#: src/util/service.c:1162
@@ -260,7 +256,6 @@ msgstr ""
260"configuración!\n" 256"configuración!\n"
261 257
262#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 258#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
263#: src/transport/plugin_transport_xt.c:1176
264#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 259#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
265#: src/util/service.c:1201 260#: src/util/service.c:1201
266#, c-format 261#, c-format
@@ -269,7 +264,6 @@ msgstr ""
269"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n" 264"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
270 265
271#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 266#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
272#: src/transport/plugin_transport_xt.c:1180
273#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 267#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
274#: src/util/service.c:1206 268#: src/util/service.c:1206
275#, c-format 269#, c-format
@@ -277,7 +271,6 @@ msgid "Using `%s' instead\n"
277msgstr "Usando «%s» en su defecto\n" 271msgstr "Usando «%s» en su defecto\n"
278 272
279#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 273#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
280#: src/transport/plugin_transport_xt.c:1211
281#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 274#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
282#, c-format 275#, c-format
283msgid "" 276msgid ""
@@ -288,7 +281,6 @@ msgstr ""
288"«%s», no se pudo crear un «socket» UNIX: %s\n" 281"«%s», no se pudo crear un «socket» UNIX: %s\n"
289 282
290#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 283#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
291#: src/transport/plugin_transport_xt.c:1228
292#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 284#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
293#, c-format 285#, c-format
294msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 286msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -299,7 +291,6 @@ msgstr ""
299#: src/arm/gnunet-service-arm.c:556 291#: src/arm/gnunet-service-arm.c:556
300#: src/transport/plugin_transport_http_server.c:2688 292#: src/transport/plugin_transport_http_server.c:2688
301#: src/transport/plugin_transport_tcp.c:1259 293#: src/transport/plugin_transport_tcp.c:1259
302#: src/transport/plugin_transport_xt.c:1259
303#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 294#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
304#, c-format 295#, c-format
305msgid "Failed to resolve `%s': %s\n" 296msgid "Failed to resolve `%s': %s\n"
@@ -308,7 +299,6 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
308#: src/arm/gnunet-service-arm.c:575 299#: src/arm/gnunet-service-arm.c:575
309#: src/transport/plugin_transport_http_server.c:2706 300#: src/transport/plugin_transport_http_server.c:2706
310#: src/transport/plugin_transport_tcp.c:1278 301#: src/transport/plugin_transport_tcp.c:1278
311#: src/transport/plugin_transport_xt.c:1278
312#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 302#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
313#, c-format 303#, c-format
314msgid "Failed to find %saddress for `%s'.\n" 304msgid "Failed to find %saddress for `%s'.\n"
@@ -7767,8 +7757,6 @@ msgstr "tamaño del mensaje"
7767#: src/transport/plugin_transport_http_server.c:3530 7757#: src/transport/plugin_transport_http_server.c:3530
7768#: src/transport/plugin_transport_tcp.c:3901 7758#: src/transport/plugin_transport_tcp.c:3901
7769#: src/transport/plugin_transport_tcp.c:3908 7759#: src/transport/plugin_transport_tcp.c:3908
7770#: src/transport/plugin_transport_xt.c:3899
7771#: src/transport/plugin_transport_xt.c:3906
7772msgid "TCP_STEALTH not supported on this platform.\n" 7760msgid "TCP_STEALTH not supported on this platform.\n"
7773msgstr "" 7761msgstr ""
7774 7762
@@ -7848,7 +7836,6 @@ msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
7848 7836
7849#: src/transport/plugin_transport_http_server.c:2905 7837#: src/transport/plugin_transport_http_server.c:2905
7850#: src/transport/plugin_transport_udp.c:3627 7838#: src/transport/plugin_transport_udp.c:3627
7851#: src/transport/plugin_transport_xu.c:2049
7852msgid "Disabling IPv6 since it is not supported on this system!\n" 7839msgid "Disabling IPv6 since it is not supported on this system!\n"
7853msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" 7840msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
7854 7841
@@ -7956,8 +7943,6 @@ msgstr "# bytes omitidos por SMTP (salientes)"
7956 7943
7957#: src/transport/plugin_transport_tcp.c:1557 7944#: src/transport/plugin_transport_tcp.c:1557
7958#: src/transport/plugin_transport_tcp.c:2883 7945#: src/transport/plugin_transport_tcp.c:2883
7959#: src/transport/plugin_transport_xt.c:1553
7960#: src/transport/plugin_transport_xt.c:2879
7961#, c-format 7946#, c-format
7962msgid "Unexpected address length: %u bytes\n" 7947msgid "Unexpected address length: %u bytes\n"
7963msgstr "Longitud de dirección inesperada: %u bytes\n" 7948msgstr "Longitud de dirección inesperada: %u bytes\n"
@@ -7966,9 +7951,6 @@ msgstr "Longitud de dirección inesperada: %u bytes\n"
7966#: src/transport/plugin_transport_tcp.c:1964 7951#: src/transport/plugin_transport_tcp.c:1964
7967#: src/transport/plugin_transport_tcp.c:3147 7952#: src/transport/plugin_transport_tcp.c:3147
7968#: src/transport/plugin_transport_tcp.c:4024 7953#: src/transport/plugin_transport_tcp.c:4024
7969#: src/transport/plugin_transport_xt.c:1736
7970#: src/transport/plugin_transport_xt.c:1960
7971#: src/transport/plugin_transport_xt.c:3143
7972msgid "# TCP sessions active" 7954msgid "# TCP sessions active"
7973msgstr "# Sesiones TCP activas" 7955msgstr "# Sesiones TCP activas"
7974 7956
@@ -7978,86 +7960,65 @@ msgstr "# Sesiones TCP activas"
7978#: src/transport/plugin_transport_tcp.c:2143 7960#: src/transport/plugin_transport_tcp.c:2143
7979#: src/transport/plugin_transport_tcp.c:2243 7961#: src/transport/plugin_transport_tcp.c:2243
7980#: src/transport/plugin_transport_tcp.c:2268 7962#: src/transport/plugin_transport_tcp.c:2268
7981#: src/transport/plugin_transport_xt.c:1778
7982#: src/transport/plugin_transport_xt.c:1942
7983#: src/transport/plugin_transport_xt.c:2066
7984#: src/transport/plugin_transport_xt.c:2139
7985#: src/transport/plugin_transport_xt.c:2239
7986#: src/transport/plugin_transport_xt.c:2264
7987msgid "# bytes currently in TCP buffers" 7963msgid "# bytes currently in TCP buffers"
7988msgstr "# bytes actualmente en los buffer TCP" 7964msgstr "# bytes actualmente en los buffer TCP"
7989 7965
7990#: src/transport/plugin_transport_tcp.c:1785 7966#: src/transport/plugin_transport_tcp.c:1785
7991#: src/transport/plugin_transport_xt.c:1781
7992msgid "# bytes discarded by TCP (disconnect)" 7967msgid "# bytes discarded by TCP (disconnect)"
7993msgstr "# bytes descartados por TCP (desconectado)" 7968msgstr "# bytes descartados por TCP (desconectado)"
7994 7969
7995#: src/transport/plugin_transport_tcp.c:2073 7970#: src/transport/plugin_transport_tcp.c:2073
7996#: src/transport/plugin_transport_xt.c:2069
7997msgid "# bytes discarded by TCP (timeout)" 7971msgid "# bytes discarded by TCP (timeout)"
7998msgstr "# bytes omitidos por TCP (expirados)" 7972msgstr "# bytes omitidos por TCP (expirados)"
7999 7973
8000#: src/transport/plugin_transport_tcp.c:2147 7974#: src/transport/plugin_transport_tcp.c:2147
8001#: src/transport/plugin_transport_xt.c:2143
8002msgid "# bytes transmitted via TCP" 7975msgid "# bytes transmitted via TCP"
8003msgstr "# bytes recibidos vía TCP" 7976msgstr "# bytes recibidos vía TCP"
8004 7977
8005#: src/transport/plugin_transport_tcp.c:2545 7978#: src/transport/plugin_transport_tcp.c:2545
8006#: src/transport/plugin_transport_xt.c:2541
8007msgid "# requests to create session with invalid address" 7979msgid "# requests to create session with invalid address"
8008msgstr "" 7980msgstr ""
8009 7981
8010#: src/transport/plugin_transport_tcp.c:2721 7982#: src/transport/plugin_transport_tcp.c:2721
8011#: src/transport/plugin_transport_xt.c:2717
8012msgid "# transport-service disconnect requests for TCP" 7983msgid "# transport-service disconnect requests for TCP"
8013msgstr "# peticiones de desconexión del servicio de transporte por TCP" 7984msgstr "# peticiones de desconexión del servicio de transporte por TCP"
8014 7985
8015#: src/transport/plugin_transport_tcp.c:3213 7986#: src/transport/plugin_transport_tcp.c:3213
8016#: src/transport/plugin_transport_xt.c:3209
8017msgid "# TCP WELCOME messages received" 7987msgid "# TCP WELCOME messages received"
8018msgstr "# Mensajes «WELCOME» TCP recibidos" 7988msgstr "# Mensajes «WELCOME» TCP recibidos"
8019 7989
8020#: src/transport/plugin_transport_tcp.c:3419 7990#: src/transport/plugin_transport_tcp.c:3419
8021#: src/transport/plugin_transport_xt.c:3415
8022msgid "# bytes received via TCP" 7991msgid "# bytes received via TCP"
8023msgstr "# bytes recibidos vía TCP" 7992msgstr "# bytes recibidos vía TCP"
8024 7993
8025#: src/transport/plugin_transport_tcp.c:3470 7994#: src/transport/plugin_transport_tcp.c:3470
8026#: src/transport/plugin_transport_tcp.c:3528 7995#: src/transport/plugin_transport_tcp.c:3528
8027#: src/transport/plugin_transport_xt.c:3466
8028#: src/transport/plugin_transport_xt.c:3524
8029#, fuzzy 7996#, fuzzy
8030msgid "# TCP server connections active" 7997msgid "# TCP server connections active"
8031msgstr "# conexiones «stream» activas" 7998msgstr "# conexiones «stream» activas"
8032 7999
8033#: src/transport/plugin_transport_tcp.c:3474 8000#: src/transport/plugin_transport_tcp.c:3474
8034#: src/transport/plugin_transport_xt.c:3470
8035#, fuzzy 8001#, fuzzy
8036msgid "# TCP server connect events" 8002msgid "# TCP server connect events"
8037msgstr "# Pares conectados" 8003msgstr "# Pares conectados"
8038 8004
8039#: src/transport/plugin_transport_tcp.c:3480 8005#: src/transport/plugin_transport_tcp.c:3480
8040#: src/transport/plugin_transport_xt.c:3476
8041msgid "TCP connection limit reached, suspending server\n" 8006msgid "TCP connection limit reached, suspending server\n"
8042msgstr "" 8007msgstr ""
8043 8008
8044#: src/transport/plugin_transport_tcp.c:3482 8009#: src/transport/plugin_transport_tcp.c:3482
8045#: src/transport/plugin_transport_xt.c:3478
8046msgid "# TCP service suspended" 8010msgid "# TCP service suspended"
8047msgstr "" 8011msgstr ""
8048 8012
8049#: src/transport/plugin_transport_tcp.c:3522 8013#: src/transport/plugin_transport_tcp.c:3522
8050#: src/transport/plugin_transport_xt.c:3518
8051msgid "# TCP service resumed" 8014msgid "# TCP service resumed"
8052msgstr "" 8015msgstr ""
8053 8016
8054#: src/transport/plugin_transport_tcp.c:3532 8017#: src/transport/plugin_transport_tcp.c:3532
8055#: src/transport/plugin_transport_xt.c:3528
8056msgid "# network-level TCP disconnect events" 8018msgid "# network-level TCP disconnect events"
8057msgstr "# eventos de desconexión TCP a nivel de red" 8019msgstr "# eventos de desconexión TCP a nivel de red"
8058 8020
8059#: src/transport/plugin_transport_tcp.c:3851 8021#: src/transport/plugin_transport_tcp.c:3851
8060#: src/transport/plugin_transport_xt.c:3849
8061msgid "Failed to start service.\n" 8022msgid "Failed to start service.\n"
8062msgstr "Se produjo un fallo al iniciar el servicio.\n" 8023msgstr "Se produjo un fallo al iniciar el servicio.\n"
8063 8024
@@ -8118,7 +8079,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
8118msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" 8079msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
8119 8080
8120#: src/transport/plugin_transport_udp.c:3721 8081#: src/transport/plugin_transport_udp.c:3721
8121#: src/transport/plugin_transport_xu.c:2143
8122#, fuzzy 8082#, fuzzy
8123msgid "Disabling IPv4 since it is not supported on this system!\n" 8083msgid "Disabling IPv4 since it is not supported on this system!\n"
8124msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" 8084msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
@@ -8129,19 +8089,15 @@ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
8129 8089
8130#: src/transport/plugin_transport_udp.c:3883 8090#: src/transport/plugin_transport_udp.c:3883
8131#: src/transport/plugin_transport_udp.c:3897 8091#: src/transport/plugin_transport_udp.c:3897
8132#: src/transport/plugin_transport_xu.c:2301
8133#: src/transport/plugin_transport_xu.c:2315
8134msgid "must be in [0,65535]" 8092msgid "must be in [0,65535]"
8135msgstr "" 8093msgstr ""
8136 8094
8137#: src/transport/plugin_transport_udp.c:3929 8095#: src/transport/plugin_transport_udp.c:3929
8138#: src/transport/plugin_transport_xu.c:2347
8139#, fuzzy 8096#, fuzzy
8140msgid "must be valid IPv4 address" 8097msgid "must be valid IPv4 address"
8141msgstr "«%s» no es una dirección IP válida.\n" 8098msgstr "«%s» no es una dirección IP válida.\n"
8142 8099
8143#: src/transport/plugin_transport_udp.c:3956 8100#: src/transport/plugin_transport_udp.c:3956
8144#: src/transport/plugin_transport_xu.c:2374
8145#, fuzzy 8101#, fuzzy
8146msgid "must be valid IPv6 address" 8102msgid "must be valid IPv6 address"
8147msgstr "«%s» no es una dirección IP válida.\n" 8103msgstr "«%s» no es una dirección IP válida.\n"
@@ -8231,61 +8187,6 @@ msgstr ""
8231msgid "# sessions allocated" 8187msgid "# sessions allocated"
8232msgstr "# sesiones WLAN alojadas" 8188msgstr "# sesiones WLAN alojadas"
8233 8189
8234#: src/transport/plugin_transport_xt.c:4010
8235#, fuzzy, c-format
8236msgid "XT transport listening on port %llu\n"
8237msgstr "Transporte TCP escuchando en el puerto %llu\n"
8238
8239#: src/transport/plugin_transport_xt.c:4014
8240#, fuzzy
8241msgid "XT transport not listening on any port (client only)\n"
8242msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
8243
8244#: src/transport/plugin_transport_xt.c:4018
8245#, fuzzy, c-format
8246msgid "XT transport advertises itself as being on port %llu\n"
8247msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
8248
8249#: src/transport/plugin_transport_xt.c:4022
8250#, fuzzy
8251msgid "# XT sessions active"
8252msgstr "# Sesiones TCP activas"
8253
8254#: src/transport/plugin_transport_xu.c:1237
8255#, fuzzy, c-format
8256msgid ""
8257"XU could not transmit message to `%s': Network seems down, please check your "
8258"network configuration\n"
8259msgstr ""
8260"UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
8261"compruebe su configuración de red\n"
8262
8263#: src/transport/plugin_transport_xu.c:1251
8264#, fuzzy
8265msgid ""
8266"XU could not transmit IPv6 message! Please check your network configuration "
8267"and disable IPv6 if your connection does not have a global IPv6 address\n"
8268msgstr ""
8269"UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su "
8270"configuración de red y deshabilite IPv6 si su conexión carece de una "
8271"dirección IPv6 global\n"
8272
8273#: src/transport/plugin_transport_xu.c:2125
8274#: src/transport/plugin_transport_xu.c:2224
8275#, fuzzy, c-format
8276msgid "Failed to bind XU socket to %s: %s\n"
8277msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
8278
8279#: src/transport/plugin_transport_xu.c:2234
8280#, fuzzy
8281msgid "Failed to open XU sockets\n"
8282msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
8283
8284#: src/transport/plugin_transport_xu.c:2398
8285#, fuzzy
8286msgid "Failed to create XU network sockets\n"
8287msgstr "Se produjo un fallo al crear una nueva firma"
8288
8289#: src/transport/tcp_connection_legacy.c:452 8190#: src/transport/tcp_connection_legacy.c:452
8290#, c-format 8191#, c-format
8291msgid "Access denied to `%s'\n" 8192msgid "Access denied to `%s'\n"
@@ -9525,6 +9426,53 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
9525msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" 9426msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
9526 9427
9527#, fuzzy 9428#, fuzzy
9429#~ msgid "XT transport listening on port %llu\n"
9430#~ msgstr "Transporte TCP escuchando en el puerto %llu\n"
9431
9432#, fuzzy
9433#~ msgid "XT transport not listening on any port (client only)\n"
9434#~ msgstr ""
9435#~ "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
9436
9437#, fuzzy
9438#~ msgid "XT transport advertises itself as being on port %llu\n"
9439#~ msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
9440
9441#, fuzzy
9442#~ msgid "# XT sessions active"
9443#~ msgstr "# Sesiones TCP activas"
9444
9445#, fuzzy
9446#~ msgid ""
9447#~ "XU could not transmit message to `%s': Network seems down, please check "
9448#~ "your network configuration\n"
9449#~ msgstr ""
9450#~ "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
9451#~ "compruebe su configuración de red\n"
9452
9453#, fuzzy
9454#~ msgid ""
9455#~ "XU could not transmit IPv6 message! Please check your network "
9456#~ "configuration and disable IPv6 if your connection does not have a global "
9457#~ "IPv6 address\n"
9458#~ msgstr ""
9459#~ "UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su "
9460#~ "configuración de red y deshabilite IPv6 si su conexión carece de una "
9461#~ "dirección IPv6 global\n"
9462
9463#, fuzzy
9464#~ msgid "Failed to bind XU socket to %s: %s\n"
9465#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
9466
9467#, fuzzy
9468#~ msgid "Failed to open XU sockets\n"
9469#~ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
9470
9471#, fuzzy
9472#~ msgid "Failed to create XU network sockets\n"
9473#~ msgstr "Se produjo un fallo al crear una nueva firma"
9474
9475#, fuzzy
9528#~ msgid "Print information about DV state" 9476#~ msgid "Print information about DV state"
9529#~ msgstr "Imprime información acerca del estado del ATS" 9477#~ msgstr "Imprime información acerca del estado del ATS"
9530 9478
diff --git a/po/fr.po b/po/fr.po
index 09e8993ac..6f0ab8c4b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: gnunet 0.10.1\n" 8"Project-Id-Version: gnunet 0.10.1\n"
9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
10"POT-Creation-Date: 2019-04-03 14:36+0200\n" 10"POT-Creation-Date: 2019-04-03 16:13+0200\n"
11"PO-Revision-Date: 2015-12-24 01:20+0100\n" 11"PO-Revision-Date: 2015-12-24 01:20+0100\n"
12"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" 12"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
13"Language-Team: French <traduc@traduc.org>\n" 13"Language-Team: French <traduc@traduc.org>\n"
@@ -221,7 +221,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
221msgstr "" 221msgstr ""
222 222
223#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 223#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
224#: src/transport/plugin_transport_xt.c:1120
225#: src/transport/tcp_service_legacy.c:557 224#: src/transport/tcp_service_legacy.c:557
226#, c-format 225#, c-format
227msgid "" 226msgid ""
@@ -232,9 +231,6 @@ msgstr ""
232#: src/transport/plugin_transport_tcp.c:1139 231#: src/transport/plugin_transport_tcp.c:1139
233#: src/transport/plugin_transport_tcp.c:1145 232#: src/transport/plugin_transport_tcp.c:1145
234#: src/transport/plugin_transport_tcp.c:3835 233#: src/transport/plugin_transport_tcp.c:3835
235#: src/transport/plugin_transport_xt.c:1139
236#: src/transport/plugin_transport_xt.c:1145
237#: src/transport/plugin_transport_xt.c:3833
238#: src/transport/tcp_service_legacy.c:576 234#: src/transport/tcp_service_legacy.c:576
239#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 235#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
240#: src/util/service.c:1162 236#: src/util/service.c:1162
@@ -243,7 +239,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
243msgstr "" 239msgstr ""
244 240
245#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 241#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
246#: src/transport/plugin_transport_xt.c:1176
247#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 242#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
248#: src/util/service.c:1201 243#: src/util/service.c:1201
249#, c-format 244#, c-format
@@ -251,7 +246,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
251msgstr "" 246msgstr ""
252 247
253#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 248#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
254#: src/transport/plugin_transport_xt.c:1180
255#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 249#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
256#: src/util/service.c:1206 250#: src/util/service.c:1206
257#, c-format 251#, c-format
@@ -259,7 +253,6 @@ msgid "Using `%s' instead\n"
259msgstr "" 253msgstr ""
260 254
261#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 255#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
262#: src/transport/plugin_transport_xt.c:1211
263#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 256#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
264#, c-format 257#, c-format
265msgid "" 258msgid ""
@@ -268,7 +261,6 @@ msgid ""
268msgstr "" 261msgstr ""
269 262
270#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 263#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
271#: src/transport/plugin_transport_xt.c:1228
272#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 264#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
273#, c-format 265#, c-format
274msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 266msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -277,7 +269,6 @@ msgstr ""
277#: src/arm/gnunet-service-arm.c:556 269#: src/arm/gnunet-service-arm.c:556
278#: src/transport/plugin_transport_http_server.c:2688 270#: src/transport/plugin_transport_http_server.c:2688
279#: src/transport/plugin_transport_tcp.c:1259 271#: src/transport/plugin_transport_tcp.c:1259
280#: src/transport/plugin_transport_xt.c:1259
281#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 272#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
282#, c-format 273#, c-format
283msgid "Failed to resolve `%s': %s\n" 274msgid "Failed to resolve `%s': %s\n"
@@ -286,7 +277,6 @@ msgstr "Résolution de « %s » échouée : %s\n"
286#: src/arm/gnunet-service-arm.c:575 277#: src/arm/gnunet-service-arm.c:575
287#: src/transport/plugin_transport_http_server.c:2706 278#: src/transport/plugin_transport_http_server.c:2706
288#: src/transport/plugin_transport_tcp.c:1278 279#: src/transport/plugin_transport_tcp.c:1278
289#: src/transport/plugin_transport_xt.c:1278
290#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 280#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
291#, c-format 281#, c-format
292msgid "Failed to find %saddress for `%s'.\n" 282msgid "Failed to find %saddress for `%s'.\n"
@@ -7195,8 +7185,6 @@ msgstr ""
7195#: src/transport/plugin_transport_http_server.c:3530 7185#: src/transport/plugin_transport_http_server.c:3530
7196#: src/transport/plugin_transport_tcp.c:3901 7186#: src/transport/plugin_transport_tcp.c:3901
7197#: src/transport/plugin_transport_tcp.c:3908 7187#: src/transport/plugin_transport_tcp.c:3908
7198#: src/transport/plugin_transport_xt.c:3899
7199#: src/transport/plugin_transport_xt.c:3906
7200msgid "TCP_STEALTH not supported on this platform.\n" 7188msgid "TCP_STEALTH not supported on this platform.\n"
7201msgstr "" 7189msgstr ""
7202 7190
@@ -7266,7 +7254,6 @@ msgstr ""
7266 7254
7267#: src/transport/plugin_transport_http_server.c:2905 7255#: src/transport/plugin_transport_http_server.c:2905
7268#: src/transport/plugin_transport_udp.c:3627 7256#: src/transport/plugin_transport_udp.c:3627
7269#: src/transport/plugin_transport_xu.c:2049
7270msgid "Disabling IPv6 since it is not supported on this system!\n" 7257msgid "Disabling IPv6 since it is not supported on this system!\n"
7271msgstr "" 7258msgstr ""
7272 7259
@@ -7366,8 +7353,6 @@ msgstr ""
7366 7353
7367#: src/transport/plugin_transport_tcp.c:1557 7354#: src/transport/plugin_transport_tcp.c:1557
7368#: src/transport/plugin_transport_tcp.c:2883 7355#: src/transport/plugin_transport_tcp.c:2883
7369#: src/transport/plugin_transport_xt.c:1553
7370#: src/transport/plugin_transport_xt.c:2879
7371#, c-format 7356#, c-format
7372msgid "Unexpected address length: %u bytes\n" 7357msgid "Unexpected address length: %u bytes\n"
7373msgstr "" 7358msgstr ""
@@ -7376,9 +7361,6 @@ msgstr ""
7376#: src/transport/plugin_transport_tcp.c:1964 7361#: src/transport/plugin_transport_tcp.c:1964
7377#: src/transport/plugin_transport_tcp.c:3147 7362#: src/transport/plugin_transport_tcp.c:3147
7378#: src/transport/plugin_transport_tcp.c:4024 7363#: src/transport/plugin_transport_tcp.c:4024
7379#: src/transport/plugin_transport_xt.c:1736
7380#: src/transport/plugin_transport_xt.c:1960
7381#: src/transport/plugin_transport_xt.c:3143
7382msgid "# TCP sessions active" 7364msgid "# TCP sessions active"
7383msgstr "# Session TCP active" 7365msgstr "# Session TCP active"
7384 7366
@@ -7388,85 +7370,64 @@ msgstr "# Session TCP active"
7388#: src/transport/plugin_transport_tcp.c:2143 7370#: src/transport/plugin_transport_tcp.c:2143
7389#: src/transport/plugin_transport_tcp.c:2243 7371#: src/transport/plugin_transport_tcp.c:2243
7390#: src/transport/plugin_transport_tcp.c:2268 7372#: src/transport/plugin_transport_tcp.c:2268
7391#: src/transport/plugin_transport_xt.c:1778
7392#: src/transport/plugin_transport_xt.c:1942
7393#: src/transport/plugin_transport_xt.c:2066
7394#: src/transport/plugin_transport_xt.c:2139
7395#: src/transport/plugin_transport_xt.c:2239
7396#: src/transport/plugin_transport_xt.c:2264
7397msgid "# bytes currently in TCP buffers" 7373msgid "# bytes currently in TCP buffers"
7398msgstr "" 7374msgstr ""
7399 7375
7400#: src/transport/plugin_transport_tcp.c:1785 7376#: src/transport/plugin_transport_tcp.c:1785
7401#: src/transport/plugin_transport_xt.c:1781
7402msgid "# bytes discarded by TCP (disconnect)" 7377msgid "# bytes discarded by TCP (disconnect)"
7403msgstr "" 7378msgstr ""
7404 7379
7405#: src/transport/plugin_transport_tcp.c:2073 7380#: src/transport/plugin_transport_tcp.c:2073
7406#: src/transport/plugin_transport_xt.c:2069
7407msgid "# bytes discarded by TCP (timeout)" 7381msgid "# bytes discarded by TCP (timeout)"
7408msgstr "" 7382msgstr ""
7409 7383
7410#: src/transport/plugin_transport_tcp.c:2147 7384#: src/transport/plugin_transport_tcp.c:2147
7411#: src/transport/plugin_transport_xt.c:2143
7412msgid "# bytes transmitted via TCP" 7385msgid "# bytes transmitted via TCP"
7413msgstr "" 7386msgstr ""
7414 7387
7415#: src/transport/plugin_transport_tcp.c:2545 7388#: src/transport/plugin_transport_tcp.c:2545
7416#: src/transport/plugin_transport_xt.c:2541
7417msgid "# requests to create session with invalid address" 7389msgid "# requests to create session with invalid address"
7418msgstr "" 7390msgstr ""
7419 7391
7420#: src/transport/plugin_transport_tcp.c:2721 7392#: src/transport/plugin_transport_tcp.c:2721
7421#: src/transport/plugin_transport_xt.c:2717
7422msgid "# transport-service disconnect requests for TCP" 7393msgid "# transport-service disconnect requests for TCP"
7423msgstr "" 7394msgstr ""
7424 7395
7425#: src/transport/plugin_transport_tcp.c:3213 7396#: src/transport/plugin_transport_tcp.c:3213
7426#: src/transport/plugin_transport_xt.c:3209
7427msgid "# TCP WELCOME messages received" 7397msgid "# TCP WELCOME messages received"
7428msgstr "" 7398msgstr ""
7429 7399
7430#: src/transport/plugin_transport_tcp.c:3419 7400#: src/transport/plugin_transport_tcp.c:3419
7431#: src/transport/plugin_transport_xt.c:3415
7432msgid "# bytes received via TCP" 7401msgid "# bytes received via TCP"
7433msgstr "" 7402msgstr ""
7434 7403
7435#: src/transport/plugin_transport_tcp.c:3470 7404#: src/transport/plugin_transport_tcp.c:3470
7436#: src/transport/plugin_transport_tcp.c:3528 7405#: src/transport/plugin_transport_tcp.c:3528
7437#: src/transport/plugin_transport_xt.c:3466
7438#: src/transport/plugin_transport_xt.c:3524
7439#, fuzzy 7406#, fuzzy
7440msgid "# TCP server connections active" 7407msgid "# TCP server connections active"
7441msgstr "# Session TCP active" 7408msgstr "# Session TCP active"
7442 7409
7443#: src/transport/plugin_transport_tcp.c:3474 7410#: src/transport/plugin_transport_tcp.c:3474
7444#: src/transport/plugin_transport_xt.c:3470
7445msgid "# TCP server connect events" 7411msgid "# TCP server connect events"
7446msgstr "" 7412msgstr ""
7447 7413
7448#: src/transport/plugin_transport_tcp.c:3480 7414#: src/transport/plugin_transport_tcp.c:3480
7449#: src/transport/plugin_transport_xt.c:3476
7450msgid "TCP connection limit reached, suspending server\n" 7415msgid "TCP connection limit reached, suspending server\n"
7451msgstr "" 7416msgstr ""
7452 7417
7453#: src/transport/plugin_transport_tcp.c:3482 7418#: src/transport/plugin_transport_tcp.c:3482
7454#: src/transport/plugin_transport_xt.c:3478
7455msgid "# TCP service suspended" 7419msgid "# TCP service suspended"
7456msgstr "" 7420msgstr ""
7457 7421
7458#: src/transport/plugin_transport_tcp.c:3522 7422#: src/transport/plugin_transport_tcp.c:3522
7459#: src/transport/plugin_transport_xt.c:3518
7460msgid "# TCP service resumed" 7423msgid "# TCP service resumed"
7461msgstr "" 7424msgstr ""
7462 7425
7463#: src/transport/plugin_transport_tcp.c:3532 7426#: src/transport/plugin_transport_tcp.c:3532
7464#: src/transport/plugin_transport_xt.c:3528
7465msgid "# network-level TCP disconnect events" 7427msgid "# network-level TCP disconnect events"
7466msgstr "" 7428msgstr ""
7467 7429
7468#: src/transport/plugin_transport_tcp.c:3851 7430#: src/transport/plugin_transport_tcp.c:3851
7469#: src/transport/plugin_transport_xt.c:3849
7470msgid "Failed to start service.\n" 7431msgid "Failed to start service.\n"
7471msgstr "" 7432msgstr ""
7472 7433
@@ -7518,7 +7479,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7518msgstr "Résolution de « %s » échouée : %s\n" 7479msgstr "Résolution de « %s » échouée : %s\n"
7519 7480
7520#: src/transport/plugin_transport_udp.c:3721 7481#: src/transport/plugin_transport_udp.c:3721
7521#: src/transport/plugin_transport_xu.c:2143
7522msgid "Disabling IPv4 since it is not supported on this system!\n" 7482msgid "Disabling IPv4 since it is not supported on this system!\n"
7523msgstr "" 7483msgstr ""
7524 7484
@@ -7528,19 +7488,15 @@ msgstr ""
7528 7488
7529#: src/transport/plugin_transport_udp.c:3883 7489#: src/transport/plugin_transport_udp.c:3883
7530#: src/transport/plugin_transport_udp.c:3897 7490#: src/transport/plugin_transport_udp.c:3897
7531#: src/transport/plugin_transport_xu.c:2301
7532#: src/transport/plugin_transport_xu.c:2315
7533msgid "must be in [0,65535]" 7491msgid "must be in [0,65535]"
7534msgstr "" 7492msgstr ""
7535 7493
7536#: src/transport/plugin_transport_udp.c:3929 7494#: src/transport/plugin_transport_udp.c:3929
7537#: src/transport/plugin_transport_xu.c:2347
7538#, fuzzy 7495#, fuzzy
7539msgid "must be valid IPv4 address" 7496msgid "must be valid IPv4 address"
7540msgstr "adresse invalide" 7497msgstr "adresse invalide"
7541 7498
7542#: src/transport/plugin_transport_udp.c:3956 7499#: src/transport/plugin_transport_udp.c:3956
7543#: src/transport/plugin_transport_xu.c:2374
7544#, fuzzy 7500#, fuzzy
7545msgid "must be valid IPv6 address" 7501msgid "must be valid IPv6 address"
7546msgstr "adresse invalide" 7502msgstr "adresse invalide"
@@ -7616,54 +7572,6 @@ msgstr ""
7616msgid "# sessions allocated" 7572msgid "# sessions allocated"
7617msgstr "# Session TCP active" 7573msgstr "# Session TCP active"
7618 7574
7619#: src/transport/plugin_transport_xt.c:4010
7620#, c-format
7621msgid "XT transport listening on port %llu\n"
7622msgstr ""
7623
7624#: src/transport/plugin_transport_xt.c:4014
7625msgid "XT transport not listening on any port (client only)\n"
7626msgstr ""
7627
7628#: src/transport/plugin_transport_xt.c:4018
7629#, c-format
7630msgid "XT transport advertises itself as being on port %llu\n"
7631msgstr ""
7632
7633#: src/transport/plugin_transport_xt.c:4022
7634#, fuzzy
7635msgid "# XT sessions active"
7636msgstr "# Session TCP active"
7637
7638#: src/transport/plugin_transport_xu.c:1237
7639#, c-format
7640msgid ""
7641"XU could not transmit message to `%s': Network seems down, please check your "
7642"network configuration\n"
7643msgstr ""
7644
7645#: src/transport/plugin_transport_xu.c:1251
7646msgid ""
7647"XU could not transmit IPv6 message! Please check your network configuration "
7648"and disable IPv6 if your connection does not have a global IPv6 address\n"
7649msgstr ""
7650
7651#: src/transport/plugin_transport_xu.c:2125
7652#: src/transport/plugin_transport_xu.c:2224
7653#, fuzzy, c-format
7654msgid "Failed to bind XU socket to %s: %s\n"
7655msgstr "Résolution de « %s » échouée : %s\n"
7656
7657#: src/transport/plugin_transport_xu.c:2234
7658#, fuzzy
7659msgid "Failed to open XU sockets\n"
7660msgstr "Résolution de « %s » échouée : %s\n"
7661
7662#: src/transport/plugin_transport_xu.c:2398
7663#, fuzzy
7664msgid "Failed to create XU network sockets\n"
7665msgstr "Résolution de « %s » échouée : %s\n"
7666
7667#: src/transport/tcp_connection_legacy.c:452 7575#: src/transport/tcp_connection_legacy.c:452
7668#, c-format 7576#, c-format
7669msgid "Access denied to `%s'\n" 7577msgid "Access denied to `%s'\n"
@@ -8834,6 +8742,22 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
8834msgstr "" 8742msgstr ""
8835 8743
8836#, fuzzy 8744#, fuzzy
8745#~ msgid "# XT sessions active"
8746#~ msgstr "# Session TCP active"
8747
8748#, fuzzy
8749#~ msgid "Failed to bind XU socket to %s: %s\n"
8750#~ msgstr "Résolution de « %s » échouée : %s\n"
8751
8752#, fuzzy
8753#~ msgid "Failed to open XU sockets\n"
8754#~ msgstr "Résolution de « %s » échouée : %s\n"
8755
8756#, fuzzy
8757#~ msgid "Failed to create XU network sockets\n"
8758#~ msgstr "Résolution de « %s » échouée : %s\n"
8759
8760#, fuzzy
8837#~ msgid "Dropping invalid fragment\n" 8761#~ msgid "Dropping invalid fragment\n"
8838#~ msgstr "Argument invalide « %s »\n" 8762#~ msgstr "Argument invalide « %s »\n"
8839 8763
diff --git a/po/it.po b/po/it.po
index bb7e031c3..1607f5bdd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: gnunet 0.10.1\n" 8"Project-Id-Version: gnunet 0.10.1\n"
9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
10"POT-Creation-Date: 2019-04-03 14:36+0200\n" 10"POT-Creation-Date: 2019-04-03 16:13+0200\n"
11"PO-Revision-Date: 2018-08-29 13:48+0200\n" 11"PO-Revision-Date: 2018-08-29 13:48+0200\n"
12"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n" 12"Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
13"Language-Team: Italian <tp@lists.linux.it>\n" 13"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -217,7 +217,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
217msgstr "" 217msgstr ""
218 218
219#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 219#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
220#: src/transport/plugin_transport_xt.c:1120
221#: src/transport/tcp_service_legacy.c:557 220#: src/transport/tcp_service_legacy.c:557
222#, c-format 221#, c-format
223msgid "" 222msgid ""
@@ -228,9 +227,6 @@ msgstr ""
228#: src/transport/plugin_transport_tcp.c:1139 227#: src/transport/plugin_transport_tcp.c:1139
229#: src/transport/plugin_transport_tcp.c:1145 228#: src/transport/plugin_transport_tcp.c:1145
230#: src/transport/plugin_transport_tcp.c:3835 229#: src/transport/plugin_transport_tcp.c:3835
231#: src/transport/plugin_transport_xt.c:1139
232#: src/transport/plugin_transport_xt.c:1145
233#: src/transport/plugin_transport_xt.c:3833
234#: src/transport/tcp_service_legacy.c:576 230#: src/transport/tcp_service_legacy.c:576
235#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 231#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
236#: src/util/service.c:1162 232#: src/util/service.c:1162
@@ -239,7 +235,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
239msgstr "" 235msgstr ""
240 236
241#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 237#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
242#: src/transport/plugin_transport_xt.c:1176
243#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 238#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
244#: src/util/service.c:1201 239#: src/util/service.c:1201
245#, c-format 240#, c-format
@@ -247,7 +242,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
247msgstr "" 242msgstr ""
248 243
249#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 244#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
250#: src/transport/plugin_transport_xt.c:1180
251#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 245#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
252#: src/util/service.c:1206 246#: src/util/service.c:1206
253#, c-format 247#, c-format
@@ -255,7 +249,6 @@ msgid "Using `%s' instead\n"
255msgstr "" 249msgstr ""
256 250
257#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 251#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
258#: src/transport/plugin_transport_xt.c:1211
259#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 252#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
260#, c-format 253#, c-format
261msgid "" 254msgid ""
@@ -264,7 +257,6 @@ msgid ""
264msgstr "" 257msgstr ""
265 258
266#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 259#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
267#: src/transport/plugin_transport_xt.c:1228
268#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 260#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
269#, c-format 261#, c-format
270msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 262msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -273,7 +265,6 @@ msgstr ""
273#: src/arm/gnunet-service-arm.c:556 265#: src/arm/gnunet-service-arm.c:556
274#: src/transport/plugin_transport_http_server.c:2688 266#: src/transport/plugin_transport_http_server.c:2688
275#: src/transport/plugin_transport_tcp.c:1259 267#: src/transport/plugin_transport_tcp.c:1259
276#: src/transport/plugin_transport_xt.c:1259
277#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 268#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
278#, c-format 269#, c-format
279msgid "Failed to resolve `%s': %s\n" 270msgid "Failed to resolve `%s': %s\n"
@@ -282,7 +273,6 @@ msgstr ""
282#: src/arm/gnunet-service-arm.c:575 273#: src/arm/gnunet-service-arm.c:575
283#: src/transport/plugin_transport_http_server.c:2706 274#: src/transport/plugin_transport_http_server.c:2706
284#: src/transport/plugin_transport_tcp.c:1278 275#: src/transport/plugin_transport_tcp.c:1278
285#: src/transport/plugin_transport_xt.c:1278
286#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 276#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
287#, c-format 277#, c-format
288msgid "Failed to find %saddress for `%s'.\n" 278msgid "Failed to find %saddress for `%s'.\n"
@@ -7190,8 +7180,6 @@ msgstr ""
7190#: src/transport/plugin_transport_http_server.c:3530 7180#: src/transport/plugin_transport_http_server.c:3530
7191#: src/transport/plugin_transport_tcp.c:3901 7181#: src/transport/plugin_transport_tcp.c:3901
7192#: src/transport/plugin_transport_tcp.c:3908 7182#: src/transport/plugin_transport_tcp.c:3908
7193#: src/transport/plugin_transport_xt.c:3899
7194#: src/transport/plugin_transport_xt.c:3906
7195msgid "TCP_STEALTH not supported on this platform.\n" 7183msgid "TCP_STEALTH not supported on this platform.\n"
7196msgstr "" 7184msgstr ""
7197 7185
@@ -7261,7 +7249,6 @@ msgstr ""
7261 7249
7262#: src/transport/plugin_transport_http_server.c:2905 7250#: src/transport/plugin_transport_http_server.c:2905
7263#: src/transport/plugin_transport_udp.c:3627 7251#: src/transport/plugin_transport_udp.c:3627
7264#: src/transport/plugin_transport_xu.c:2049
7265msgid "Disabling IPv6 since it is not supported on this system!\n" 7252msgid "Disabling IPv6 since it is not supported on this system!\n"
7266msgstr "" 7253msgstr ""
7267 7254
@@ -7361,8 +7348,6 @@ msgstr ""
7361 7348
7362#: src/transport/plugin_transport_tcp.c:1557 7349#: src/transport/plugin_transport_tcp.c:1557
7363#: src/transport/plugin_transport_tcp.c:2883 7350#: src/transport/plugin_transport_tcp.c:2883
7364#: src/transport/plugin_transport_xt.c:1553
7365#: src/transport/plugin_transport_xt.c:2879
7366#, c-format 7351#, c-format
7367msgid "Unexpected address length: %u bytes\n" 7352msgid "Unexpected address length: %u bytes\n"
7368msgstr "" 7353msgstr ""
@@ -7371,9 +7356,6 @@ msgstr ""
7371#: src/transport/plugin_transport_tcp.c:1964 7356#: src/transport/plugin_transport_tcp.c:1964
7372#: src/transport/plugin_transport_tcp.c:3147 7357#: src/transport/plugin_transport_tcp.c:3147
7373#: src/transport/plugin_transport_tcp.c:4024 7358#: src/transport/plugin_transport_tcp.c:4024
7374#: src/transport/plugin_transport_xt.c:1736
7375#: src/transport/plugin_transport_xt.c:1960
7376#: src/transport/plugin_transport_xt.c:3143
7377msgid "# TCP sessions active" 7359msgid "# TCP sessions active"
7378msgstr "" 7360msgstr ""
7379 7361
@@ -7383,85 +7365,64 @@ msgstr ""
7383#: src/transport/plugin_transport_tcp.c:2143 7365#: src/transport/plugin_transport_tcp.c:2143
7384#: src/transport/plugin_transport_tcp.c:2243 7366#: src/transport/plugin_transport_tcp.c:2243
7385#: src/transport/plugin_transport_tcp.c:2268 7367#: src/transport/plugin_transport_tcp.c:2268
7386#: src/transport/plugin_transport_xt.c:1778
7387#: src/transport/plugin_transport_xt.c:1942
7388#: src/transport/plugin_transport_xt.c:2066
7389#: src/transport/plugin_transport_xt.c:2139
7390#: src/transport/plugin_transport_xt.c:2239
7391#: src/transport/plugin_transport_xt.c:2264
7392msgid "# bytes currently in TCP buffers" 7368msgid "# bytes currently in TCP buffers"
7393msgstr "" 7369msgstr ""
7394 7370
7395#: src/transport/plugin_transport_tcp.c:1785 7371#: src/transport/plugin_transport_tcp.c:1785
7396#: src/transport/plugin_transport_xt.c:1781
7397msgid "# bytes discarded by TCP (disconnect)" 7372msgid "# bytes discarded by TCP (disconnect)"
7398msgstr "" 7373msgstr ""
7399 7374
7400#: src/transport/plugin_transport_tcp.c:2073 7375#: src/transport/plugin_transport_tcp.c:2073
7401#: src/transport/plugin_transport_xt.c:2069
7402msgid "# bytes discarded by TCP (timeout)" 7376msgid "# bytes discarded by TCP (timeout)"
7403msgstr "" 7377msgstr ""
7404 7378
7405#: src/transport/plugin_transport_tcp.c:2147 7379#: src/transport/plugin_transport_tcp.c:2147
7406#: src/transport/plugin_transport_xt.c:2143
7407msgid "# bytes transmitted via TCP" 7380msgid "# bytes transmitted via TCP"
7408msgstr "" 7381msgstr ""
7409 7382
7410#: src/transport/plugin_transport_tcp.c:2545 7383#: src/transport/plugin_transport_tcp.c:2545
7411#: src/transport/plugin_transport_xt.c:2541
7412msgid "# requests to create session with invalid address" 7384msgid "# requests to create session with invalid address"
7413msgstr "" 7385msgstr ""
7414 7386
7415#: src/transport/plugin_transport_tcp.c:2721 7387#: src/transport/plugin_transport_tcp.c:2721
7416#: src/transport/plugin_transport_xt.c:2717
7417msgid "# transport-service disconnect requests for TCP" 7388msgid "# transport-service disconnect requests for TCP"
7418msgstr "" 7389msgstr ""
7419 7390
7420#: src/transport/plugin_transport_tcp.c:3213 7391#: src/transport/plugin_transport_tcp.c:3213
7421#: src/transport/plugin_transport_xt.c:3209
7422msgid "# TCP WELCOME messages received" 7392msgid "# TCP WELCOME messages received"
7423msgstr "" 7393msgstr ""
7424 7394
7425#: src/transport/plugin_transport_tcp.c:3419 7395#: src/transport/plugin_transport_tcp.c:3419
7426#: src/transport/plugin_transport_xt.c:3415
7427msgid "# bytes received via TCP" 7396msgid "# bytes received via TCP"
7428msgstr "" 7397msgstr ""
7429 7398
7430#: src/transport/plugin_transport_tcp.c:3470 7399#: src/transport/plugin_transport_tcp.c:3470
7431#: src/transport/plugin_transport_tcp.c:3528 7400#: src/transport/plugin_transport_tcp.c:3528
7432#: src/transport/plugin_transport_xt.c:3466
7433#: src/transport/plugin_transport_xt.c:3524
7434#, fuzzy 7401#, fuzzy
7435msgid "# TCP server connections active" 7402msgid "# TCP server connections active"
7436msgstr "# connessioni attive" 7403msgstr "# connessioni attive"
7437 7404
7438#: src/transport/plugin_transport_tcp.c:3474 7405#: src/transport/plugin_transport_tcp.c:3474
7439#: src/transport/plugin_transport_xt.c:3470
7440msgid "# TCP server connect events" 7406msgid "# TCP server connect events"
7441msgstr "" 7407msgstr ""
7442 7408
7443#: src/transport/plugin_transport_tcp.c:3480 7409#: src/transport/plugin_transport_tcp.c:3480
7444#: src/transport/plugin_transport_xt.c:3476
7445msgid "TCP connection limit reached, suspending server\n" 7410msgid "TCP connection limit reached, suspending server\n"
7446msgstr "" 7411msgstr ""
7447 7412
7448#: src/transport/plugin_transport_tcp.c:3482 7413#: src/transport/plugin_transport_tcp.c:3482
7449#: src/transport/plugin_transport_xt.c:3478
7450msgid "# TCP service suspended" 7414msgid "# TCP service suspended"
7451msgstr "" 7415msgstr ""
7452 7416
7453#: src/transport/plugin_transport_tcp.c:3522 7417#: src/transport/plugin_transport_tcp.c:3522
7454#: src/transport/plugin_transport_xt.c:3518
7455msgid "# TCP service resumed" 7418msgid "# TCP service resumed"
7456msgstr "" 7419msgstr ""
7457 7420
7458#: src/transport/plugin_transport_tcp.c:3532 7421#: src/transport/plugin_transport_tcp.c:3532
7459#: src/transport/plugin_transport_xt.c:3528
7460msgid "# network-level TCP disconnect events" 7422msgid "# network-level TCP disconnect events"
7461msgstr "" 7423msgstr ""
7462 7424
7463#: src/transport/plugin_transport_tcp.c:3851 7425#: src/transport/plugin_transport_tcp.c:3851
7464#: src/transport/plugin_transport_xt.c:3849
7465msgid "Failed to start service.\n" 7426msgid "Failed to start service.\n"
7466msgstr "" 7427msgstr ""
7467 7428
@@ -7513,7 +7474,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7513msgstr "" 7474msgstr ""
7514 7475
7515#: src/transport/plugin_transport_udp.c:3721 7476#: src/transport/plugin_transport_udp.c:3721
7516#: src/transport/plugin_transport_xu.c:2143
7517msgid "Disabling IPv4 since it is not supported on this system!\n" 7477msgid "Disabling IPv4 since it is not supported on this system!\n"
7518msgstr "" 7478msgstr ""
7519 7479
@@ -7523,19 +7483,15 @@ msgstr ""
7523 7483
7524#: src/transport/plugin_transport_udp.c:3883 7484#: src/transport/plugin_transport_udp.c:3883
7525#: src/transport/plugin_transport_udp.c:3897 7485#: src/transport/plugin_transport_udp.c:3897
7526#: src/transport/plugin_transport_xu.c:2301
7527#: src/transport/plugin_transport_xu.c:2315
7528msgid "must be in [0,65535]" 7486msgid "must be in [0,65535]"
7529msgstr "" 7487msgstr ""
7530 7488
7531#: src/transport/plugin_transport_udp.c:3929 7489#: src/transport/plugin_transport_udp.c:3929
7532#: src/transport/plugin_transport_xu.c:2347
7533#, fuzzy 7490#, fuzzy
7534msgid "must be valid IPv4 address" 7491msgid "must be valid IPv4 address"
7535msgstr "`%s' non è un indirizzo IP valido.\n" 7492msgstr "`%s' non è un indirizzo IP valido.\n"
7536 7493
7537#: src/transport/plugin_transport_udp.c:3956 7494#: src/transport/plugin_transport_udp.c:3956
7538#: src/transport/plugin_transport_xu.c:2374
7539#, fuzzy 7495#, fuzzy
7540msgid "must be valid IPv6 address" 7496msgid "must be valid IPv6 address"
7541msgstr "`%s' non è un indirizzo IP valido.\n" 7497msgstr "`%s' non è un indirizzo IP valido.\n"
@@ -7613,51 +7569,6 @@ msgstr ""
7613msgid "# sessions allocated" 7569msgid "# sessions allocated"
7614msgstr "" 7570msgstr ""
7615 7571
7616#: src/transport/plugin_transport_xt.c:4010
7617#, c-format
7618msgid "XT transport listening on port %llu\n"
7619msgstr ""
7620
7621#: src/transport/plugin_transport_xt.c:4014
7622msgid "XT transport not listening on any port (client only)\n"
7623msgstr ""
7624
7625#: src/transport/plugin_transport_xt.c:4018
7626#, c-format
7627msgid "XT transport advertises itself as being on port %llu\n"
7628msgstr ""
7629
7630#: src/transport/plugin_transport_xt.c:4022
7631msgid "# XT sessions active"
7632msgstr ""
7633
7634#: src/transport/plugin_transport_xu.c:1237
7635#, c-format
7636msgid ""
7637"XU could not transmit message to `%s': Network seems down, please check your "
7638"network configuration\n"
7639msgstr ""
7640
7641#: src/transport/plugin_transport_xu.c:1251
7642msgid ""
7643"XU could not transmit IPv6 message! Please check your network configuration "
7644"and disable IPv6 if your connection does not have a global IPv6 address\n"
7645msgstr ""
7646
7647#: src/transport/plugin_transport_xu.c:2125
7648#: src/transport/plugin_transport_xu.c:2224
7649#, c-format
7650msgid "Failed to bind XU socket to %s: %s\n"
7651msgstr ""
7652
7653#: src/transport/plugin_transport_xu.c:2234
7654msgid "Failed to open XU sockets\n"
7655msgstr ""
7656
7657#: src/transport/plugin_transport_xu.c:2398
7658msgid "Failed to create XU network sockets\n"
7659msgstr ""
7660
7661#: src/transport/tcp_connection_legacy.c:452 7572#: src/transport/tcp_connection_legacy.c:452
7662#, c-format 7573#, c-format
7663msgid "Access denied to `%s'\n" 7574msgid "Access denied to `%s'\n"
diff --git a/po/sv.po b/po/sv.po
index da73db878..f23447ca6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: GNUnet 0.7.0b\n" 8"Project-Id-Version: GNUnet 0.7.0b\n"
9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
10"POT-Creation-Date: 2019-04-03 14:36+0200\n" 10"POT-Creation-Date: 2019-04-03 16:13+0200\n"
11"PO-Revision-Date: 2006-01-21 17:16+0100\n" 11"PO-Revision-Date: 2006-01-21 17:16+0100\n"
12"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" 12"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -227,7 +227,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
227msgstr "" 227msgstr ""
228 228
229#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 229#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
230#: src/transport/plugin_transport_xt.c:1120
231#: src/transport/tcp_service_legacy.c:557 230#: src/transport/tcp_service_legacy.c:557
232#, c-format 231#, c-format
233msgid "" 232msgid ""
@@ -238,9 +237,6 @@ msgstr ""
238#: src/transport/plugin_transport_tcp.c:1139 237#: src/transport/plugin_transport_tcp.c:1139
239#: src/transport/plugin_transport_tcp.c:1145 238#: src/transport/plugin_transport_tcp.c:1145
240#: src/transport/plugin_transport_tcp.c:3835 239#: src/transport/plugin_transport_tcp.c:3835
241#: src/transport/plugin_transport_xt.c:1139
242#: src/transport/plugin_transport_xt.c:1145
243#: src/transport/plugin_transport_xt.c:3833
244#: src/transport/tcp_service_legacy.c:576 240#: src/transport/tcp_service_legacy.c:576
245#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 241#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
246#: src/util/service.c:1162 242#: src/util/service.c:1162
@@ -249,7 +245,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
249msgstr "" 245msgstr ""
250 246
251#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 247#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
252#: src/transport/plugin_transport_xt.c:1176
253#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 248#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
254#: src/util/service.c:1201 249#: src/util/service.c:1201
255#, c-format 250#, c-format
@@ -257,7 +252,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
257msgstr "" 252msgstr ""
258 253
259#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 254#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
260#: src/transport/plugin_transport_xt.c:1180
261#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 255#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
262#: src/util/service.c:1206 256#: src/util/service.c:1206
263#, fuzzy, c-format 257#, fuzzy, c-format
@@ -265,7 +259,6 @@ msgid "Using `%s' instead\n"
265msgstr "%s: flagga \"%s\" är tvetydig\n" 259msgstr "%s: flagga \"%s\" är tvetydig\n"
266 260
267#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 261#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
268#: src/transport/plugin_transport_xt.c:1211
269#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 262#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
270#, c-format 263#, c-format
271msgid "" 264msgid ""
@@ -274,7 +267,6 @@ msgid ""
274msgstr "" 267msgstr ""
275 268
276#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 269#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
277#: src/transport/plugin_transport_xt.c:1228
278#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 270#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
279#, c-format 271#, c-format
280msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 272msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -283,7 +275,6 @@ msgstr ""
283#: src/arm/gnunet-service-arm.c:556 275#: src/arm/gnunet-service-arm.c:556
284#: src/transport/plugin_transport_http_server.c:2688 276#: src/transport/plugin_transport_http_server.c:2688
285#: src/transport/plugin_transport_tcp.c:1259 277#: src/transport/plugin_transport_tcp.c:1259
286#: src/transport/plugin_transport_xt.c:1259
287#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 278#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
288#, fuzzy, c-format 279#, fuzzy, c-format
289msgid "Failed to resolve `%s': %s\n" 280msgid "Failed to resolve `%s': %s\n"
@@ -292,7 +283,6 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
292#: src/arm/gnunet-service-arm.c:575 283#: src/arm/gnunet-service-arm.c:575
293#: src/transport/plugin_transport_http_server.c:2706 284#: src/transport/plugin_transport_http_server.c:2706
294#: src/transport/plugin_transport_tcp.c:1278 285#: src/transport/plugin_transport_tcp.c:1278
295#: src/transport/plugin_transport_xt.c:1278
296#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 286#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
297#, fuzzy, c-format 287#, fuzzy, c-format
298msgid "Failed to find %saddress for `%s'.\n" 288msgid "Failed to find %saddress for `%s'.\n"
@@ -7569,8 +7559,6 @@ msgstr "meddelandestorlek"
7569#: src/transport/plugin_transport_http_server.c:3530 7559#: src/transport/plugin_transport_http_server.c:3530
7570#: src/transport/plugin_transport_tcp.c:3901 7560#: src/transport/plugin_transport_tcp.c:3901
7571#: src/transport/plugin_transport_tcp.c:3908 7561#: src/transport/plugin_transport_tcp.c:3908
7572#: src/transport/plugin_transport_xt.c:3899
7573#: src/transport/plugin_transport_xt.c:3906
7574msgid "TCP_STEALTH not supported on this platform.\n" 7562msgid "TCP_STEALTH not supported on this platform.\n"
7575msgstr "" 7563msgstr ""
7576 7564
@@ -7642,7 +7630,6 @@ msgstr ""
7642 7630
7643#: src/transport/plugin_transport_http_server.c:2905 7631#: src/transport/plugin_transport_http_server.c:2905
7644#: src/transport/plugin_transport_udp.c:3627 7632#: src/transport/plugin_transport_udp.c:3627
7645#: src/transport/plugin_transport_xu.c:2049
7646msgid "Disabling IPv6 since it is not supported on this system!\n" 7633msgid "Disabling IPv6 since it is not supported on this system!\n"
7647msgstr "" 7634msgstr ""
7648 7635
@@ -7754,8 +7741,6 @@ msgstr "# byte kastade via TCP (utgående)"
7754 7741
7755#: src/transport/plugin_transport_tcp.c:1557 7742#: src/transport/plugin_transport_tcp.c:1557
7756#: src/transport/plugin_transport_tcp.c:2883 7743#: src/transport/plugin_transport_tcp.c:2883
7757#: src/transport/plugin_transport_xt.c:1553
7758#: src/transport/plugin_transport_xt.c:2879
7759#, c-format 7744#, c-format
7760msgid "Unexpected address length: %u bytes\n" 7745msgid "Unexpected address length: %u bytes\n"
7761msgstr "" 7746msgstr ""
@@ -7764,9 +7749,6 @@ msgstr ""
7764#: src/transport/plugin_transport_tcp.c:1964 7749#: src/transport/plugin_transport_tcp.c:1964
7765#: src/transport/plugin_transport_tcp.c:3147 7750#: src/transport/plugin_transport_tcp.c:3147
7766#: src/transport/plugin_transport_tcp.c:4024 7751#: src/transport/plugin_transport_tcp.c:4024
7767#: src/transport/plugin_transport_xt.c:1736
7768#: src/transport/plugin_transport_xt.c:1960
7769#: src/transport/plugin_transport_xt.c:3143
7770#, fuzzy 7752#, fuzzy
7771msgid "# TCP sessions active" 7753msgid "# TCP sessions active"
7772msgstr "# sessionsnycklar accepterade" 7754msgstr "# sessionsnycklar accepterade"
@@ -7777,91 +7759,70 @@ msgstr "# sessionsnycklar accepterade"
7777#: src/transport/plugin_transport_tcp.c:2143 7759#: src/transport/plugin_transport_tcp.c:2143
7778#: src/transport/plugin_transport_tcp.c:2243 7760#: src/transport/plugin_transport_tcp.c:2243
7779#: src/transport/plugin_transport_tcp.c:2268 7761#: src/transport/plugin_transport_tcp.c:2268
7780#: src/transport/plugin_transport_xt.c:1778
7781#: src/transport/plugin_transport_xt.c:1942
7782#: src/transport/plugin_transport_xt.c:2066
7783#: src/transport/plugin_transport_xt.c:2139
7784#: src/transport/plugin_transport_xt.c:2239
7785#: src/transport/plugin_transport_xt.c:2264
7786#, fuzzy 7762#, fuzzy
7787msgid "# bytes currently in TCP buffers" 7763msgid "# bytes currently in TCP buffers"
7788msgstr "# byte skickades via TCP" 7764msgstr "# byte skickades via TCP"
7789 7765
7790#: src/transport/plugin_transport_tcp.c:1785 7766#: src/transport/plugin_transport_tcp.c:1785
7791#: src/transport/plugin_transport_xt.c:1781
7792#, fuzzy 7767#, fuzzy
7793msgid "# bytes discarded by TCP (disconnect)" 7768msgid "# bytes discarded by TCP (disconnect)"
7794msgstr "# byte kastade via TCP (utgående)" 7769msgstr "# byte kastade via TCP (utgående)"
7795 7770
7796#: src/transport/plugin_transport_tcp.c:2073 7771#: src/transport/plugin_transport_tcp.c:2073
7797#: src/transport/plugin_transport_xt.c:2069
7798#, fuzzy 7772#, fuzzy
7799msgid "# bytes discarded by TCP (timeout)" 7773msgid "# bytes discarded by TCP (timeout)"
7800msgstr "# byte kastade via TCP (utgående)" 7774msgstr "# byte kastade via TCP (utgående)"
7801 7775
7802#: src/transport/plugin_transport_tcp.c:2147 7776#: src/transport/plugin_transport_tcp.c:2147
7803#: src/transport/plugin_transport_xt.c:2143
7804#, fuzzy 7777#, fuzzy
7805msgid "# bytes transmitted via TCP" 7778msgid "# bytes transmitted via TCP"
7806msgstr "# byte skickade av typen %d" 7779msgstr "# byte skickade av typen %d"
7807 7780
7808#: src/transport/plugin_transport_tcp.c:2545 7781#: src/transport/plugin_transport_tcp.c:2545
7809#: src/transport/plugin_transport_xt.c:2541
7810msgid "# requests to create session with invalid address" 7782msgid "# requests to create session with invalid address"
7811msgstr "" 7783msgstr ""
7812 7784
7813#: src/transport/plugin_transport_tcp.c:2721 7785#: src/transport/plugin_transport_tcp.c:2721
7814#: src/transport/plugin_transport_xt.c:2717
7815msgid "# transport-service disconnect requests for TCP" 7786msgid "# transport-service disconnect requests for TCP"
7816msgstr "" 7787msgstr ""
7817 7788
7818#: src/transport/plugin_transport_tcp.c:3213 7789#: src/transport/plugin_transport_tcp.c:3213
7819#: src/transport/plugin_transport_xt.c:3209
7820#, fuzzy 7790#, fuzzy
7821msgid "# TCP WELCOME messages received" 7791msgid "# TCP WELCOME messages received"
7822msgstr "# krypterade PONG-meddelanden mottagna" 7792msgstr "# krypterade PONG-meddelanden mottagna"
7823 7793
7824#: src/transport/plugin_transport_tcp.c:3419 7794#: src/transport/plugin_transport_tcp.c:3419
7825#: src/transport/plugin_transport_xt.c:3415
7826msgid "# bytes received via TCP" 7795msgid "# bytes received via TCP"
7827msgstr "# byte mottogs via TCP" 7796msgstr "# byte mottogs via TCP"
7828 7797
7829#: src/transport/plugin_transport_tcp.c:3470 7798#: src/transport/plugin_transport_tcp.c:3470
7830#: src/transport/plugin_transport_tcp.c:3528 7799#: src/transport/plugin_transport_tcp.c:3528
7831#: src/transport/plugin_transport_xt.c:3466
7832#: src/transport/plugin_transport_xt.c:3524
7833#, fuzzy 7800#, fuzzy
7834msgid "# TCP server connections active" 7801msgid "# TCP server connections active"
7835msgstr "Nätverksanslutning" 7802msgstr "Nätverksanslutning"
7836 7803
7837#: src/transport/plugin_transport_tcp.c:3474 7804#: src/transport/plugin_transport_tcp.c:3474
7838#: src/transport/plugin_transport_xt.c:3470
7839#, fuzzy 7805#, fuzzy
7840msgid "# TCP server connect events" 7806msgid "# TCP server connect events"
7841msgstr "# av anslutna parter" 7807msgstr "# av anslutna parter"
7842 7808
7843#: src/transport/plugin_transport_tcp.c:3480 7809#: src/transport/plugin_transport_tcp.c:3480
7844#: src/transport/plugin_transport_xt.c:3476
7845msgid "TCP connection limit reached, suspending server\n" 7810msgid "TCP connection limit reached, suspending server\n"
7846msgstr "" 7811msgstr ""
7847 7812
7848#: src/transport/plugin_transport_tcp.c:3482 7813#: src/transport/plugin_transport_tcp.c:3482
7849#: src/transport/plugin_transport_xt.c:3478
7850msgid "# TCP service suspended" 7814msgid "# TCP service suspended"
7851msgstr "" 7815msgstr ""
7852 7816
7853#: src/transport/plugin_transport_tcp.c:3522 7817#: src/transport/plugin_transport_tcp.c:3522
7854#: src/transport/plugin_transport_xt.c:3518
7855msgid "# TCP service resumed" 7818msgid "# TCP service resumed"
7856msgstr "" 7819msgstr ""
7857 7820
7858#: src/transport/plugin_transport_tcp.c:3532 7821#: src/transport/plugin_transport_tcp.c:3532
7859#: src/transport/plugin_transport_xt.c:3528
7860msgid "# network-level TCP disconnect events" 7822msgid "# network-level TCP disconnect events"
7861msgstr "" 7823msgstr ""
7862 7824
7863#: src/transport/plugin_transport_tcp.c:3851 7825#: src/transport/plugin_transport_tcp.c:3851
7864#: src/transport/plugin_transport_xt.c:3849
7865#, fuzzy 7826#, fuzzy
7866msgid "Failed to start service.\n" 7827msgid "Failed to start service.\n"
7867msgstr "Misslyckades att starta samling.\n" 7828msgstr "Misslyckades att starta samling.\n"
@@ -7915,7 +7876,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7915msgstr "Misslyckades att binda till UDP6-port %d.\n" 7876msgstr "Misslyckades att binda till UDP6-port %d.\n"
7916 7877
7917#: src/transport/plugin_transport_udp.c:3721 7878#: src/transport/plugin_transport_udp.c:3721
7918#: src/transport/plugin_transport_xu.c:2143
7919msgid "Disabling IPv4 since it is not supported on this system!\n" 7879msgid "Disabling IPv4 since it is not supported on this system!\n"
7920msgstr "" 7880msgstr ""
7921 7881
@@ -7926,19 +7886,15 @@ msgstr "Misslyckades att binda till UDP6-port %d.\n"
7926 7886
7927#: src/transport/plugin_transport_udp.c:3883 7887#: src/transport/plugin_transport_udp.c:3883
7928#: src/transport/plugin_transport_udp.c:3897 7888#: src/transport/plugin_transport_udp.c:3897
7929#: src/transport/plugin_transport_xu.c:2301
7930#: src/transport/plugin_transport_xu.c:2315
7931msgid "must be in [0,65535]" 7889msgid "must be in [0,65535]"
7932msgstr "" 7890msgstr ""
7933 7891
7934#: src/transport/plugin_transport_udp.c:3929 7892#: src/transport/plugin_transport_udp.c:3929
7935#: src/transport/plugin_transport_xu.c:2347
7936#, fuzzy 7893#, fuzzy
7937msgid "must be valid IPv4 address" 7894msgid "must be valid IPv4 address"
7938msgstr "\"%s\" är inte tillgänglig." 7895msgstr "\"%s\" är inte tillgänglig."
7939 7896
7940#: src/transport/plugin_transport_udp.c:3956 7897#: src/transport/plugin_transport_udp.c:3956
7941#: src/transport/plugin_transport_xu.c:2374
7942#, fuzzy 7898#, fuzzy
7943msgid "must be valid IPv6 address" 7899msgid "must be valid IPv6 address"
7944msgstr "\"%s\" är inte tillgänglig." 7900msgstr "\"%s\" är inte tillgänglig."
@@ -8025,54 +7981,6 @@ msgstr ""
8025msgid "# sessions allocated" 7981msgid "# sessions allocated"
8026msgstr "# sessionsnycklar accepterade" 7982msgstr "# sessionsnycklar accepterade"
8027 7983
8028#: src/transport/plugin_transport_xt.c:4010
8029#, c-format
8030msgid "XT transport listening on port %llu\n"
8031msgstr ""
8032
8033#: src/transport/plugin_transport_xt.c:4014
8034msgid "XT transport not listening on any port (client only)\n"
8035msgstr ""
8036
8037#: src/transport/plugin_transport_xt.c:4018
8038#, c-format
8039msgid "XT transport advertises itself as being on port %llu\n"
8040msgstr ""
8041
8042#: src/transport/plugin_transport_xt.c:4022
8043#, fuzzy
8044msgid "# XT sessions active"
8045msgstr "# sessionsnycklar accepterade"
8046
8047#: src/transport/plugin_transport_xu.c:1237
8048#, c-format
8049msgid ""
8050"XU could not transmit message to `%s': Network seems down, please check your "
8051"network configuration\n"
8052msgstr ""
8053
8054#: src/transport/plugin_transport_xu.c:1251
8055msgid ""
8056"XU could not transmit IPv6 message! Please check your network configuration "
8057"and disable IPv6 if your connection does not have a global IPv6 address\n"
8058msgstr ""
8059
8060#: src/transport/plugin_transport_xu.c:2125
8061#: src/transport/plugin_transport_xu.c:2224
8062#, fuzzy, c-format
8063msgid "Failed to bind XU socket to %s: %s\n"
8064msgstr "Misslyckades att binda till UDP6-port %d.\n"
8065
8066#: src/transport/plugin_transport_xu.c:2234
8067#, fuzzy
8068msgid "Failed to open XU sockets\n"
8069msgstr "Misslyckades att binda till UDP6-port %d.\n"
8070
8071#: src/transport/plugin_transport_xu.c:2398
8072#, fuzzy
8073msgid "Failed to create XU network sockets\n"
8074msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
8075
8076#: src/transport/tcp_connection_legacy.c:452 7984#: src/transport/tcp_connection_legacy.c:452
8077#, fuzzy, c-format 7985#, fuzzy, c-format
8078msgid "Access denied to `%s'\n" 7986msgid "Access denied to `%s'\n"
@@ -9275,6 +9183,22 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
9275msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" 9183msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
9276 9184
9277#, fuzzy 9185#, fuzzy
9186#~ msgid "# XT sessions active"
9187#~ msgstr "# sessionsnycklar accepterade"
9188
9189#, fuzzy
9190#~ msgid "Failed to bind XU socket to %s: %s\n"
9191#~ msgstr "Misslyckades att binda till UDP6-port %d.\n"
9192
9193#, fuzzy
9194#~ msgid "Failed to open XU sockets\n"
9195#~ msgstr "Misslyckades att binda till UDP6-port %d.\n"
9196
9197#, fuzzy
9198#~ msgid "Failed to create XU network sockets\n"
9199#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
9200
9201#, fuzzy
9278#~ msgid "Print information about DV state" 9202#~ msgid "Print information about DV state"
9279#~ msgstr "Skriv ut information om GNUnets motparter." 9203#~ msgstr "Skriv ut information om GNUnets motparter."
9280 9204
diff --git a/po/vi.po b/po/vi.po
index daaaf1a49..b791c8153 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: gnunet 0.8.0a\n" 9"Project-Id-Version: gnunet 0.8.0a\n"
10"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 10"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
11"POT-Creation-Date: 2019-04-03 14:36+0200\n" 11"POT-Creation-Date: 2019-04-03 16:13+0200\n"
12"PO-Revision-Date: 2008-09-10 22:05+0930\n" 12"PO-Revision-Date: 2008-09-10 22:05+0930\n"
13"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" 13"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
14"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" 14"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -234,7 +234,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
234msgstr "" 234msgstr ""
235 235
236#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 236#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
237#: src/transport/plugin_transport_xt.c:1120
238#: src/transport/tcp_service_legacy.c:557 237#: src/transport/tcp_service_legacy.c:557
239#, c-format 238#, c-format
240msgid "" 239msgid ""
@@ -245,9 +244,6 @@ msgstr ""
245#: src/transport/plugin_transport_tcp.c:1139 244#: src/transport/plugin_transport_tcp.c:1139
246#: src/transport/plugin_transport_tcp.c:1145 245#: src/transport/plugin_transport_tcp.c:1145
247#: src/transport/plugin_transport_tcp.c:3835 246#: src/transport/plugin_transport_tcp.c:3835
248#: src/transport/plugin_transport_xt.c:1139
249#: src/transport/plugin_transport_xt.c:1145
250#: src/transport/plugin_transport_xt.c:3833
251#: src/transport/tcp_service_legacy.c:576 247#: src/transport/tcp_service_legacy.c:576
252#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 248#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
253#: src/util/service.c:1162 249#: src/util/service.c:1162
@@ -256,7 +252,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
256msgstr "" 252msgstr ""
257 253
258#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 254#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
259#: src/transport/plugin_transport_xt.c:1176
260#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 255#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
261#: src/util/service.c:1201 256#: src/util/service.c:1201
262#, c-format 257#, c-format
@@ -264,7 +259,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
264msgstr "" 259msgstr ""
265 260
266#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 261#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
267#: src/transport/plugin_transport_xt.c:1180
268#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 262#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
269#: src/util/service.c:1206 263#: src/util/service.c:1206
270#, fuzzy, c-format 264#, fuzzy, c-format
@@ -272,7 +266,6 @@ msgid "Using `%s' instead\n"
272msgstr "%s: tùy chọn « %s » là mơ hồ\n" 266msgstr "%s: tùy chọn « %s » là mơ hồ\n"
273 267
274#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 268#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
275#: src/transport/plugin_transport_xt.c:1211
276#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 269#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
277#, c-format 270#, c-format
278msgid "" 271msgid ""
@@ -281,7 +274,6 @@ msgid ""
281msgstr "" 274msgstr ""
282 275
283#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 276#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
284#: src/transport/plugin_transport_xt.c:1228
285#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 277#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
286#, c-format 278#, c-format
287msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 279msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -290,7 +282,6 @@ msgstr ""
290#: src/arm/gnunet-service-arm.c:556 282#: src/arm/gnunet-service-arm.c:556
291#: src/transport/plugin_transport_http_server.c:2688 283#: src/transport/plugin_transport_http_server.c:2688
292#: src/transport/plugin_transport_tcp.c:1259 284#: src/transport/plugin_transport_tcp.c:1259
293#: src/transport/plugin_transport_xt.c:1259
294#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 285#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
295#, fuzzy, c-format 286#, fuzzy, c-format
296msgid "Failed to resolve `%s': %s\n" 287msgid "Failed to resolve `%s': %s\n"
@@ -299,7 +290,6 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
299#: src/arm/gnunet-service-arm.c:575 290#: src/arm/gnunet-service-arm.c:575
300#: src/transport/plugin_transport_http_server.c:2706 291#: src/transport/plugin_transport_http_server.c:2706
301#: src/transport/plugin_transport_tcp.c:1278 292#: src/transport/plugin_transport_tcp.c:1278
302#: src/transport/plugin_transport_xt.c:1278
303#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 293#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
304#, fuzzy, c-format 294#, fuzzy, c-format
305msgid "Failed to find %saddress for `%s'.\n" 295msgid "Failed to find %saddress for `%s'.\n"
@@ -7634,8 +7624,6 @@ msgstr "kích cỡ tin nhắn"
7634#: src/transport/plugin_transport_http_server.c:3530 7624#: src/transport/plugin_transport_http_server.c:3530
7635#: src/transport/plugin_transport_tcp.c:3901 7625#: src/transport/plugin_transport_tcp.c:3901
7636#: src/transport/plugin_transport_tcp.c:3908 7626#: src/transport/plugin_transport_tcp.c:3908
7637#: src/transport/plugin_transport_xt.c:3899
7638#: src/transport/plugin_transport_xt.c:3906
7639msgid "TCP_STEALTH not supported on this platform.\n" 7627msgid "TCP_STEALTH not supported on this platform.\n"
7640msgstr "" 7628msgstr ""
7641 7629
@@ -7706,7 +7694,6 @@ msgstr ""
7706 7694
7707#: src/transport/plugin_transport_http_server.c:2905 7695#: src/transport/plugin_transport_http_server.c:2905
7708#: src/transport/plugin_transport_udp.c:3627 7696#: src/transport/plugin_transport_udp.c:3627
7709#: src/transport/plugin_transport_xu.c:2049
7710msgid "Disabling IPv6 since it is not supported on this system!\n" 7697msgid "Disabling IPv6 since it is not supported on this system!\n"
7711msgstr "" 7698msgstr ""
7712 7699
@@ -7810,8 +7797,6 @@ msgstr "# các byte loại đi bởi SMTP (đi ra)"
7810 7797
7811#: src/transport/plugin_transport_tcp.c:1557 7798#: src/transport/plugin_transport_tcp.c:1557
7812#: src/transport/plugin_transport_tcp.c:2883 7799#: src/transport/plugin_transport_tcp.c:2883
7813#: src/transport/plugin_transport_xt.c:1553
7814#: src/transport/plugin_transport_xt.c:2879
7815#, fuzzy, c-format 7800#, fuzzy, c-format
7816msgid "Unexpected address length: %u bytes\n" 7801msgid "Unexpected address length: %u bytes\n"
7817msgstr "Gặp sự kiện bất thường: %d\n" 7802msgstr "Gặp sự kiện bất thường: %d\n"
@@ -7820,9 +7805,6 @@ msgstr "Gặp sự kiện bất thường: %d\n"
7820#: src/transport/plugin_transport_tcp.c:1964 7805#: src/transport/plugin_transport_tcp.c:1964
7821#: src/transport/plugin_transport_tcp.c:3147 7806#: src/transport/plugin_transport_tcp.c:3147
7822#: src/transport/plugin_transport_tcp.c:4024 7807#: src/transport/plugin_transport_tcp.c:4024
7823#: src/transport/plugin_transport_xt.c:1736
7824#: src/transport/plugin_transport_xt.c:1960
7825#: src/transport/plugin_transport_xt.c:3143
7826#, fuzzy 7808#, fuzzy
7827msgid "# TCP sessions active" 7809msgid "# TCP sessions active"
7828msgstr "# các khoá phiên chạy được chấp nhận" 7810msgstr "# các khoá phiên chạy được chấp nhận"
@@ -7833,91 +7815,70 @@ msgstr "# các khoá phiên chạy được chấp nhận"
7833#: src/transport/plugin_transport_tcp.c:2143 7815#: src/transport/plugin_transport_tcp.c:2143
7834#: src/transport/plugin_transport_tcp.c:2243 7816#: src/transport/plugin_transport_tcp.c:2243
7835#: src/transport/plugin_transport_tcp.c:2268 7817#: src/transport/plugin_transport_tcp.c:2268
7836#: src/transport/plugin_transport_xt.c:1778
7837#: src/transport/plugin_transport_xt.c:1942
7838#: src/transport/plugin_transport_xt.c:2066
7839#: src/transport/plugin_transport_xt.c:2139
7840#: src/transport/plugin_transport_xt.c:2239
7841#: src/transport/plugin_transport_xt.c:2264
7842#, fuzzy 7818#, fuzzy
7843msgid "# bytes currently in TCP buffers" 7819msgid "# bytes currently in TCP buffers"
7844msgstr "# các byte đã gừi qua TCP" 7820msgstr "# các byte đã gừi qua TCP"
7845 7821
7846#: src/transport/plugin_transport_tcp.c:1785 7822#: src/transport/plugin_transport_tcp.c:1785
7847#: src/transport/plugin_transport_xt.c:1781
7848#, fuzzy 7823#, fuzzy
7849msgid "# bytes discarded by TCP (disconnect)" 7824msgid "# bytes discarded by TCP (disconnect)"
7850msgstr "# các byte loại đi bởi TCP (đi ra)" 7825msgstr "# các byte loại đi bởi TCP (đi ra)"
7851 7826
7852#: src/transport/plugin_transport_tcp.c:2073 7827#: src/transport/plugin_transport_tcp.c:2073
7853#: src/transport/plugin_transport_xt.c:2069
7854#, fuzzy 7828#, fuzzy
7855msgid "# bytes discarded by TCP (timeout)" 7829msgid "# bytes discarded by TCP (timeout)"
7856msgstr "# các byte loại đi bởi TCP (đi ra)" 7830msgstr "# các byte loại đi bởi TCP (đi ra)"
7857 7831
7858#: src/transport/plugin_transport_tcp.c:2147 7832#: src/transport/plugin_transport_tcp.c:2147
7859#: src/transport/plugin_transport_xt.c:2143
7860#, fuzzy 7833#, fuzzy
7861msgid "# bytes transmitted via TCP" 7834msgid "# bytes transmitted via TCP"
7862msgstr "# các byte được gửi" 7835msgstr "# các byte được gửi"
7863 7836
7864#: src/transport/plugin_transport_tcp.c:2545 7837#: src/transport/plugin_transport_tcp.c:2545
7865#: src/transport/plugin_transport_xt.c:2541
7866msgid "# requests to create session with invalid address" 7838msgid "# requests to create session with invalid address"
7867msgstr "" 7839msgstr ""
7868 7840
7869#: src/transport/plugin_transport_tcp.c:2721 7841#: src/transport/plugin_transport_tcp.c:2721
7870#: src/transport/plugin_transport_xt.c:2717
7871msgid "# transport-service disconnect requests for TCP" 7842msgid "# transport-service disconnect requests for TCP"
7872msgstr "" 7843msgstr ""
7873 7844
7874#: src/transport/plugin_transport_tcp.c:3213 7845#: src/transport/plugin_transport_tcp.c:3213
7875#: src/transport/plugin_transport_xt.c:3209
7876#, fuzzy 7846#, fuzzy
7877msgid "# TCP WELCOME messages received" 7847msgid "# TCP WELCOME messages received"
7878msgstr "# các thông báo PONG đã mật mã được nhận" 7848msgstr "# các thông báo PONG đã mật mã được nhận"
7879 7849
7880#: src/transport/plugin_transport_tcp.c:3419 7850#: src/transport/plugin_transport_tcp.c:3419
7881#: src/transport/plugin_transport_xt.c:3415
7882msgid "# bytes received via TCP" 7851msgid "# bytes received via TCP"
7883msgstr "# các byte đã nhận qua TCP" 7852msgstr "# các byte đã nhận qua TCP"
7884 7853
7885#: src/transport/plugin_transport_tcp.c:3470 7854#: src/transport/plugin_transport_tcp.c:3470
7886#: src/transport/plugin_transport_tcp.c:3528 7855#: src/transport/plugin_transport_tcp.c:3528
7887#: src/transport/plugin_transport_xt.c:3466
7888#: src/transport/plugin_transport_xt.c:3524
7889#, fuzzy 7856#, fuzzy
7890msgid "# TCP server connections active" 7857msgid "# TCP server connections active"
7891msgstr "# các kết nối dht" 7858msgstr "# các kết nối dht"
7892 7859
7893#: src/transport/plugin_transport_tcp.c:3474 7860#: src/transport/plugin_transport_tcp.c:3474
7894#: src/transport/plugin_transport_xt.c:3470
7895#, fuzzy 7861#, fuzzy
7896msgid "# TCP server connect events" 7862msgid "# TCP server connect events"
7897msgstr "# của các đồng đẳng đã kết nối" 7863msgstr "# của các đồng đẳng đã kết nối"
7898 7864
7899#: src/transport/plugin_transport_tcp.c:3480 7865#: src/transport/plugin_transport_tcp.c:3480
7900#: src/transport/plugin_transport_xt.c:3476
7901msgid "TCP connection limit reached, suspending server\n" 7866msgid "TCP connection limit reached, suspending server\n"
7902msgstr "" 7867msgstr ""
7903 7868
7904#: src/transport/plugin_transport_tcp.c:3482 7869#: src/transport/plugin_transport_tcp.c:3482
7905#: src/transport/plugin_transport_xt.c:3478
7906msgid "# TCP service suspended" 7870msgid "# TCP service suspended"
7907msgstr "" 7871msgstr ""
7908 7872
7909#: src/transport/plugin_transport_tcp.c:3522 7873#: src/transport/plugin_transport_tcp.c:3522
7910#: src/transport/plugin_transport_xt.c:3518
7911msgid "# TCP service resumed" 7874msgid "# TCP service resumed"
7912msgstr "" 7875msgstr ""
7913 7876
7914#: src/transport/plugin_transport_tcp.c:3532 7877#: src/transport/plugin_transport_tcp.c:3532
7915#: src/transport/plugin_transport_xt.c:3528
7916msgid "# network-level TCP disconnect events" 7878msgid "# network-level TCP disconnect events"
7917msgstr "" 7879msgstr ""
7918 7880
7919#: src/transport/plugin_transport_tcp.c:3851 7881#: src/transport/plugin_transport_tcp.c:3851
7920#: src/transport/plugin_transport_xt.c:3849
7921#, fuzzy 7882#, fuzzy
7922msgid "Failed to start service.\n" 7883msgid "Failed to start service.\n"
7923msgstr "Lỗi bắt đầu thu thập.\n" 7884msgstr "Lỗi bắt đầu thu thập.\n"
@@ -7971,7 +7932,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7971msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" 7932msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
7972 7933
7973#: src/transport/plugin_transport_udp.c:3721 7934#: src/transport/plugin_transport_udp.c:3721
7974#: src/transport/plugin_transport_xu.c:2143
7975msgid "Disabling IPv4 since it is not supported on this system!\n" 7935msgid "Disabling IPv4 since it is not supported on this system!\n"
7976msgstr "" 7936msgstr ""
7977 7937
@@ -7982,19 +7942,15 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
7982 7942
7983#: src/transport/plugin_transport_udp.c:3883 7943#: src/transport/plugin_transport_udp.c:3883
7984#: src/transport/plugin_transport_udp.c:3897 7944#: src/transport/plugin_transport_udp.c:3897
7985#: src/transport/plugin_transport_xu.c:2301
7986#: src/transport/plugin_transport_xu.c:2315
7987msgid "must be in [0,65535]" 7945msgid "must be in [0,65535]"
7988msgstr "" 7946msgstr ""
7989 7947
7990#: src/transport/plugin_transport_udp.c:3929 7948#: src/transport/plugin_transport_udp.c:3929
7991#: src/transport/plugin_transport_xu.c:2347
7992#, fuzzy 7949#, fuzzy
7993msgid "must be valid IPv4 address" 7950msgid "must be valid IPv4 address"
7994msgstr "« %s » không sẵn sàng.\n" 7951msgstr "« %s » không sẵn sàng.\n"
7995 7952
7996#: src/transport/plugin_transport_udp.c:3956 7953#: src/transport/plugin_transport_udp.c:3956
7997#: src/transport/plugin_transport_xu.c:2374
7998#, fuzzy 7954#, fuzzy
7999msgid "must be valid IPv6 address" 7955msgid "must be valid IPv6 address"
8000msgstr "« %s » không sẵn sàng.\n" 7956msgstr "« %s » không sẵn sàng.\n"
@@ -8081,54 +8037,6 @@ msgstr ""
8081msgid "# sessions allocated" 8037msgid "# sessions allocated"
8082msgstr "# các khoá phiên chạy được chấp nhận" 8038msgstr "# các khoá phiên chạy được chấp nhận"
8083 8039
8084#: src/transport/plugin_transport_xt.c:4010
8085#, c-format
8086msgid "XT transport listening on port %llu\n"
8087msgstr ""
8088
8089#: src/transport/plugin_transport_xt.c:4014
8090msgid "XT transport not listening on any port (client only)\n"
8091msgstr ""
8092
8093#: src/transport/plugin_transport_xt.c:4018
8094#, c-format
8095msgid "XT transport advertises itself as being on port %llu\n"
8096msgstr ""
8097
8098#: src/transport/plugin_transport_xt.c:4022
8099#, fuzzy
8100msgid "# XT sessions active"
8101msgstr "# các khoá phiên chạy được chấp nhận"
8102
8103#: src/transport/plugin_transport_xu.c:1237
8104#, c-format
8105msgid ""
8106"XU could not transmit message to `%s': Network seems down, please check your "
8107"network configuration\n"
8108msgstr ""
8109
8110#: src/transport/plugin_transport_xu.c:1251
8111msgid ""
8112"XU could not transmit IPv6 message! Please check your network configuration "
8113"and disable IPv6 if your connection does not have a global IPv6 address\n"
8114msgstr ""
8115
8116#: src/transport/plugin_transport_xu.c:2125
8117#: src/transport/plugin_transport_xu.c:2224
8118#, fuzzy, c-format
8119msgid "Failed to bind XU socket to %s: %s\n"
8120msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
8121
8122#: src/transport/plugin_transport_xu.c:2234
8123#, fuzzy
8124msgid "Failed to open XU sockets\n"
8125msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
8126
8127#: src/transport/plugin_transport_xu.c:2398
8128#, fuzzy
8129msgid "Failed to create XU network sockets\n"
8130msgstr "Không thể tạo miền tên.\n"
8131
8132#: src/transport/tcp_connection_legacy.c:452 8040#: src/transport/tcp_connection_legacy.c:452
8133#, fuzzy, c-format 8041#, fuzzy, c-format
8134msgid "Access denied to `%s'\n" 8042msgid "Access denied to `%s'\n"
@@ -9332,6 +9240,22 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
9332msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" 9240msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
9333 9241
9334#, fuzzy 9242#, fuzzy
9243#~ msgid "# XT sessions active"
9244#~ msgstr "# các khoá phiên chạy được chấp nhận"
9245
9246#, fuzzy
9247#~ msgid "Failed to bind XU socket to %s: %s\n"
9248#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
9249
9250#, fuzzy
9251#~ msgid "Failed to open XU sockets\n"
9252#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
9253
9254#, fuzzy
9255#~ msgid "Failed to create XU network sockets\n"
9256#~ msgstr "Không thể tạo miền tên.\n"
9257
9258#, fuzzy
9335#~ msgid "Print information about DV state" 9259#~ msgid "Print information about DV state"
9336#~ msgstr "In ra thông tin về các đồng đẳng GNUnet." 9260#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
9337 9261
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 345c26790..88a016d83 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: gnunet-0.8.1\n" 8"Project-Id-Version: gnunet-0.8.1\n"
9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" 9"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
10"POT-Creation-Date: 2019-04-03 14:36+0200\n" 10"POT-Creation-Date: 2019-04-03 16:13+0200\n"
11"PO-Revision-Date: 2011-07-09 12:12+0800\n" 11"PO-Revision-Date: 2011-07-09 12:12+0800\n"
12"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" 12"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
13"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" 13"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -221,7 +221,6 @@ msgid "Control services and the Automated Restart Manager (ARM)"
221msgstr "" 221msgstr ""
222 222
223#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120 223#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
224#: src/transport/plugin_transport_xt.c:1120
225#: src/transport/tcp_service_legacy.c:557 224#: src/transport/tcp_service_legacy.c:557
226#, c-format 225#, c-format
227msgid "" 226msgid ""
@@ -232,9 +231,6 @@ msgstr ""
232#: src/transport/plugin_transport_tcp.c:1139 231#: src/transport/plugin_transport_tcp.c:1139
233#: src/transport/plugin_transport_tcp.c:1145 232#: src/transport/plugin_transport_tcp.c:1145
234#: src/transport/plugin_transport_tcp.c:3835 233#: src/transport/plugin_transport_tcp.c:3835
235#: src/transport/plugin_transport_xt.c:1139
236#: src/transport/plugin_transport_xt.c:1145
237#: src/transport/plugin_transport_xt.c:3833
238#: src/transport/tcp_service_legacy.c:576 234#: src/transport/tcp_service_legacy.c:576
239#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156 235#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1156
240#: src/util/service.c:1162 236#: src/util/service.c:1162
@@ -243,7 +239,6 @@ msgid "Require valid port number for service `%s' in configuration!\n"
243msgstr "" 239msgstr ""
244 240
245#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176 241#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
246#: src/transport/plugin_transport_xt.c:1176
247#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521 242#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
248#: src/util/service.c:1201 243#: src/util/service.c:1201
249#, c-format 244#, c-format
@@ -251,7 +246,6 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
251msgstr "" 246msgstr ""
252 247
253#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180 248#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
254#: src/transport/plugin_transport_xt.c:1180
255#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526 249#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
256#: src/util/service.c:1206 250#: src/util/service.c:1206
257#, fuzzy, c-format 251#, fuzzy, c-format
@@ -259,7 +253,6 @@ msgid "Using `%s' instead\n"
259msgstr "%s:选项“%s”有歧义\n" 253msgstr "%s:选项“%s”有歧义\n"
260 254
261#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211 255#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
262#: src/transport/plugin_transport_xt.c:1211
263#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242 256#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1242
264#, c-format 257#, c-format
265msgid "" 258msgid ""
@@ -268,7 +261,6 @@ msgid ""
268msgstr "" 261msgstr ""
269 262
270#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228 263#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
271#: src/transport/plugin_transport_xt.c:1228
272#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260 264#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1260
273#, c-format 265#, c-format
274msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" 266msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -277,7 +269,6 @@ msgstr ""
277#: src/arm/gnunet-service-arm.c:556 269#: src/arm/gnunet-service-arm.c:556
278#: src/transport/plugin_transport_http_server.c:2688 270#: src/transport/plugin_transport_http_server.c:2688
279#: src/transport/plugin_transport_tcp.c:1259 271#: src/transport/plugin_transport_tcp.c:1259
280#: src/transport/plugin_transport_xt.c:1259
281#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301 272#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1301
282#, fuzzy, c-format 273#, fuzzy, c-format
283msgid "Failed to resolve `%s': %s\n" 274msgid "Failed to resolve `%s': %s\n"
@@ -286,7 +277,6 @@ msgstr "打开日志文件“%s”失败:%s\n"
286#: src/arm/gnunet-service-arm.c:575 277#: src/arm/gnunet-service-arm.c:575
287#: src/transport/plugin_transport_http_server.c:2706 278#: src/transport/plugin_transport_http_server.c:2706
288#: src/transport/plugin_transport_tcp.c:1278 279#: src/transport/plugin_transport_tcp.c:1278
289#: src/transport/plugin_transport_xt.c:1278
290#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321 280#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1321
291#, fuzzy, c-format 281#, fuzzy, c-format
292msgid "Failed to find %saddress for `%s'.\n" 282msgid "Failed to find %saddress for `%s'.\n"
@@ -7343,8 +7333,6 @@ msgstr "消息尺寸"
7343#: src/transport/plugin_transport_http_server.c:3530 7333#: src/transport/plugin_transport_http_server.c:3530
7344#: src/transport/plugin_transport_tcp.c:3901 7334#: src/transport/plugin_transport_tcp.c:3901
7345#: src/transport/plugin_transport_tcp.c:3908 7335#: src/transport/plugin_transport_tcp.c:3908
7346#: src/transport/plugin_transport_xt.c:3899
7347#: src/transport/plugin_transport_xt.c:3906
7348msgid "TCP_STEALTH not supported on this platform.\n" 7336msgid "TCP_STEALTH not supported on this platform.\n"
7349msgstr "" 7337msgstr ""
7350 7338
@@ -7415,7 +7403,6 @@ msgstr ""
7415 7403
7416#: src/transport/plugin_transport_http_server.c:2905 7404#: src/transport/plugin_transport_http_server.c:2905
7417#: src/transport/plugin_transport_udp.c:3627 7405#: src/transport/plugin_transport_udp.c:3627
7418#: src/transport/plugin_transport_xu.c:2049
7419msgid "Disabling IPv6 since it is not supported on this system!\n" 7406msgid "Disabling IPv6 since it is not supported on this system!\n"
7420msgstr "" 7407msgstr ""
7421 7408
@@ -7519,8 +7506,6 @@ msgstr ""
7519 7506
7520#: src/transport/plugin_transport_tcp.c:1557 7507#: src/transport/plugin_transport_tcp.c:1557
7521#: src/transport/plugin_transport_tcp.c:2883 7508#: src/transport/plugin_transport_tcp.c:2883
7522#: src/transport/plugin_transport_xt.c:1553
7523#: src/transport/plugin_transport_xt.c:2879
7524#, c-format 7509#, c-format
7525msgid "Unexpected address length: %u bytes\n" 7510msgid "Unexpected address length: %u bytes\n"
7526msgstr "" 7511msgstr ""
@@ -7529,9 +7514,6 @@ msgstr ""
7529#: src/transport/plugin_transport_tcp.c:1964 7514#: src/transport/plugin_transport_tcp.c:1964
7530#: src/transport/plugin_transport_tcp.c:3147 7515#: src/transport/plugin_transport_tcp.c:3147
7531#: src/transport/plugin_transport_tcp.c:4024 7516#: src/transport/plugin_transport_tcp.c:4024
7532#: src/transport/plugin_transport_xt.c:1736
7533#: src/transport/plugin_transport_xt.c:1960
7534#: src/transport/plugin_transport_xt.c:3143
7535msgid "# TCP sessions active" 7517msgid "# TCP sessions active"
7536msgstr "" 7518msgstr ""
7537 7519
@@ -7541,54 +7523,39 @@ msgstr ""
7541#: src/transport/plugin_transport_tcp.c:2143 7523#: src/transport/plugin_transport_tcp.c:2143
7542#: src/transport/plugin_transport_tcp.c:2243 7524#: src/transport/plugin_transport_tcp.c:2243
7543#: src/transport/plugin_transport_tcp.c:2268 7525#: src/transport/plugin_transport_tcp.c:2268
7544#: src/transport/plugin_transport_xt.c:1778
7545#: src/transport/plugin_transport_xt.c:1942
7546#: src/transport/plugin_transport_xt.c:2066
7547#: src/transport/plugin_transport_xt.c:2139
7548#: src/transport/plugin_transport_xt.c:2239
7549#: src/transport/plugin_transport_xt.c:2264
7550msgid "# bytes currently in TCP buffers" 7526msgid "# bytes currently in TCP buffers"
7551msgstr "" 7527msgstr ""
7552 7528
7553#: src/transport/plugin_transport_tcp.c:1785 7529#: src/transport/plugin_transport_tcp.c:1785
7554#: src/transport/plugin_transport_xt.c:1781
7555msgid "# bytes discarded by TCP (disconnect)" 7530msgid "# bytes discarded by TCP (disconnect)"
7556msgstr "" 7531msgstr ""
7557 7532
7558#: src/transport/plugin_transport_tcp.c:2073 7533#: src/transport/plugin_transport_tcp.c:2073
7559#: src/transport/plugin_transport_xt.c:2069
7560msgid "# bytes discarded by TCP (timeout)" 7534msgid "# bytes discarded by TCP (timeout)"
7561msgstr "" 7535msgstr ""
7562 7536
7563#: src/transport/plugin_transport_tcp.c:2147 7537#: src/transport/plugin_transport_tcp.c:2147
7564#: src/transport/plugin_transport_xt.c:2143
7565msgid "# bytes transmitted via TCP" 7538msgid "# bytes transmitted via TCP"
7566msgstr "" 7539msgstr ""
7567 7540
7568#: src/transport/plugin_transport_tcp.c:2545 7541#: src/transport/plugin_transport_tcp.c:2545
7569#: src/transport/plugin_transport_xt.c:2541
7570msgid "# requests to create session with invalid address" 7542msgid "# requests to create session with invalid address"
7571msgstr "" 7543msgstr ""
7572 7544
7573#: src/transport/plugin_transport_tcp.c:2721 7545#: src/transport/plugin_transport_tcp.c:2721
7574#: src/transport/plugin_transport_xt.c:2717
7575msgid "# transport-service disconnect requests for TCP" 7546msgid "# transport-service disconnect requests for TCP"
7576msgstr "" 7547msgstr ""
7577 7548
7578#: src/transport/plugin_transport_tcp.c:3213 7549#: src/transport/plugin_transport_tcp.c:3213
7579#: src/transport/plugin_transport_xt.c:3209
7580msgid "# TCP WELCOME messages received" 7550msgid "# TCP WELCOME messages received"
7581msgstr "" 7551msgstr ""
7582 7552
7583#: src/transport/plugin_transport_tcp.c:3419 7553#: src/transport/plugin_transport_tcp.c:3419
7584#: src/transport/plugin_transport_xt.c:3415
7585msgid "# bytes received via TCP" 7554msgid "# bytes received via TCP"
7586msgstr "" 7555msgstr ""
7587 7556
7588#: src/transport/plugin_transport_tcp.c:3470 7557#: src/transport/plugin_transport_tcp.c:3470
7589#: src/transport/plugin_transport_tcp.c:3528 7558#: src/transport/plugin_transport_tcp.c:3528
7590#: src/transport/plugin_transport_xt.c:3466
7591#: src/transport/plugin_transport_xt.c:3524
7592#, fuzzy 7559#, fuzzy
7593msgid "# TCP server connections active" 7560msgid "# TCP server connections active"
7594msgstr "" 7561msgstr ""
@@ -7596,7 +7563,6 @@ msgstr ""
7596"按任意键继续\n" 7563"按任意键继续\n"
7597 7564
7598#: src/transport/plugin_transport_tcp.c:3474 7565#: src/transport/plugin_transport_tcp.c:3474
7599#: src/transport/plugin_transport_xt.c:3470
7600#, fuzzy 7566#, fuzzy
7601msgid "# TCP server connect events" 7567msgid "# TCP server connect events"
7602msgstr "" 7568msgstr ""
@@ -7604,27 +7570,22 @@ msgstr ""
7604"按任意键继续\n" 7570"按任意键继续\n"
7605 7571
7606#: src/transport/plugin_transport_tcp.c:3480 7572#: src/transport/plugin_transport_tcp.c:3480
7607#: src/transport/plugin_transport_xt.c:3476
7608msgid "TCP connection limit reached, suspending server\n" 7573msgid "TCP connection limit reached, suspending server\n"
7609msgstr "" 7574msgstr ""
7610 7575
7611#: src/transport/plugin_transport_tcp.c:3482 7576#: src/transport/plugin_transport_tcp.c:3482
7612#: src/transport/plugin_transport_xt.c:3478
7613msgid "# TCP service suspended" 7577msgid "# TCP service suspended"
7614msgstr "" 7578msgstr ""
7615 7579
7616#: src/transport/plugin_transport_tcp.c:3522 7580#: src/transport/plugin_transport_tcp.c:3522
7617#: src/transport/plugin_transport_xt.c:3518
7618msgid "# TCP service resumed" 7581msgid "# TCP service resumed"
7619msgstr "" 7582msgstr ""
7620 7583
7621#: src/transport/plugin_transport_tcp.c:3532 7584#: src/transport/plugin_transport_tcp.c:3532
7622#: src/transport/plugin_transport_xt.c:3528
7623msgid "# network-level TCP disconnect events" 7585msgid "# network-level TCP disconnect events"
7624msgstr "" 7586msgstr ""
7625 7587
7626#: src/transport/plugin_transport_tcp.c:3851 7588#: src/transport/plugin_transport_tcp.c:3851
7627#: src/transport/plugin_transport_xt.c:3849
7628#, fuzzy 7589#, fuzzy
7629msgid "Failed to start service.\n" 7590msgid "Failed to start service.\n"
7630msgstr "初始化“%s”服务失败。\n" 7591msgstr "初始化“%s”服务失败。\n"
@@ -7677,7 +7638,6 @@ msgid "Failed to bind UDP socket to %s: %s\n"
7677msgstr "打开日志文件“%s”失败:%s\n" 7638msgstr "打开日志文件“%s”失败:%s\n"
7678 7639
7679#: src/transport/plugin_transport_udp.c:3721 7640#: src/transport/plugin_transport_udp.c:3721
7680#: src/transport/plugin_transport_xu.c:2143
7681msgid "Disabling IPv4 since it is not supported on this system!\n" 7641msgid "Disabling IPv4 since it is not supported on this system!\n"
7682msgstr "" 7642msgstr ""
7683 7643
@@ -7688,19 +7648,15 @@ msgstr "打开日志文件“%s”失败:%s\n"
7688 7648
7689#: src/transport/plugin_transport_udp.c:3883 7649#: src/transport/plugin_transport_udp.c:3883
7690#: src/transport/plugin_transport_udp.c:3897 7650#: src/transport/plugin_transport_udp.c:3897
7691#: src/transport/plugin_transport_xu.c:2301
7692#: src/transport/plugin_transport_xu.c:2315
7693msgid "must be in [0,65535]" 7651msgid "must be in [0,65535]"
7694msgstr "" 7652msgstr ""
7695 7653
7696#: src/transport/plugin_transport_udp.c:3929 7654#: src/transport/plugin_transport_udp.c:3929
7697#: src/transport/plugin_transport_xu.c:2347
7698#, fuzzy 7655#, fuzzy
7699msgid "must be valid IPv4 address" 7656msgid "must be valid IPv4 address"
7700msgstr "“%s”不可用。\n" 7657msgstr "“%s”不可用。\n"
7701 7658
7702#: src/transport/plugin_transport_udp.c:3956 7659#: src/transport/plugin_transport_udp.c:3956
7703#: src/transport/plugin_transport_xu.c:2374
7704#, fuzzy 7660#, fuzzy
7705msgid "must be valid IPv6 address" 7661msgid "must be valid IPv6 address"
7706msgstr "“%s”不可用。\n" 7662msgstr "“%s”不可用。\n"
@@ -7777,56 +7733,6 @@ msgstr ""
7777msgid "# sessions allocated" 7733msgid "# sessions allocated"
7778msgstr "" 7734msgstr ""
7779 7735
7780#: src/transport/plugin_transport_xt.c:4010
7781#, c-format
7782msgid "XT transport listening on port %llu\n"
7783msgstr ""
7784
7785#: src/transport/plugin_transport_xt.c:4014
7786msgid "XT transport not listening on any port (client only)\n"
7787msgstr ""
7788
7789#: src/transport/plugin_transport_xt.c:4018
7790#, c-format
7791msgid "XT transport advertises itself as being on port %llu\n"
7792msgstr ""
7793
7794#: src/transport/plugin_transport_xt.c:4022
7795#, fuzzy
7796msgid "# XT sessions active"
7797msgstr ""
7798"\n"
7799"按任意键继续\n"
7800
7801#: src/transport/plugin_transport_xu.c:1237
7802#, c-format
7803msgid ""
7804"XU could not transmit message to `%s': Network seems down, please check your "
7805"network configuration\n"
7806msgstr ""
7807
7808#: src/transport/plugin_transport_xu.c:1251
7809msgid ""
7810"XU could not transmit IPv6 message! Please check your network configuration "
7811"and disable IPv6 if your connection does not have a global IPv6 address\n"
7812msgstr ""
7813
7814#: src/transport/plugin_transport_xu.c:2125
7815#: src/transport/plugin_transport_xu.c:2224
7816#, fuzzy, c-format
7817msgid "Failed to bind XU socket to %s: %s\n"
7818msgstr "打开日志文件“%s”失败:%s\n"
7819
7820#: src/transport/plugin_transport_xu.c:2234
7821#, fuzzy
7822msgid "Failed to open XU sockets\n"
7823msgstr "打开日志文件“%s”失败:%s\n"
7824
7825#: src/transport/plugin_transport_xu.c:2398
7826#, fuzzy
7827msgid "Failed to create XU network sockets\n"
7828msgstr "发送消息失败。\n"
7829
7830#: src/transport/tcp_connection_legacy.c:452 7736#: src/transport/tcp_connection_legacy.c:452
7831#, fuzzy, c-format 7737#, fuzzy, c-format
7832msgid "Access denied to `%s'\n" 7738msgid "Access denied to `%s'\n"
@@ -9013,6 +8919,24 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
9013msgstr "" 8919msgstr ""
9014 8920
9015#, fuzzy 8921#, fuzzy
8922#~ msgid "# XT sessions active"
8923#~ msgstr ""
8924#~ "\n"
8925#~ "按任意键继续\n"
8926
8927#, fuzzy
8928#~ msgid "Failed to bind XU socket to %s: %s\n"
8929#~ msgstr "打开日志文件“%s”失败:%s\n"
8930
8931#, fuzzy
8932#~ msgid "Failed to open XU sockets\n"
8933#~ msgstr "打开日志文件“%s”失败:%s\n"
8934
8935#, fuzzy
8936#~ msgid "Failed to create XU network sockets\n"
8937#~ msgstr "发送消息失败。\n"
8938
8939#, fuzzy
9016#~ msgid "Print information about DV state" 8940#~ msgid "Print information about DV state"
9017#~ msgstr "无法获取有关用户“%s”的信息:%s\n" 8941#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
9018 8942
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index 7d7d04375..b64bfb182 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -42,10 +42,10 @@
42 * effective flow control (for uni-directional transports!) 42 * effective flow control (for uni-directional transports!)
43 * #4 UDP broadcasting logic must be extended to use the new API 43 * #4 UDP broadcasting logic must be extended to use the new API
44 * #5 only validated addresses go to ATS for scheduling; that 44 * #5 only validated addresses go to ATS for scheduling; that
45 * also ensures we know the RTT 45 * also ensures we know the RTT
46 * #6 to ensure flow control and RTT are OK, we always do the 46 * #6 to ensure flow control and RTT are OK, we always do the
47 * 'validation', even if address comes from PEERSTORE 47 * 'validation', even if address comes from PEERSTORE
48 * #7 48 * #7
49 * - ACK handling / retransmission 49 * - ACK handling / retransmission
50 * - address verification 50 * - address verification
51 * - track RTT, distance, loss, etc. 51 * - track RTT, distance, loss, etc.
@@ -1497,7 +1497,7 @@ static struct Neighbour *
1497lookup_neighbour (const struct GNUNET_PeerIdentity *pid) 1497lookup_neighbour (const struct GNUNET_PeerIdentity *pid)
1498{ 1498{
1499 return GNUNET_CONTAINER_multipeermap_get (neighbours, 1499 return GNUNET_CONTAINER_multipeermap_get (neighbours,
1500 pid); 1500 pid);
1501} 1501}
1502 1502
1503 1503
@@ -1561,9 +1561,9 @@ free_distance_vector_hop (struct DistanceVectorHop *dvh)
1561 if (NULL == dv->dv_head) 1561 if (NULL == dv->dv_head)
1562 { 1562 {
1563 GNUNET_assert (GNUNET_YES == 1563 GNUNET_assert (GNUNET_YES ==
1564 GNUNET_CONTAINER_multipeermap_remove (dv_routes, 1564 GNUNET_CONTAINER_multipeermap_remove (dv_routes,
1565 &dv->target, 1565 &dv->target,
1566 dv)); 1566 dv));
1567 if (NULL != dv->timeout_task) 1567 if (NULL != dv->timeout_task)
1568 GNUNET_SCHEDULER_cancel (dv->timeout_task); 1568 GNUNET_SCHEDULER_cancel (dv->timeout_task);
1569 GNUNET_free (dv); 1569 GNUNET_free (dv);
@@ -1602,18 +1602,18 @@ free_dv_route (struct DistanceVector *dv)
1602 */ 1602 */
1603static void 1603static void
1604notify_monitor (struct TransportClient *tc, 1604notify_monitor (struct TransportClient *tc,
1605 const struct GNUNET_PeerIdentity *peer, 1605 const struct GNUNET_PeerIdentity *peer,
1606 const char *address, 1606 const char *address,
1607 enum GNUNET_NetworkType nt, 1607 enum GNUNET_NetworkType nt,
1608 const struct MonitorEvent *me) 1608 const struct MonitorEvent *me)
1609{ 1609{
1610 struct GNUNET_MQ_Envelope *env; 1610 struct GNUNET_MQ_Envelope *env;
1611 struct GNUNET_TRANSPORT_MonitorData *md; 1611 struct GNUNET_TRANSPORT_MonitorData *md;
1612 size_t addr_len = strlen (address) + 1; 1612 size_t addr_len = strlen (address) + 1;
1613 1613
1614 env = GNUNET_MQ_msg_extra (md, 1614 env = GNUNET_MQ_msg_extra (md,
1615 addr_len, 1615 addr_len,
1616 GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA); 1616 GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_DATA);
1617 md->nt = htonl ((uint32_t) nt); 1617 md->nt = htonl ((uint32_t) nt);
1618 md->peer = *peer; 1618 md->peer = *peer;
1619 md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation); 1619 md->last_validation = GNUNET_TIME_absolute_hton (me->last_validation);
@@ -1624,10 +1624,10 @@ notify_monitor (struct TransportClient *tc,
1624 md->num_msg_pending = htonl (me->num_msg_pending); 1624 md->num_msg_pending = htonl (me->num_msg_pending);
1625 md->num_bytes_pending = htonl (me->num_bytes_pending); 1625 md->num_bytes_pending = htonl (me->num_bytes_pending);
1626 memcpy (&md[1], 1626 memcpy (&md[1],
1627 address, 1627 address,
1628 addr_len); 1628 addr_len);
1629 GNUNET_MQ_send (tc->mq, 1629 GNUNET_MQ_send (tc->mq,
1630 env); 1630 env);
1631} 1631}
1632 1632
1633 1633
@@ -1642,9 +1642,9 @@ notify_monitor (struct TransportClient *tc,
1642 */ 1642 */
1643static void 1643static void
1644notify_monitors (const struct GNUNET_PeerIdentity *peer, 1644notify_monitors (const struct GNUNET_PeerIdentity *peer,
1645 const char *address, 1645 const char *address,
1646 enum GNUNET_NetworkType nt, 1646 enum GNUNET_NetworkType nt,
1647 const struct MonitorEvent *me) 1647 const struct MonitorEvent *me)
1648{ 1648{
1649 static struct GNUNET_PeerIdentity zero; 1649 static struct GNUNET_PeerIdentity zero;
1650 1650
@@ -1657,17 +1657,17 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer,
1657 if (tc->details.monitor.one_shot) 1657 if (tc->details.monitor.one_shot)
1658 continue; 1658 continue;
1659 if ( (0 != memcmp (&tc->details.monitor.peer, 1659 if ( (0 != memcmp (&tc->details.monitor.peer,
1660 &zero, 1660 &zero,
1661 sizeof (zero))) && 1661 sizeof (zero))) &&
1662 (0 != memcmp (&tc->details.monitor.peer, 1662 (0 != memcmp (&tc->details.monitor.peer,
1663 peer, 1663 peer,
1664 sizeof (*peer))) ) 1664 sizeof (*peer))) )
1665 continue; 1665 continue;
1666 notify_monitor (tc, 1666 notify_monitor (tc,
1667 peer, 1667 peer,
1668 address, 1668 address,
1669 nt, 1669 nt,
1670 me); 1670 me);
1671 } 1671 }
1672} 1672}
1673 1673
@@ -1683,8 +1683,8 @@ notify_monitors (const struct GNUNET_PeerIdentity *peer,
1683 */ 1683 */
1684static void * 1684static void *
1685client_connect_cb (void *cls, 1685client_connect_cb (void *cls,
1686 struct GNUNET_SERVICE_Client *client, 1686 struct GNUNET_SERVICE_Client *client,
1687 struct GNUNET_MQ_Handle *mq) 1687 struct GNUNET_MQ_Handle *mq)
1688{ 1688{
1689 struct TransportClient *tc; 1689 struct TransportClient *tc;
1690 1690
@@ -1712,11 +1712,11 @@ free_reassembly_context (struct ReassemblyContext *rc)
1712 struct Neighbour *n = rc->neighbour; 1712 struct Neighbour *n = rc->neighbour;
1713 1713
1714 GNUNET_assert (rc == 1714 GNUNET_assert (rc ==
1715 GNUNET_CONTAINER_heap_remove_node (rc->hn)); 1715 GNUNET_CONTAINER_heap_remove_node (rc->hn));
1716 GNUNET_assert (GNUNET_OK == 1716 GNUNET_assert (GNUNET_OK ==
1717 GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map, 1717 GNUNET_CONTAINER_multishortmap_remove (n->reassembly_map,
1718 &rc->msg_uuid, 1718 &rc->msg_uuid,
1719 rc)); 1719 rc));
1720 GNUNET_free (rc); 1720 GNUNET_free (rc);
1721} 1721}
1722 1722
@@ -1742,8 +1742,8 @@ reassembly_cleanup_task (void *cls)
1742 } 1742 }
1743 GNUNET_assert (NULL == n->reassembly_timeout_task); 1743 GNUNET_assert (NULL == n->reassembly_timeout_task);
1744 n->reassembly_timeout_task = GNUNET_SCHEDULER_add_at (rc->reassembly_timeout, 1744 n->reassembly_timeout_task = GNUNET_SCHEDULER_add_at (rc->reassembly_timeout,
1745 &reassembly_cleanup_task, 1745 &reassembly_cleanup_task,
1746 n); 1746 n);
1747 return; 1747 return;
1748 } 1748 }
1749} 1749}
@@ -1783,16 +1783,16 @@ free_neighbour (struct Neighbour *neighbour)
1783 1783
1784 GNUNET_assert (NULL == neighbour->session_head); 1784 GNUNET_assert (NULL == neighbour->session_head);
1785 GNUNET_assert (GNUNET_YES == 1785 GNUNET_assert (GNUNET_YES ==
1786 GNUNET_CONTAINER_multipeermap_remove (neighbours, 1786 GNUNET_CONTAINER_multipeermap_remove (neighbours,
1787 &neighbour->pid, 1787 &neighbour->pid,
1788 neighbour)); 1788 neighbour));
1789 if (NULL != neighbour->timeout_task) 1789 if (NULL != neighbour->timeout_task)
1790 GNUNET_SCHEDULER_cancel (neighbour->timeout_task); 1790 GNUNET_SCHEDULER_cancel (neighbour->timeout_task);
1791 if (NULL != neighbour->reassembly_map) 1791 if (NULL != neighbour->reassembly_map)
1792 { 1792 {
1793 GNUNET_CONTAINER_multishortmap_iterate (neighbour->reassembly_map, 1793 GNUNET_CONTAINER_multishortmap_iterate (neighbour->reassembly_map,
1794 &free_reassembly_cb, 1794 &free_reassembly_cb,
1795 NULL); 1795 NULL);
1796 GNUNET_CONTAINER_multishortmap_destroy (neighbour->reassembly_map); 1796 GNUNET_CONTAINER_multishortmap_destroy (neighbour->reassembly_map);
1797 neighbour->reassembly_map = NULL; 1797 neighbour->reassembly_map = NULL;
1798 GNUNET_CONTAINER_heap_destroy (neighbour->reassembly_heap); 1798 GNUNET_CONTAINER_heap_destroy (neighbour->reassembly_heap);
@@ -1815,15 +1815,15 @@ free_neighbour (struct Neighbour *neighbour)
1815 */ 1815 */
1816static void 1816static void
1817core_send_connect_info (struct TransportClient *tc, 1817core_send_connect_info (struct TransportClient *tc,
1818 const struct GNUNET_PeerIdentity *pid, 1818 const struct GNUNET_PeerIdentity *pid,
1819 struct GNUNET_BANDWIDTH_Value32NBO quota_out) 1819 struct GNUNET_BANDWIDTH_Value32NBO quota_out)
1820{ 1820{
1821 struct GNUNET_MQ_Envelope *env; 1821 struct GNUNET_MQ_Envelope *env;
1822 struct ConnectInfoMessage *cim; 1822 struct ConnectInfoMessage *cim;
1823 1823
1824 GNUNET_assert (CT_CORE == tc->type); 1824 GNUNET_assert (CT_CORE == tc->type);
1825 env = GNUNET_MQ_msg (cim, 1825 env = GNUNET_MQ_msg (cim,
1826 GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT); 1826 GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
1827 cim->quota_out = quota_out; 1827 cim->quota_out = quota_out;
1828 cim->id = *pid; 1828 cim->id = *pid;
1829 GNUNET_MQ_send (tc->mq, 1829 GNUNET_MQ_send (tc->mq,
@@ -1839,7 +1839,7 @@ core_send_connect_info (struct TransportClient *tc,
1839 */ 1839 */
1840static void 1840static void
1841cores_send_connect_info (const struct GNUNET_PeerIdentity *pid, 1841cores_send_connect_info (const struct GNUNET_PeerIdentity *pid,
1842 struct GNUNET_BANDWIDTH_Value32NBO quota_out) 1842 struct GNUNET_BANDWIDTH_Value32NBO quota_out)
1843{ 1843{
1844 for (struct TransportClient *tc = clients_head; 1844 for (struct TransportClient *tc = clients_head;
1845 NULL != tc; 1845 NULL != tc;
@@ -1848,8 +1848,8 @@ cores_send_connect_info (const struct GNUNET_PeerIdentity *pid,
1848 if (CT_CORE != tc->type) 1848 if (CT_CORE != tc->type)
1849 continue; 1849 continue;
1850 core_send_connect_info (tc, 1850 core_send_connect_info (tc,
1851 pid, 1851 pid,
1852 quota_out); 1852 quota_out);
1853 } 1853 }
1854} 1854}
1855 1855
@@ -1872,10 +1872,10 @@ cores_send_disconnect_info (const struct GNUNET_PeerIdentity *pid)
1872 if (CT_CORE != tc->type) 1872 if (CT_CORE != tc->type)
1873 continue; 1873 continue;
1874 env = GNUNET_MQ_msg (dim, 1874 env = GNUNET_MQ_msg (dim,
1875 GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT); 1875 GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
1876 dim->peer = *pid; 1876 dim->peer = *pid;
1877 GNUNET_MQ_send (tc->mq, 1877 GNUNET_MQ_send (tc->mq,
1878 env); 1878 env);
1879 } 1879 }
1880} 1880}
1881 1881
@@ -1910,20 +1910,21 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue)
1910 unsigned int wsize; 1910 unsigned int wsize;
1911 1911
1912 GNUNET_assert (NULL != pm); 1912 GNUNET_assert (NULL != pm);
1913 if (queue->tc->details.communicator.total_queue_length >= COMMUNICATOR_TOTAL_QUEUE_LIMIT) 1913 if (queue->tc->details.communicator.total_queue_length >=
1914 COMMUNICATOR_TOTAL_QUEUE_LIMIT)
1914 { 1915 {
1915 GNUNET_STATISTICS_update (GST_stats, 1916 GNUNET_STATISTICS_update (GST_stats,
1916 "# Transmission throttled due to communicator queue limit", 1917 "# Transmission throttled due to communicator queue limit",
1917 1, 1918 1,
1918 GNUNET_NO); 1919 GNUNET_NO);
1919 return; 1920 return;
1920 } 1921 }
1921 if (queue->queue_length >= SESSION_QUEUE_LIMIT) 1922 if (queue->queue_length >= SESSION_QUEUE_LIMIT)
1922 { 1923 {
1923 GNUNET_STATISTICS_update (GST_stats, 1924 GNUNET_STATISTICS_update (GST_stats,
1924 "# Transmission throttled due to session queue limit", 1925 "# Transmission throttled due to session queue limit",
1925 1, 1926 1,
1926 GNUNET_NO); 1927 GNUNET_NO);
1927 return; 1928 return;
1928 } 1929 }
1929 1930
@@ -1931,27 +1932,28 @@ schedule_transmit_on_queue (struct GNUNET_ATS_Session *queue)
1931 ? pm->bytes_msg /* FIXME: add overheads? */ 1932 ? pm->bytes_msg /* FIXME: add overheads? */
1932 : queue->mtu; 1933 : queue->mtu;
1933 out_delay = GNUNET_BANDWIDTH_tracker_get_delay (&queue->tracker_out, 1934 out_delay = GNUNET_BANDWIDTH_tracker_get_delay (&queue->tracker_out,
1934 wsize); 1935 wsize);
1935 out_delay = GNUNET_TIME_relative_max (GNUNET_TIME_absolute_get_remaining (pm->next_attempt), 1936 out_delay = GNUNET_TIME_relative_max (GNUNET_TIME_absolute_get_remaining (pm->next_attempt),
1936 out_delay); 1937 out_delay);
1937 if (0 == out_delay.rel_value_us) 1938 if (0 == out_delay.rel_value_us)
1938 return; /* we should run immediately! */ 1939 return; /* we should run immediately! */
1939 /* queue has changed since we were scheduled, reschedule again */ 1940 /* queue has changed since we were scheduled, reschedule again */
1940 queue->transmit_task = GNUNET_SCHEDULER_add_delayed (out_delay, 1941 queue->transmit_task
1941 &transmit_on_queue, 1942 = GNUNET_SCHEDULER_add_delayed (out_delay,
1942 queue); 1943 &transmit_on_queue,
1944 queue);
1943 if (out_delay.rel_value_us > DELAY_WARN_THRESHOLD.rel_value_us) 1945 if (out_delay.rel_value_us > DELAY_WARN_THRESHOLD.rel_value_us)
1944 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 1946 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
1945 "Next transmission on queue `%s' in %s (high delay)\n", 1947 "Next transmission on queue `%s' in %s (high delay)\n",
1946 queue->address, 1948 queue->address,
1947 GNUNET_STRINGS_relative_time_to_string (out_delay, 1949 GNUNET_STRINGS_relative_time_to_string (out_delay,
1948 GNUNET_YES)); 1950 GNUNET_YES));
1949 else 1951 else
1950 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1952 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1951 "Next transmission on queue `%s' in %s\n", 1953 "Next transmission on queue `%s' in %s\n",
1952 queue->address, 1954 queue->address,
1953 GNUNET_STRINGS_relative_time_to_string (out_delay, 1955 GNUNET_STRINGS_relative_time_to_string (out_delay,
1954 GNUNET_YES)); 1956 GNUNET_YES));
1955} 1957}
1956 1958
1957 1959
@@ -1978,19 +1980,19 @@ free_session (struct GNUNET_ATS_Session *session)
1978 session->transmit_task = NULL; 1980 session->transmit_task = NULL;
1979 } 1981 }
1980 GNUNET_CONTAINER_MDLL_remove (neighbour, 1982 GNUNET_CONTAINER_MDLL_remove (neighbour,
1981 neighbour->session_head, 1983 neighbour->session_head,
1982 neighbour->session_tail, 1984 neighbour->session_tail,
1983 session); 1985 session);
1984 GNUNET_CONTAINER_MDLL_remove (client, 1986 GNUNET_CONTAINER_MDLL_remove (client,
1985 tc->details.communicator.session_head, 1987 tc->details.communicator.session_head,
1986 tc->details.communicator.session_tail, 1988 tc->details.communicator.session_tail,
1987 session); 1989 session);
1988 maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT >= tc->details.communicator.total_queue_length); 1990 maxxed = (COMMUNICATOR_TOTAL_QUEUE_LIMIT >= tc->details.communicator.total_queue_length);
1989 while (NULL != (qe = session->queue_head)) 1991 while (NULL != (qe = session->queue_head))
1990 { 1992 {
1991 GNUNET_CONTAINER_DLL_remove (session->queue_head, 1993 GNUNET_CONTAINER_DLL_remove (session->queue_head,
1992 session->queue_tail, 1994 session->queue_tail,
1993 qe); 1995 qe);
1994 session->queue_length--; 1996 session->queue_length--;
1995 tc->details.communicator.total_queue_length--; 1997 tc->details.communicator.total_queue_length--;
1996 GNUNET_free (qe); 1998 GNUNET_free (qe);
@@ -2001,18 +2003,18 @@ free_session (struct GNUNET_ATS_Session *session)
2001 { 2003 {
2002 /* Communicator dropped below threshold, resume all queues */ 2004 /* Communicator dropped below threshold, resume all queues */
2003 GNUNET_STATISTICS_update (GST_stats, 2005 GNUNET_STATISTICS_update (GST_stats,
2004 "# Transmission throttled due to communicator queue limit", 2006 "# Transmission throttled due to communicator queue limit",
2005 -1, 2007 -1,
2006 GNUNET_NO); 2008 GNUNET_NO);
2007 for (struct GNUNET_ATS_Session *s = tc->details.communicator.session_head; 2009 for (struct GNUNET_ATS_Session *s = tc->details.communicator.session_head;
2008 NULL != s; 2010 NULL != s;
2009 s = s->next_client) 2011 s = s->next_client)
2010 schedule_transmit_on_queue (s); 2012 schedule_transmit_on_queue (s);
2011 } 2013 }
2012 notify_monitors (&neighbour->pid, 2014 notify_monitors (&neighbour->pid,
2013 session->address, 2015 session->address,
2014 session->nt, 2016 session->nt,
2015 &me); 2017 &me);
2016 GNUNET_ATS_session_del (session->sr); 2018 GNUNET_ATS_session_del (session->sr);
2017 GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_in); 2019 GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_in);
2018 GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_out); 2020 GNUNET_BANDWIDTH_tracker_notification_stop (&session->tracker_out);
@@ -2036,8 +2038,8 @@ free_address_list_entry (struct AddressListEntry *ale)
2036 struct TransportClient *tc = ale->tc; 2038 struct TransportClient *tc = ale->tc;
2037 2039
2038 GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head, 2040 GNUNET_CONTAINER_DLL_remove (tc->details.communicator.addr_head,
2039 tc->details.communicator.addr_tail, 2041 tc->details.communicator.addr_tail,
2040 ale); 2042 ale);
2041 if (NULL != ale->sc) 2043 if (NULL != ale->sc)
2042 { 2044 {
2043 GNUNET_PEERSTORE_store_cancel (ale->sc); 2045 GNUNET_PEERSTORE_store_cancel (ale->sc);
@@ -2062,8 +2064,8 @@ free_address_list_entry (struct AddressListEntry *ale)
2062 */ 2064 */
2063static void 2065static void
2064client_disconnect_cb (void *cls, 2066client_disconnect_cb (void *cls,
2065 struct GNUNET_SERVICE_Client *client, 2067 struct GNUNET_SERVICE_Client *client,
2066 void *app_ctx) 2068 void *app_ctx)
2067{ 2069{
2068 struct TransportClient *tc = app_ctx; 2070 struct TransportClient *tc = app_ctx;
2069 2071
@@ -2083,11 +2085,11 @@ client_disconnect_cb (void *cls,
2083 2085
2084 while (NULL != (pm = tc->details.core.pending_msg_head)) 2086 while (NULL != (pm = tc->details.core.pending_msg_head))
2085 { 2087 {
2086 GNUNET_CONTAINER_MDLL_remove (client, 2088 GNUNET_CONTAINER_MDLL_remove (client,
2087 tc->details.core.pending_msg_head, 2089 tc->details.core.pending_msg_head,
2088 tc->details.core.pending_msg_tail, 2090 tc->details.core.pending_msg_tail,
2089 pm); 2091 pm);
2090 pm->client = NULL; 2092 pm->client = NULL;
2091 } 2093 }
2092 } 2094 }
2093 break; 2095 break;
@@ -2121,15 +2123,15 @@ client_disconnect_cb (void *cls,
2121 */ 2123 */
2122static int 2124static int
2123notify_client_connect_info (void *cls, 2125notify_client_connect_info (void *cls,
2124 const struct GNUNET_PeerIdentity *pid, 2126 const struct GNUNET_PeerIdentity *pid,
2125 void *value) 2127 void *value)
2126{ 2128{
2127 struct TransportClient *tc = cls; 2129 struct TransportClient *tc = cls;
2128 struct Neighbour *neighbour = value; 2130 struct Neighbour *neighbour = value;
2129 2131
2130 core_send_connect_info (tc, 2132 core_send_connect_info (tc,
2131 pid, 2133 pid,
2132 neighbour->quota_out); 2134 neighbour->quota_out);
2133 return GNUNET_OK; 2135 return GNUNET_OK;
2134} 2136}
2135 2137
@@ -2144,7 +2146,7 @@ notify_client_connect_info (void *cls,
2144 */ 2146 */
2145static void 2147static void
2146handle_client_start (void *cls, 2148handle_client_start (void *cls,
2147 const struct StartMessage *start) 2149 const struct StartMessage *start)
2148{ 2150{
2149 struct TransportClient *tc = cls; 2151 struct TransportClient *tc = cls;
2150 uint32_t options; 2152 uint32_t options;
@@ -2169,8 +2171,8 @@ handle_client_start (void *cls,
2169 } 2171 }
2170 tc->type = CT_CORE; 2172 tc->type = CT_CORE;
2171 GNUNET_CONTAINER_multipeermap_iterate (neighbours, 2173 GNUNET_CONTAINER_multipeermap_iterate (neighbours,
2172 &notify_client_connect_info, 2174 &notify_client_connect_info,
2173 tc); 2175 tc);
2174 GNUNET_SERVICE_client_continue (tc->client); 2176 GNUNET_SERVICE_client_continue (tc->client);
2175} 2177}
2176 2178
@@ -2183,7 +2185,7 @@ handle_client_start (void *cls,
2183 */ 2185 */
2184static int 2186static int
2185check_client_send (void *cls, 2187check_client_send (void *cls,
2186 const struct OutboundMessage *obm) 2188 const struct OutboundMessage *obm)
2187{ 2189{
2188 struct TransportClient *tc = cls; 2190 struct TransportClient *tc = cls;
2189 uint16_t size; 2191 uint16_t size;
@@ -2248,14 +2250,14 @@ free_pending_message (struct PendingMessage *pm)
2248 if (NULL != tc) 2250 if (NULL != tc)
2249 { 2251 {
2250 GNUNET_CONTAINER_MDLL_remove (client, 2252 GNUNET_CONTAINER_MDLL_remove (client,
2251 tc->details.core.pending_msg_head, 2253 tc->details.core.pending_msg_head,
2252 tc->details.core.pending_msg_tail, 2254 tc->details.core.pending_msg_tail,
2253 pm); 2255 pm);
2254 } 2256 }
2255 GNUNET_CONTAINER_MDLL_remove (neighbour, 2257 GNUNET_CONTAINER_MDLL_remove (neighbour,
2256 target->pending_msg_head, 2258 target->pending_msg_head,
2257 target->pending_msg_tail, 2259 target->pending_msg_tail,
2258 pm); 2260 pm);
2259 free_fragment_tree (pm); 2261 free_fragment_tree (pm);
2260 GNUNET_free_non_null (pm->bpm); 2262 GNUNET_free_non_null (pm->bpm);
2261 GNUNET_free (pm); 2263 GNUNET_free (pm);
@@ -2276,8 +2278,8 @@ free_pending_message (struct PendingMessage *pm)
2276 */ 2278 */
2277static void 2279static void
2278client_send_response (struct PendingMessage *pm, 2280client_send_response (struct PendingMessage *pm,
2279 int success, 2281 int success,
2280 uint32_t bytes_physical) 2282 uint32_t bytes_physical)
2281{ 2283{
2282 struct TransportClient *tc = pm->client; 2284 struct TransportClient *tc = pm->client;
2283 struct Neighbour *target = pm->target; 2285 struct Neighbour *target = pm->target;
@@ -2287,7 +2289,7 @@ client_send_response (struct PendingMessage *pm,
2287 if (NULL != tc) 2289 if (NULL != tc)
2288 { 2290 {
2289 env = GNUNET_MQ_msg (som, 2291 env = GNUNET_MQ_msg (som,
2290 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); 2292 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
2291 som->success = htonl ((uint32_t) success); 2293 som->success = htonl ((uint32_t) success);
2292 som->bytes_msg = htons (pm->bytes_msg); 2294 som->bytes_msg = htons (pm->bytes_msg);
2293 som->bytes_physical = htonl (bytes_physical); 2295 som->bytes_physical = htonl (bytes_physical);
@@ -2324,22 +2326,22 @@ check_queue_timeouts (void *cls)
2324 if (pos->timeout.abs_value_us <= now.abs_value_us) 2326 if (pos->timeout.abs_value_us <= now.abs_value_us)
2325 { 2327 {
2326 GNUNET_STATISTICS_update (GST_stats, 2328 GNUNET_STATISTICS_update (GST_stats,
2327 "# messages dropped (timeout before confirmation)", 2329 "# messages dropped (timeout before confirmation)",
2328 1, 2330 1,
2329 GNUNET_NO); 2331 GNUNET_NO);
2330 client_send_response (pm, 2332 client_send_response (pm,
2331 GNUNET_NO, 2333 GNUNET_NO,
2332 0); 2334 0);
2333 continue; 2335 continue;
2334 } 2336 }
2335 earliest_timeout = GNUNET_TIME_absolute_min (earliest_timeout, 2337 earliest_timeout = GNUNET_TIME_absolute_min (earliest_timeout,
2336 pos->timeout); 2338 pos->timeout);
2337 } 2339 }
2338 n->earliest_timeout = earliest_timeout; 2340 n->earliest_timeout = earliest_timeout;
2339 if (NULL != n->pending_msg_head) 2341 if (NULL != n->pending_msg_head)
2340 n->timeout_task = GNUNET_SCHEDULER_add_at (earliest_timeout, 2342 n->timeout_task = GNUNET_SCHEDULER_add_at (earliest_timeout,
2341 &check_queue_timeouts, 2343 &check_queue_timeouts,
2342 n); 2344 n);
2343} 2345}
2344 2346
2345 2347
@@ -2351,13 +2353,14 @@ check_queue_timeouts (void *cls)
2351 */ 2353 */
2352static void 2354static void
2353handle_client_send (void *cls, 2355handle_client_send (void *cls,
2354 const struct OutboundMessage *obm) 2356 const struct OutboundMessage *obm)
2355{ 2357{
2356 struct TransportClient *tc = cls; 2358 struct TransportClient *tc = cls;
2357 struct PendingMessage *pm; 2359 struct PendingMessage *pm;
2358 const struct GNUNET_MessageHeader *obmm; 2360 const struct GNUNET_MessageHeader *obmm;
2359 struct Neighbour *target; 2361 struct Neighbour *target;
2360 uint32_t bytes_msg; 2362 uint32_t bytes_msg;
2363 int was_empty;
2361 2364
2362 GNUNET_assert (CT_CORE == tc->type); 2365 GNUNET_assert (CT_CORE == tc->type);
2363 obmm = (const struct GNUNET_MessageHeader *) &obm[1]; 2366 obmm = (const struct GNUNET_MessageHeader *) &obm[1];
@@ -2373,36 +2376,37 @@ handle_client_send (void *cls,
2373 struct SendOkMessage *som; 2376 struct SendOkMessage *som;
2374 2377
2375 env = GNUNET_MQ_msg (som, 2378 env = GNUNET_MQ_msg (som,
2376 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK); 2379 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
2377 som->success = htonl (GNUNET_SYSERR); 2380 som->success = htonl (GNUNET_SYSERR);
2378 som->bytes_msg = htonl (bytes_msg); 2381 som->bytes_msg = htonl (bytes_msg);
2379 som->bytes_physical = htonl (0); 2382 som->bytes_physical = htonl (0);
2380 som->peer = obm->peer; 2383 som->peer = obm->peer;
2381 GNUNET_MQ_send (tc->mq, 2384 GNUNET_MQ_send (tc->mq,
2382 env); 2385 env);
2383 GNUNET_SERVICE_client_continue (tc->client); 2386 GNUNET_SERVICE_client_continue (tc->client);
2384 GNUNET_STATISTICS_update (GST_stats, 2387 GNUNET_STATISTICS_update (GST_stats,
2385 "# messages dropped (neighbour unknown)", 2388 "# messages dropped (neighbour unknown)",
2386 1, 2389 1,
2387 GNUNET_NO); 2390 GNUNET_NO);
2388 return; 2391 return;
2389 } 2392 }
2393 was_empty = (NULL == target->pending_msg_head);
2390 pm = GNUNET_malloc (sizeof (struct PendingMessage) + bytes_msg); 2394 pm = GNUNET_malloc (sizeof (struct PendingMessage) + bytes_msg);
2391 pm->client = tc; 2395 pm->client = tc;
2392 pm->target = target; 2396 pm->target = target;
2393 pm->bytes_msg = bytes_msg; 2397 pm->bytes_msg = bytes_msg;
2394 pm->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_ntoh (obm->timeout)); 2398 pm->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_ntoh (obm->timeout));
2395 memcpy (&pm[1], 2399 memcpy (&pm[1],
2396 &obm[1], 2400 &obm[1],
2397 bytes_msg); 2401 bytes_msg);
2398 GNUNET_CONTAINER_MDLL_insert (neighbour, 2402 GNUNET_CONTAINER_MDLL_insert (neighbour,
2399 target->pending_msg_head, 2403 target->pending_msg_head,
2400 target->pending_msg_tail, 2404 target->pending_msg_tail,
2401 pm); 2405 pm);
2402 GNUNET_CONTAINER_MDLL_insert (client, 2406 GNUNET_CONTAINER_MDLL_insert (client,
2403 tc->details.core.pending_msg_head, 2407 tc->details.core.pending_msg_head,
2404 tc->details.core.pending_msg_tail, 2408 tc->details.core.pending_msg_tail,
2405 pm); 2409 pm);
2406 if (target->earliest_timeout.abs_value_us > pm->timeout.abs_value_us) 2410 if (target->earliest_timeout.abs_value_us > pm->timeout.abs_value_us)
2407 { 2411 {
2408 target->earliest_timeout.abs_value_us = pm->timeout.abs_value_us; 2412 target->earliest_timeout.abs_value_us = pm->timeout.abs_value_us;
@@ -2410,8 +2414,19 @@ handle_client_send (void *cls,
2410 GNUNET_SCHEDULER_cancel (target->timeout_task); 2414 GNUNET_SCHEDULER_cancel (target->timeout_task);
2411 target->timeout_task 2415 target->timeout_task
2412 = GNUNET_SCHEDULER_add_at (target->earliest_timeout, 2416 = GNUNET_SCHEDULER_add_at (target->earliest_timeout,
2413 &check_queue_timeouts, 2417 &check_queue_timeouts,
2414 target); 2418 target);
2419 }
2420 if (! was_empty)
2421 return; /* all queues must already be busy */
2422 for (struct GNUNET_ATS_Session *queue = target->session_head;
2423 NULL != queue;
2424 queue = queue->next_neighbour)
2425 {
2426 /* try transmission on any queue that is idle */
2427 if (NULL == queue->transmit_task)
2428 queue->transmit_task = GNUNET_SCHEDULER_add_now (&transmit_on_queue,
2429 queue);
2415 } 2430 }
2416} 2431}
2417 2432
@@ -3835,9 +3850,9 @@ transmit_on_queue (void *cls)
3835 respect that even if MTU is 0 for 3850 respect that even if MTU is 0 for
3836 this queue */) ) 3851 this queue */) )
3837 s = fragment_message (s, 3852 s = fragment_message (s,
3838 (0 == queue->mtu) 3853 (0 == queue->mtu)
3839 ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo) 3854 ? UINT16_MAX - sizeof (struct GNUNET_TRANSPORT_SendMessageTo)
3840 : queue->mtu); 3855 : queue->mtu);
3841 if (NULL == s) 3856 if (NULL == s)
3842 { 3857 {
3843 /* Fragmentation failed, try next message... */ 3858 /* Fragmentation failed, try next message... */
@@ -3868,13 +3883,13 @@ transmit_on_queue (void *cls)
3868 smt->mid = qe->mid; 3883 smt->mid = qe->mid;
3869 smt->receiver = n->pid; 3884 smt->receiver = n->pid;
3870 memcpy (&smt[1], 3885 memcpy (&smt[1],
3871 &s[1], 3886 &s[1],
3872 s->bytes_msg); 3887 s->bytes_msg);
3873 GNUNET_assert (CT_COMMUNICATOR == queue->tc->type); 3888 GNUNET_assert (CT_COMMUNICATOR == queue->tc->type);
3874 queue->queue_length++; 3889 queue->queue_length++;
3875 queue->tc->details.communicator.total_queue_length++; 3890 queue->tc->details.communicator.total_queue_length++;
3876 GNUNET_MQ_send (queue->tc->mq, 3891 GNUNET_MQ_send (queue->tc->mq,
3877 env); 3892 env);
3878 3893
3879 // FIXME: do something similar to the logic below 3894 // FIXME: do something similar to the logic below
3880 // in defragmentation / reliability ACK handling! 3895 // in defragmentation / reliability ACK handling!
@@ -3886,8 +3901,8 @@ transmit_on_queue (void *cls)
3886 { 3901 {
3887 /* Full message sent, and over reliabile channel */ 3902 /* Full message sent, and over reliabile channel */
3888 client_send_response (pm, 3903 client_send_response (pm,
3889 GNUNET_YES, 3904 GNUNET_YES,
3890 pm->bytes_msg); 3905 pm->bytes_msg);
3891 } 3906 }
3892 else if ( (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc) && 3907 else if ( (GNUNET_TRANSPORT_CC_RELIABLE == queue->tc->details.communicator.cc) &&
3893 (PMT_FRAGMENT_BOX == s->pmt) ) 3908 (PMT_FRAGMENT_BOX == s->pmt) )
@@ -3898,9 +3913,9 @@ transmit_on_queue (void *cls)
3898 free_fragment_tree (s); 3913 free_fragment_tree (s);
3899 pos = s->frag_parent; 3914 pos = s->frag_parent;
3900 GNUNET_CONTAINER_MDLL_remove (frag, 3915 GNUNET_CONTAINER_MDLL_remove (frag,
3901 pos->head_frag, 3916 pos->head_frag,
3902 pos->tail_frag, 3917 pos->tail_frag,
3903 s); 3918 s);
3904 GNUNET_free (s); 3919 GNUNET_free (s);
3905 /* check if subtree is done */ 3920 /* check if subtree is done */
3906 while ( (NULL == pos->head_frag) && 3921 while ( (NULL == pos->head_frag) &&
@@ -3910,9 +3925,9 @@ transmit_on_queue (void *cls)
3910 s = pos; 3925 s = pos;
3911 pos = s->frag_parent; 3926 pos = s->frag_parent;
3912 GNUNET_CONTAINER_MDLL_remove (frag, 3927 GNUNET_CONTAINER_MDLL_remove (frag,
3913 pos->head_frag, 3928 pos->head_frag,
3914 pos->tail_frag, 3929 pos->tail_frag,
3915 s); 3930 s);
3916 GNUNET_free (s); 3931 GNUNET_free (s);
3917 } 3932 }
3918 3933
@@ -3920,8 +3935,8 @@ transmit_on_queue (void *cls)
3920 if ( (NULL == pm->head_frag) && 3935 if ( (NULL == pm->head_frag) &&
3921 (pm->frag_off == pm->bytes_msg) ) 3936 (pm->frag_off == pm->bytes_msg) )
3922 client_send_response (pm, 3937 client_send_response (pm,
3923 GNUNET_YES, 3938 GNUNET_YES,
3924 pm->bytes_msg /* FIXME: calculate and add overheads! */); 3939 pm->bytes_msg /* FIXME: calculate and add overheads! */);
3925 } 3940 }
3926 else if (PMT_CORE != pm->pmt) 3941 else if (PMT_CORE != pm->pmt)
3927 { 3942 {
@@ -3941,25 +3956,25 @@ transmit_on_queue (void *cls)
3941 message urgency and size when delaying ACKs, etc.) */ 3956 message urgency and size when delaying ACKs, etc.) */
3942 s->next_attempt = GNUNET_TIME_relative_to_absolute 3957 s->next_attempt = GNUNET_TIME_relative_to_absolute
3943 (GNUNET_TIME_relative_multiply (queue->rtt, 3958 (GNUNET_TIME_relative_multiply (queue->rtt,
3944 4)); 3959 4));
3945 if (s == pm) 3960 if (s == pm)
3946 { 3961 {
3947 struct PendingMessage *pos; 3962 struct PendingMessage *pos;
3948 3963
3949 /* re-insert sort in neighbour list */ 3964 /* re-insert sort in neighbour list */
3950 GNUNET_CONTAINER_MDLL_remove (neighbour, 3965 GNUNET_CONTAINER_MDLL_remove (neighbour,
3951 neighbour->pending_msg_head, 3966 neighbour->pending_msg_head,
3952 neighbour->pending_msg_tail, 3967 neighbour->pending_msg_tail,
3953 pm); 3968 pm);
3954 pos = neighbour->pending_msg_tail; 3969 pos = neighbour->pending_msg_tail;
3955 while ( (NULL != pos) && 3970 while ( (NULL != pos) &&
3956 (pm->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) 3971 (pm->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) )
3957 pos = pos->prev_neighbour; 3972 pos = pos->prev_neighbour;
3958 GNUNET_CONTAINER_MDLL_insert_after (neighbour, 3973 GNUNET_CONTAINER_MDLL_insert_after (neighbour,
3959 neighbour->pending_msg_head, 3974 neighbour->pending_msg_head,
3960 neighbour->pending_msg_tail, 3975 neighbour->pending_msg_tail,
3961 pos, 3976 pos,
3962 pm); 3977 pm);
3963 } 3978 }
3964 else 3979 else
3965 { 3980 {
@@ -3968,18 +3983,18 @@ transmit_on_queue (void *cls)
3968 struct PendingMessage *pos; 3983 struct PendingMessage *pos;
3969 3984
3970 GNUNET_CONTAINER_MDLL_remove (frag, 3985 GNUNET_CONTAINER_MDLL_remove (frag,
3971 fp->head_frag, 3986 fp->head_frag,
3972 fp->tail_frag, 3987 fp->tail_frag,
3973 s); 3988 s);
3974 pos = fp->tail_frag; 3989 pos = fp->tail_frag;
3975 while ( (NULL != pos) && 3990 while ( (NULL != pos) &&
3976 (s->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) ) 3991 (s->next_attempt.abs_value_us > pos->next_attempt.abs_value_us) )
3977 pos = pos->prev_frag; 3992 pos = pos->prev_frag;
3978 GNUNET_CONTAINER_MDLL_insert_after (frag, 3993 GNUNET_CONTAINER_MDLL_insert_after (frag,
3979 fp->head_frag, 3994 fp->head_frag,
3980 fp->tail_frag, 3995 fp->tail_frag,
3981 pos, 3996 pos,
3982 s); 3997 s);
3983 } 3998 }
3984 } 3999 }
3985 4000
@@ -4028,9 +4043,9 @@ tracker_excess_out_cb (void *cls)
4028 from here via a message instead! */ 4043 from here via a message instead! */
4029 /* TODO: maybe inform ATS at this point? */ 4044 /* TODO: maybe inform ATS at this point? */
4030 GNUNET_STATISTICS_update (GST_stats, 4045 GNUNET_STATISTICS_update (GST_stats,
4031 "# Excess outbound bandwidth reported", 4046 "# Excess outbound bandwidth reported",
4032 1, 4047 1,
4033 GNUNET_NO); 4048 GNUNET_NO);
4034} 4049}
4035 4050
4036 4051
@@ -4046,9 +4061,9 @@ tracker_excess_in_cb (void *cls)
4046{ 4061{
4047 /* TODO: maybe inform ATS at this point? */ 4062 /* TODO: maybe inform ATS at this point? */
4048 GNUNET_STATISTICS_update (GST_stats, 4063 GNUNET_STATISTICS_update (GST_stats,
4049 "# Excess inbound bandwidth reported", 4064 "# Excess inbound bandwidth reported",
4050 1, 4065 1,
4051 GNUNET_NO); 4066 GNUNET_NO);
4052} 4067}
4053 4068
4054 4069
@@ -4083,12 +4098,12 @@ handle_add_queue_message (void *cls,
4083 neighbour->earliest_timeout = GNUNET_TIME_UNIT_FOREVER_ABS; 4098 neighbour->earliest_timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
4084 neighbour->pid = aqm->receiver; 4099 neighbour->pid = aqm->receiver;
4085 GNUNET_assert (GNUNET_OK == 4100 GNUNET_assert (GNUNET_OK ==
4086 GNUNET_CONTAINER_multipeermap_put (neighbours, 4101 GNUNET_CONTAINER_multipeermap_put (neighbours,
4087 &neighbour->pid, 4102 &neighbour->pid,
4088 neighbour, 4103 neighbour,
4089 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); 4104 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
4090 cores_send_connect_info (&neighbour->pid, 4105 cores_send_connect_info (&neighbour->pid,
4091 GNUNET_BANDWIDTH_ZERO); 4106 GNUNET_BANDWIDTH_ZERO);
4092 } 4107 }
4093 addr_len = ntohs (aqm->header.size) - sizeof (*aqm); 4108 addr_len = ntohs (aqm->header.size) - sizeof (*aqm);
4094 addr = (const char *) &aqm[1]; 4109 addr = (const char *) &aqm[1];
@@ -4117,8 +4132,8 @@ handle_add_queue_message (void *cls,
4117 &tracker_excess_out_cb, 4132 &tracker_excess_out_cb,
4118 queue); 4133 queue);
4119 memcpy (&queue[1], 4134 memcpy (&queue[1],
4120 addr, 4135 addr,
4121 addr_len); 4136 addr_len);
4122 /* notify ATS about new queue */ 4137 /* notify ATS about new queue */
4123 { 4138 {
4124 struct GNUNET_ATS_Properties prop = { 4139 struct GNUNET_ATS_Properties prop = {
@@ -4129,10 +4144,10 @@ handle_add_queue_message (void *cls,
4129 }; 4144 };
4130 4145
4131 queue->sr = GNUNET_ATS_session_add (ats, 4146 queue->sr = GNUNET_ATS_session_add (ats,
4132 &neighbour->pid, 4147 &neighbour->pid,
4133 queue->address, 4148 queue->address,
4134 queue, 4149 queue,
4135 &prop); 4150 &prop);
4136 if (NULL == queue->sr) 4151 if (NULL == queue->sr)
4137 { 4152 {
4138 /* This can only happen if the 'address' was way too long for ATS 4153 /* This can only happen if the 'address' was way too long for ATS
@@ -4159,18 +4174,18 @@ handle_add_queue_message (void *cls,
4159 }; 4174 };
4160 4175
4161 notify_monitors (&neighbour->pid, 4176 notify_monitors (&neighbour->pid,
4162 queue->address, 4177 queue->address,
4163 queue->nt, 4178 queue->nt,
4164 &me); 4179 &me);
4165 } 4180 }
4166 GNUNET_CONTAINER_MDLL_insert (neighbour, 4181 GNUNET_CONTAINER_MDLL_insert (neighbour,
4167 neighbour->session_head, 4182 neighbour->session_head,
4168 neighbour->session_tail, 4183 neighbour->session_tail,
4169 queue); 4184 queue);
4170 GNUNET_CONTAINER_MDLL_insert (client, 4185 GNUNET_CONTAINER_MDLL_insert (client,
4171 tc->details.communicator.session_head, 4186 tc->details.communicator.session_head,
4172 tc->details.communicator.session_tail, 4187 tc->details.communicator.session_tail,
4173 queue); 4188 queue);
4174 GNUNET_SERVICE_client_continue (tc->client); 4189 GNUNET_SERVICE_client_continue (tc->client);
4175} 4190}
4176 4191
@@ -4273,21 +4288,21 @@ handle_send_message_ack (void *cls,
4273 { 4288 {
4274 /* Communicator dropped below threshold, resume all queues */ 4289 /* Communicator dropped below threshold, resume all queues */
4275 GNUNET_STATISTICS_update (GST_stats, 4290 GNUNET_STATISTICS_update (GST_stats,
4276 "# Transmission throttled due to communicator queue limit", 4291 "# Transmission throttled due to communicator queue limit",
4277 -1, 4292 -1,
4278 GNUNET_NO); 4293 GNUNET_NO);
4279 for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head; 4294 for (struct GNUNET_ATS_Session *session = tc->details.communicator.session_head;
4280 NULL != session; 4295 NULL != session;
4281 session = session->next_client) 4296 session = session->next_client)
4282 schedule_transmit_on_queue (session); 4297 schedule_transmit_on_queue (session);
4283 } 4298 }
4284 else if (SESSION_QUEUE_LIMIT - 1 == queue->session->queue_length) 4299 else if (SESSION_QUEUE_LIMIT - 1 == queue->session->queue_length)
4285 { 4300 {
4286 /* queue dropped below threshold; only resume this one queue */ 4301 /* queue dropped below threshold; only resume this one queue */
4287 GNUNET_STATISTICS_update (GST_stats, 4302 GNUNET_STATISTICS_update (GST_stats,
4288 "# Transmission throttled due to session queue limit", 4303 "# Transmission throttled due to session queue limit",
4289 -1, 4304 -1,
4290 GNUNET_NO); 4305 GNUNET_NO);
4291 schedule_transmit_on_queue (queue->session); 4306 schedule_transmit_on_queue (queue->session);
4292 } 4307 }
4293 4308
@@ -4361,8 +4376,8 @@ handle_monitor_start (void *cls,
4361 tc->details.monitor.peer = start->peer; 4376 tc->details.monitor.peer = start->peer;
4362 tc->details.monitor.one_shot = ntohl (start->one_shot); 4377 tc->details.monitor.one_shot = ntohl (start->one_shot);
4363 GNUNET_CONTAINER_multipeermap_iterate (neighbours, 4378 GNUNET_CONTAINER_multipeermap_iterate (neighbours,
4364 &notify_client_queues, 4379 &notify_client_queues,
4365 tc); 4380 tc);
4366 GNUNET_SERVICE_client_mark_monitor (tc->client); 4381 GNUNET_SERVICE_client_mark_monitor (tc->client);
4367 GNUNET_SERVICE_client_continue (tc->client); 4382 GNUNET_SERVICE_client_continue (tc->client);
4368} 4383}
@@ -4414,8 +4429,8 @@ lookup_communicator (const char *prefix)
4414 return tc; 4429 return tc;
4415 } 4430 }
4416 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 4431 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
4417 "ATS suggested use of communicator for `%s', but we do not have such a communicator!\n", 4432 "ATS suggested use of communicator for `%s', but we do not have such a communicator!\n",
4418 prefix); 4433 prefix);
4419 return NULL; 4434 return NULL;
4420} 4435}
4421 4436
@@ -4451,21 +4466,21 @@ ats_suggestion_cb (void *cls,
4451 if (NULL == tc) 4466 if (NULL == tc)
4452 { 4467 {
4453 GNUNET_STATISTICS_update (GST_stats, 4468 GNUNET_STATISTICS_update (GST_stats,
4454 "# ATS suggestions ignored due to missing communicator", 4469 "# ATS suggestions ignored due to missing communicator",
4455 1, 4470 1,
4456 GNUNET_NO); 4471 GNUNET_NO);
4457 return; 4472 return;
4458 } 4473 }
4459 /* forward suggestion for queue creation to communicator */ 4474 /* forward suggestion for queue creation to communicator */
4460 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 4475 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
4461 "Request #%u for `%s' communicator to create queue to `%s'\n", 4476 "Request #%u for `%s' communicator to create queue to `%s'\n",
4462 (unsigned int) idgen, 4477 (unsigned int) idgen,
4463 prefix, 4478 prefix,
4464 address); 4479 address);
4465 alen = strlen (address) + 1; 4480 alen = strlen (address) + 1;
4466 env = GNUNET_MQ_msg_extra (cqm, 4481 env = GNUNET_MQ_msg_extra (cqm,
4467 alen, 4482 alen,
4468 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE); 4483 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE);
4469 cqm->request_id = htonl (idgen++); 4484 cqm->request_id = htonl (idgen++);
4470 cqm->receiver = *pid; 4485 cqm->receiver = *pid;
4471 memcpy (&cqm[1], 4486 memcpy (&cqm[1],
@@ -4485,7 +4500,7 @@ ats_suggestion_cb (void *cls,
4485 */ 4500 */
4486static void 4501static void
4487handle_queue_create_ok (void *cls, 4502handle_queue_create_ok (void *cls,
4488 const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr) 4503 const struct GNUNET_TRANSPORT_CreateQueueResponse *cqr)
4489{ 4504{
4490 struct TransportClient *tc = cls; 4505 struct TransportClient *tc = cls;
4491 4506
@@ -4496,12 +4511,12 @@ handle_queue_create_ok (void *cls,
4496 return; 4511 return;
4497 } 4512 }
4498 GNUNET_STATISTICS_update (GST_stats, 4513 GNUNET_STATISTICS_update (GST_stats,
4499 "# ATS suggestions succeeded at communicator", 4514 "# ATS suggestions succeeded at communicator",
4500 1, 4515 1,
4501 GNUNET_NO); 4516 GNUNET_NO);
4502 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 4517 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
4503 "Request #%u for communicator to create queue succeeded\n", 4518 "Request #%u for communicator to create queue succeeded\n",
4504 (unsigned int) ntohs (cqr->request_id)); 4519 (unsigned int) ntohs (cqr->request_id));
4505 GNUNET_SERVICE_client_continue (tc->client); 4520 GNUNET_SERVICE_client_continue (tc->client);
4506} 4521}
4507 4522
@@ -4527,12 +4542,12 @@ handle_queue_create_fail (void *cls,
4527 return; 4542 return;
4528 } 4543 }
4529 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 4544 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
4530 "Request #%u for communicator to create queue failed\n", 4545 "Request #%u for communicator to create queue failed\n",
4531 (unsigned int) ntohs (cqr->request_id)); 4546 (unsigned int) ntohs (cqr->request_id));
4532 GNUNET_STATISTICS_update (GST_stats, 4547 GNUNET_STATISTICS_update (GST_stats,
4533 "# ATS suggestions failed in queue creation at communicator", 4548 "# ATS suggestions failed in queue creation at communicator",
4534 1, 4549 1,
4535 GNUNET_NO); 4550 GNUNET_NO);
4536 GNUNET_SERVICE_client_continue (tc->client); 4551 GNUNET_SERVICE_client_continue (tc->client);
4537} 4552}
4538 4553
@@ -4601,8 +4616,8 @@ handle_address_consider_verify (void *cls,
4601 */ 4616 */
4602static int 4617static int
4603free_neighbour_cb (void *cls, 4618free_neighbour_cb (void *cls,
4604 const struct GNUNET_PeerIdentity *pid, 4619 const struct GNUNET_PeerIdentity *pid,
4605 void *value) 4620 void *value)
4606{ 4621{
4607 struct Neighbour *neighbour = value; 4622 struct Neighbour *neighbour = value;
4608 4623
@@ -4625,8 +4640,8 @@ free_neighbour_cb (void *cls,
4625 */ 4640 */
4626static int 4641static int
4627free_dv_routes_cb (void *cls, 4642free_dv_routes_cb (void *cls,
4628 const struct GNUNET_PeerIdentity *pid, 4643 const struct GNUNET_PeerIdentity *pid,
4629 void *value) 4644 void *value)
4630{ 4645{
4631 struct DistanceVector *dv = value; 4646 struct DistanceVector *dv = value;
4632 4647
@@ -4648,8 +4663,8 @@ free_dv_routes_cb (void *cls,
4648 */ 4663 */
4649static int 4664static int
4650free_ephemeral_cb (void *cls, 4665free_ephemeral_cb (void *cls,
4651 const struct GNUNET_PeerIdentity *pid, 4666 const struct GNUNET_PeerIdentity *pid,
4652 void *value) 4667 void *value)
4653{ 4668{
4654 struct EphemeralCacheEntry *ece = value; 4669 struct EphemeralCacheEntry *ece = value;
4655 4670
@@ -4734,9 +4749,9 @@ run (void *cls,
4734 /* setup globals */ 4749 /* setup globals */
4735 GST_cfg = c; 4750 GST_cfg = c;
4736 neighbours = GNUNET_CONTAINER_multipeermap_create (1024, 4751 neighbours = GNUNET_CONTAINER_multipeermap_create (1024,
4737 GNUNET_YES); 4752 GNUNET_YES);
4738 dv_routes = GNUNET_CONTAINER_multipeermap_create (1024, 4753 dv_routes = GNUNET_CONTAINER_multipeermap_create (1024,
4739 GNUNET_YES); 4754 GNUNET_YES);
4740 ephemeral_map = GNUNET_CONTAINER_multipeermap_create (32, 4755 ephemeral_map = GNUNET_CONTAINER_multipeermap_create (32,
4741 GNUNET_YES); 4756 GNUNET_YES);
4742 ephemeral_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); 4757 ephemeral_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
@@ -4790,50 +4805,50 @@ GNUNET_SERVICE_MAIN
4790 NULL, 4805 NULL,
4791 /* communication with core */ 4806 /* communication with core */
4792 GNUNET_MQ_hd_fixed_size (client_start, 4807 GNUNET_MQ_hd_fixed_size (client_start,
4793 GNUNET_MESSAGE_TYPE_TRANSPORT_START, 4808 GNUNET_MESSAGE_TYPE_TRANSPORT_START,
4794 struct StartMessage, 4809 struct StartMessage,
4795 NULL), 4810 NULL),
4796 GNUNET_MQ_hd_var_size (client_send, 4811 GNUNET_MQ_hd_var_size (client_send,
4797 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, 4812 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND,
4798 struct OutboundMessage, 4813 struct OutboundMessage,
4799 NULL), 4814 NULL),
4800 /* communication with communicators */ 4815 /* communication with communicators */
4801 GNUNET_MQ_hd_var_size (communicator_available, 4816 GNUNET_MQ_hd_var_size (communicator_available,
4802 GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR, 4817 GNUNET_MESSAGE_TYPE_TRANSPORT_NEW_COMMUNICATOR,
4803 struct GNUNET_TRANSPORT_CommunicatorAvailableMessage, 4818 struct GNUNET_TRANSPORT_CommunicatorAvailableMessage,
4804 NULL), 4819 NULL),
4805 GNUNET_MQ_hd_var_size (communicator_backchannel, 4820 GNUNET_MQ_hd_var_size (communicator_backchannel,
4806 GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL, 4821 GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL,
4807 struct GNUNET_TRANSPORT_CommunicatorBackchannel, 4822 struct GNUNET_TRANSPORT_CommunicatorBackchannel,
4808 NULL), 4823 NULL),
4809 GNUNET_MQ_hd_var_size (add_address, 4824 GNUNET_MQ_hd_var_size (add_address,
4810 GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS, 4825 GNUNET_MESSAGE_TYPE_TRANSPORT_ADD_ADDRESS,
4811 struct GNUNET_TRANSPORT_AddAddressMessage, 4826 struct GNUNET_TRANSPORT_AddAddressMessage,
4812 NULL), 4827 NULL),
4813 GNUNET_MQ_hd_fixed_size (del_address, 4828 GNUNET_MQ_hd_fixed_size (del_address,
4814 GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS, 4829 GNUNET_MESSAGE_TYPE_TRANSPORT_DEL_ADDRESS,
4815 struct GNUNET_TRANSPORT_DelAddressMessage, 4830 struct GNUNET_TRANSPORT_DelAddressMessage,
4816 NULL), 4831 NULL),
4817 GNUNET_MQ_hd_var_size (incoming_msg, 4832 GNUNET_MQ_hd_var_size (incoming_msg,
4818 GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG, 4833 GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG,
4819 struct GNUNET_TRANSPORT_IncomingMessage, 4834 struct GNUNET_TRANSPORT_IncomingMessage,
4820 NULL), 4835 NULL),
4821 GNUNET_MQ_hd_fixed_size (queue_create_ok, 4836 GNUNET_MQ_hd_fixed_size (queue_create_ok,
4822 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK, 4837 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_OK,
4823 struct GNUNET_TRANSPORT_CreateQueueResponse, 4838 struct GNUNET_TRANSPORT_CreateQueueResponse,
4824 NULL), 4839 NULL),
4825 GNUNET_MQ_hd_fixed_size (queue_create_fail, 4840 GNUNET_MQ_hd_fixed_size (queue_create_fail,
4826 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL, 4841 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL,
4827 struct GNUNET_TRANSPORT_CreateQueueResponse, 4842 struct GNUNET_TRANSPORT_CreateQueueResponse,
4828 NULL), 4843 NULL),
4829 GNUNET_MQ_hd_var_size (add_queue_message, 4844 GNUNET_MQ_hd_var_size (add_queue_message,
4830 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP, 4845 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_SETUP,
4831 struct GNUNET_TRANSPORT_AddQueueMessage, 4846 struct GNUNET_TRANSPORT_AddQueueMessage,
4832 NULL), 4847 NULL),
4833 GNUNET_MQ_hd_var_size (address_consider_verify, 4848 GNUNET_MQ_hd_var_size (address_consider_verify,
4834 GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY, 4849 GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY,
4835 struct GNUNET_TRANSPORT_AddressToVerify, 4850 struct GNUNET_TRANSPORT_AddressToVerify,
4836 NULL), 4851 NULL),
4837 GNUNET_MQ_hd_fixed_size (del_queue_message, 4852 GNUNET_MQ_hd_fixed_size (del_queue_message,
4838 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN, 4853 GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_TEARDOWN,
4839 struct GNUNET_TRANSPORT_DelQueueMessage, 4854 struct GNUNET_TRANSPORT_DelQueueMessage,