summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/POTFILES.in14
-rw-r--r--po/de.po303
-rw-r--r--po/es.po324
-rw-r--r--po/fr.po265
-rw-r--r--po/it.po266
-rw-r--r--po/sr.po462
-rw-r--r--po/sv.po306
-rw-r--r--po/vi.po301
-rw-r--r--po/zh_CN.po291
-rw-r--r--src/include/gnunet_testing_ng_lib.h9
-rw-r--r--src/testing/testing.c140
-rw-r--r--src/testing/testing_api_cmd_netjail_start_testsystem.c109
-rw-r--r--src/testing/testing_api_cmd_netjail_stop_testsystem.c24
-rw-r--r--src/transport/gnunet-communicator-tcp.c29
-rw-r--r--src/transport/test_transport_plugin_cmd_simple_send.c62
-rw-r--r--src/transport/test_transport_plugin_cmd_udp_backchannel.c17
-rwxr-xr-xsrc/transport/test_transport_simple_send.sh7
-rw-r--r--src/transport/test_transport_simple_send_topo.conf4
-rwxr-xr-xsrc/transport/test_transport_udp_backchannel.sh5
-rw-r--r--src/transport/transport-testing-cmds.h17
-rw-r--r--src/transport/transport_api_cmd_connecting_peers.c23
-rw-r--r--src/transport/transport_api_cmd_send_simple.c119
-rw-r--r--src/transport/transport_api_cmd_start_peer.c14
23 files changed, 1554 insertions, 1557 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e34cb25f4..b0035e712 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -430,14 +430,12 @@ src/testing/testing_api_cmd_finish.c
src/testing/testing_api_cmd_hello_world.c
src/testing/testing_api_cmd_hello_world_birth.c
src/testing/testing_api_cmd_local_test_finished.c
+src/testing/testing_api_cmd_local_test_prepared.c
src/testing/testing_api_cmd_netjail_start.c
src/testing/testing_api_cmd_netjail_start_testsystem.c
-src/testing/testing_api_cmd_netjail_start_testsystem_v2.c
-src/testing/testing_api_cmd_netjail_start_v2.c
+src/testing/testing_api_cmd_netjail_start_testsystem_new.c
src/testing/testing_api_cmd_netjail_stop.c
src/testing/testing_api_cmd_netjail_stop_testsystem.c
-src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c
-src/testing/testing_api_cmd_netjail_stop_v2.c
src/testing/testing_api_cmd_send_peer_ready.c
src/testing/testing_api_cmd_system_create.c
src/testing/testing_api_cmd_system_destroy.c
@@ -445,6 +443,7 @@ src/testing/testing_api_loop.c
src/testing/testing_api_trait_cmd.c
src/testing/testing_api_trait_process.c
src/testing/testing_api_traits.c
+src/testing/testing_json_vnet.c
src/topology/friends.c
src/topology/gnunet-daemon-topology.c
src/transport/gnunet-communicator-tcp.c
@@ -496,14 +495,11 @@ src/transport/transport_api2_core.c
src/transport/transport_api2_monitor.c
src/transport/transport_api_address_to_string.c
src/transport/transport_api_blacklist.c
+src/transport/transport_api_cmd_backchannel_check.c
src/transport/transport_api_cmd_connecting_peers.c
-src/transport/transport_api_cmd_connecting_peers_v2.c
-src/transport/transport_api_cmd_connecting_peers_v3.c
src/transport/transport_api_cmd_send_simple.c
-src/transport/transport_api_cmd_send_simple_v2.c
+src/transport/transport_api_cmd_send_simple_v3.c
src/transport/transport_api_cmd_start_peer.c
-src/transport/transport_api_cmd_start_peer_v2.c
-src/transport/transport_api_cmd_start_peer_v3.c
src/transport/transport_api_cmd_stop_peer.c
src/transport/transport_api_core.c
src/transport/transport_api_hello_get.c
diff --git a/po/de.po b/po/de.po
index 07d38fcad..dc8abce9b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2015-03-08 16:16+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -2168,102 +2168,102 @@ msgstr ""
msgid "# FIND PEER messages initiated"
msgstr "# PING Nachrichten erstellt"
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
#, fuzzy
msgid "# requests TTL-dropped"
msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
#, fuzzy
msgid "# Peer selection failed"
msgstr " Verbindung fehlgeschlagen\n"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
#, fuzzy
msgid "# PUT requests routed"
msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
#, fuzzy
msgid "# GET requests routed"
msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
#, fuzzy
msgid "# Expired PUTs discarded"
msgstr "# verworfener Nachrichten"
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
#, fuzzy
msgid "# P2P PUT requests received"
msgstr "# Client Trace-Anfragen empfangen"
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
#, fuzzy
msgid "# P2P PUT bytes received"
msgstr "# Bytes empfangen über TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
#, fuzzy
msgid "# P2P GET requests received"
msgstr "# Client Trace-Anfragen empfangen"
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
#, fuzzy
msgid "# P2P GET bytes received"
msgstr "# Bytes empfangen über TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
#, fuzzy
msgid "# P2P GET requests ONLY routed"
msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
#, fuzzy
msgid "# Expired results discarded"
msgstr "# verworfener Nachrichten"
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
#, fuzzy
msgid "# P2P RESULT bytes received"
msgstr "# Bytes empfangen über TCP"
@@ -2306,7 +2306,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr ""
@@ -2321,7 +2321,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6626,7 +6626,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6665,7 +6665,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6735,29 +6735,17 @@ msgstr ""
msgid "%.s Unknown result code."
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr ""
-"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
-"verbleiben)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
-
#: src/testbed/testbed_api.c:399
#, fuzzy, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6778,11 +6766,6 @@ msgstr ""
msgid "Hosts file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6814,43 +6797,39 @@ msgstr "GNUnet testbed Controller starten."
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
@@ -6924,57 +6903,57 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr ""
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, c-format
msgid "Failed to start `%s': %s\n"
msgstr "»%s« konnte nicht gestartet werden: %s\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, c-format
msgid "Failed to load configuration from %s\n"
msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -7050,18 +7029,18 @@ msgstr "# HELLO-Meldungen empfangen"
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8265,50 +8244,50 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr ""
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "FEHLER"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "WARNUNG"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "INFO"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "DEBUG"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr "Unbekannte Adresse"
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr "Ungültige Adresse"
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, fuzzy, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr ""
"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
"angeben, in dem FS Daten gespeichert werden.\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, fuzzy, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8384,6 +8363,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8610,66 +8609,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr ""
-
-#: src/util/gnunet-config.c:376
-#, fuzzy
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "GNUnet Konfiguration"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
msgid "Manipulate GNUnet configuration files"
msgstr "GNUnet-Konfigurationsdateien bearbeiten"
@@ -8851,7 +8811,7 @@ msgstr "Fehler beim Lesen von »%s«: %s\n"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8889,35 +8849,40 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, fuzzy, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr ""
"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, fuzzy, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
#, fuzzy
msgid "Could not determine plugin installation path.\n"
msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/util/program.c:252
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-#: src/util/program.c:272
+#: src/util/program.c:278
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-#: src/util/program.c:288
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "GNUnet Konfiguration"
#: src/util/regex.c:139
@@ -9244,26 +9209,56 @@ msgstr "Tunnel über VPN einrichten."
msgid "Failed to connect to the namestore!\n"
msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#, fuzzy
+#~ msgid "Waiting for child to exit.\n"
+#~ msgstr ""
+#~ "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+#~ "verbleiben)...\n"
+
+#, fuzzy
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "Ungültige Antwort auf `%s'.\n"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#, fuzzy
+#~ msgid "rewrite the configuration file, even if nothing changed"
+#~ msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "GNUnet Konfiguration"
+
#~ msgid "Stop logging\n"
#~ msgstr "Protokollierung stoppen\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Start logging `%s'\n"
#~ msgstr "Collection `%s' begonnen.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
@@ -9294,7 +9289,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
#~ msgid "days"
#~ msgstr "Tage"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
diff --git a/po/es.po b/po/es.po
index b23f36ed6..981034502 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.9.5a\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2013-02-23 17:50+0100\n"
"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -2257,96 +2257,96 @@ msgstr "# «HELLO» obtenidos de «peerinfo»"
msgid "# FIND PEER messages initiated"
msgstr "# mensajes «FIND PEER» iniciados"
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
#, fuzzy
msgid "# requests TTL-dropped"
msgstr "# peticiones unidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr "# Selecciones de pares fallidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
msgid "# PUT requests routed"
msgstr "# Peticiones «PUT» encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr "# mensajes «PUT» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
msgid "# GET requests routed"
msgstr "# Peticiones «GET» encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr "# Mensajes «GET» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr "# Mensajes «RESULT» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
#, fuzzy
msgid "# Expired PUTs discarded"
msgstr "# respuestas irrelevantes descartadas"
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
msgid "# P2P PUT requests received"
msgstr "# Peticiones «PUT» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
#, fuzzy
msgid "# P2P PUT bytes received"
msgstr "# Peticiones «PUT» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
msgid "# P2P GET requests received"
msgstr "# Peticiones «GET» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
#, fuzzy
msgid "# P2P GET bytes received"
msgstr "# Peticiones «GET» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr "# Peticiones «FIND PEER» P2P procesadas"
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
msgid "# P2P GET requests ONLY routed"
msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
#, fuzzy
msgid "# Expired results discarded"
msgstr "# respuestas irrelevantes descartadas"
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr "# Resultados (RESULTS) P2P recibidos"
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
#, fuzzy
msgid "# P2P RESULT bytes received"
msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2393,7 +2393,7 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento"
msgid "# DHT requests combined"
msgstr "# Peticiones a la DHT combinadas"
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, fuzzy, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "El número máximo de conexiones es %u\n"
@@ -2407,7 +2407,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
"nombre del fichero con la información de acceso usada para la batería de "
@@ -6834,7 +6834,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "Argumento no válido para '%s' en %s:%d.\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr "crea «COUNT» número de pares"
@@ -6873,7 +6873,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6947,28 +6947,18 @@ msgstr "Petición ignorada porque el ARM se está apagando.\n"
msgid "%.s Unknown result code."
msgstr "Código de respuesta del ARM desconocido.\n"
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
#, fuzzy
msgid "tolerate COUNT number of continuous timeout failures"
msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-
#: src/testbed/testbed_api.c:399
#, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6989,11 +6979,6 @@ msgstr "El archivo de máquinas %s no tiene datos\n"
msgid "Hosts file %s cannot be read\n"
msgstr "El archivo de máquinas %s no puede leerse\n"
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr "Los controladores de enlazado fallaron. Saliendo"
@@ -7024,45 +7009,40 @@ msgstr "No se puede iniciar el controlador maestro"
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-#, fuzzy
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
"La topología especificada debe estar soportada por la batería de pruebas"
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr "El fichero de topología %s no fue encontrado\n"
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr "El fichero de topología %s no tiene datos\n"
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr "El fichero de topología %s no puede ser leido\n"
@@ -7144,19 +7124,19 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr "crea «COUNT» número de pares"
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr "El fichero de máquinas no fue encontrado: %s\n"
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr "El número de clave %u no existe\n"
# Miguel: "testbed" lo he traducido como batería de pruebas, pero
# no es una traducción muy literal.
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
@@ -7165,47 +7145,47 @@ msgstr ""
"Se ha intentado crear una batería de pruebas con más de %u máquinas. Por "
"favor, pre-compute más claves de máquinas primero.\n"
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr ""
"Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
#, fuzzy
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr ""
"Se produjo un fallo al crear la configuración para el par (¿no hay "
"suficientes puertos libres?)\n"
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr ""
"Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr ""
"Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
"%u: %s\n"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, c-format
msgid "Failed to start `%s': %s\n"
msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, c-format
msgid "Failed to load configuration from %s\n"
msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -7289,9 +7269,9 @@ msgstr "# mensajes «HELLO» recibidos"
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
#, fuzzy
msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7299,12 +7279,12 @@ msgstr ""
"El servicio de transporte carece de opciones de configuración de clave. "
"Saliendo.\n"
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
#, fuzzy
msgid "GNUnet TCP communicator"
msgstr "Configurador Gtk de GNUnet"
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
#, fuzzy
msgid "GNUnet UDP communicator"
msgstr "Configurador Gtk de GNUnet"
@@ -8572,48 +8552,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "ERROR"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "PELIGRO"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr "MENSAJE"
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "INFORMACIÓN"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "DEPURACIÓN"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr "NINGUNO"
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr "NO VÁLIDO"
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr "dirección desconocida"
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr "dirección no válida"
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8692,6 +8672,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr "el parámetro --option es necesario para establecer un valor\n"
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8920,69 +8920,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "el parámetro --section es necesario\n"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr "el parámetro --option es necesario para establecer un valor\n"
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-"La configuración no especifica «%s», asumiendo el valor predeterminado."
-#: src/util/gnunet-config.c:365
-#, fuzzy
-msgid "interpret option value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-"obtener la opción del valor como un nombre de fichero (con expansión del $)"
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr "nombre de la opción a la que acceder"
-
-#: src/util/gnunet-config.c:376
-#, fuzzy
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "Falta configuración sobre las opciones de claves.\n"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
-msgstr "nombre de la sección a la que acceder"
-
-#: src/util/gnunet-config.c:398
-msgid "value to set"
-msgstr "valor a establecer"
-
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
msgid "Manipulate GNUnet configuration files"
msgstr "Manipular ficheros de configuración de GNUnet"
@@ -9168,7 +9126,7 @@ msgstr ""
"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
"«%s»\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Error escribiendo a «%s»: %s\n"
@@ -9210,33 +9168,38 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
msgid "Could not determine plugin installation path.\n"
msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
-#: src/util/program.c:252
+#: src/util/program.c:251
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s', exiting ...\n"
msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-#: src/util/program.c:272
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-#: src/util/program.c:288
+#: src/util/program.c:278
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
#: src/util/regex.c:139
@@ -9578,32 +9541,75 @@ msgstr "Configurar túneles vía VPN."
msgid "Failed to connect to the namestore!\n"
msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
-#, fuzzy, c-format
+#, fuzzy
+#~ msgid "Waiting for child to exit.\n"
+#~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
+#, fuzzy
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
+
+#, fuzzy
+#~ msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+#~ msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr ""
+#~ "La configuración no especifica «%s», asumiendo el valor predeterminado."
+
+#, fuzzy
+#~ msgid "interpret option value as a filename (with $-expansion)"
+#~ msgstr ""
+#~ "obtener la opción del valor como un nombre de fichero (con expansión del "
+#~ "$)"
+
+#~ msgid "name of the option to access"
+#~ msgstr "nombre de la opción a la que acceder"
+
+#, fuzzy
+#~ msgid "rewrite the configuration file, even if nothing changed"
+#~ msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "Falta configuración sobre las opciones de claves.\n"
+
+#~ msgid "name of the section to access"
+#~ msgstr "nombre de la sección a la que acceder"
+
+#~ msgid "value to set"
+#~ msgstr "valor a establecer"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#, fuzzy
#~ msgid "Start logging `%s'\n"
#~ msgstr "Iniciando descarga «%s».\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "Fallo al conectar a gnunetd.\n"
# form??
-#, c-format
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "Forma de valor no soportada «%s»\n"
-#, c-format
#~ msgid "Found existing name `%s' for the given key\n"
#~ msgstr "Encontrado nombre «%s» para la clave dada\n"
-#, c-format
#~ msgid "Found %u existing records for domain `%s'\n"
#~ msgstr "Encontrados %u registros para el dominio «%s»\n"
-#, c-format
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "Se produjo un fallo al crear la página para «%s»\n"
-#, c-format
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
@@ -9613,7 +9619,6 @@ msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
#~ msgid "Domain name must not contain `+'\n"
#~ msgstr "El nombre de dominio no puede contener «+»\n"
-#, c-format
#~ msgid "Unable to parse PKEY record `%s'\n"
#~ msgstr "No se pudo procesar el registro PKEY «%s»\n"
@@ -9647,11 +9652,9 @@ msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
#~ msgid "end of time"
#~ msgstr "fin del plazo"
-#, c-format
#~ msgid "Metadata `%s' failed to deserialize"
#~ msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
-#, c-format
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
@@ -9663,7 +9666,6 @@ msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
#~ "Esto puede estar bien si alguien está actualmente generando una clave "
#~ "privada.\n"
-#, c-format
#~ msgid ""
#~ "When trying to read key file `%s' I found %u bytes but I need at least "
#~ "%u.\n"
diff --git a/po/fr.po b/po/fr.po
index 34f88c302..8415cfe37 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2015-12-24 01:20+0100\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -2104,91 +2104,91 @@ msgstr ""
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
msgid "# requests TTL-dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
msgid "# PUT requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
msgid "# GET requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
msgid "# Expired PUTs discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
msgid "# P2P PUT requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
msgid "# P2P PUT bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
msgid "# P2P GET requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
msgid "# P2P GET bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
msgid "# P2P GET requests ONLY routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
msgid "# Expired results discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
msgid "# P2P RESULT bytes received"
msgstr ""
@@ -2228,7 +2228,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr ""
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr ""
@@ -2243,7 +2243,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6366,7 +6366,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr ""
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6405,7 +6405,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6475,26 +6475,17 @@ msgstr ""
msgid "%.s Unknown result code."
msgstr "%.s Code d'erreur inconnu"
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
-
#: src/testbed/testbed_api.c:399
#, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6515,11 +6506,6 @@ msgstr ""
msgid "Hosts file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6550,43 +6536,39 @@ msgstr ""
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
@@ -6658,57 +6640,57 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr ""
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr ""
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr ""
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr ""
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr ""
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, c-format
msgid "Failed to start `%s': %s\n"
msgstr ""
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, c-format
msgid "Failed to load configuration from %s\n"
msgstr ""
@@ -6782,18 +6764,18 @@ msgstr ""
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -7952,48 +7934,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr ""
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "ERREUR"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "AVERTISSEMENT"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "INFO"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "DEBUG"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr "AUCUN"
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr "INVALIDE"
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr "adresse inconnue"
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr "adresse invalide"
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr ""
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8067,6 +8049,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "fornat invalide : « %s »\n"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8288,64 +8290,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr ""
-
-#: src/util/gnunet-config.c:376
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr ""
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
-msgstr ""
-
-#: src/util/gnunet-config.c:387
-msgid "print available configuration sections"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
msgid "Manipulate GNUnet configuration files"
msgstr ""
@@ -8525,7 +8490,7 @@ msgstr ""
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr ""
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, c-format
msgid "Error writing to `%s': %s\n"
msgstr ""
@@ -8563,33 +8528,38 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
msgid "Could not determine plugin installation path.\n"
msgstr ""
-#: src/util/program.c:252
+#: src/util/program.c:251
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s', exiting ...\n"
msgstr "fornat invalide : « %s »\n"
-#: src/util/program.c:272
-#, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-msgstr ""
+#: src/util/program.c:263
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "fornat invalide : « %s »\n"
-#: src/util/program.c:288
+#: src/util/program.c:278
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "fornat invalide : « %s »\n"
#: src/util/regex.c:139
@@ -8902,10 +8872,13 @@ msgstr "Configurer des tunnels via VPN."
msgid "Failed to connect to the namestore!\n"
msgstr ""
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "fornat invalide : « %s »\n"
+
#~ msgid "Stop logging\n"
#~ msgstr "Arrêter la journalisation\n"
-#, c-format
#~ msgid "Start logging `%s'\n"
#~ msgstr "Démarrer la journalisation « %s »\n"
diff --git a/po/it.po b/po/it.po
index f82aaa49b..3aea1cf32 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2019-10-16 11:00+0200\n"
"Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -2110,91 +2110,91 @@ msgstr ""
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
msgid "# requests TTL-dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
msgid "# PUT requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
msgid "# GET requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
msgid "# Expired PUTs discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
msgid "# P2P PUT requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
msgid "# P2P PUT bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
msgid "# P2P GET requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
msgid "# P2P GET bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
msgid "# P2P GET requests ONLY routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
msgid "# Expired results discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
msgid "# P2P RESULT bytes received"
msgstr ""
@@ -2234,7 +2234,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr ""
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr ""
@@ -2248,7 +2248,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6392,7 +6392,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr ""
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6431,7 +6431,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6501,26 +6501,17 @@ msgstr ""
msgid "%.s Unknown result code."
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
-
#: src/testbed/testbed_api.c:399
#, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6541,11 +6532,6 @@ msgstr ""
msgid "Hosts file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6576,43 +6562,39 @@ msgstr ""
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
@@ -6684,57 +6666,57 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr ""
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr ""
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr ""
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr ""
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr ""
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, c-format
msgid "Failed to start `%s': %s\n"
msgstr ""
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, c-format
msgid "Failed to load configuration from %s\n"
msgstr ""
@@ -6808,18 +6790,18 @@ msgstr ""
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8000,48 +7982,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr ""
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "ERRORE"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "ATTENZIONE"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "INFO"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "DEBUG"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr "NESSUNA"
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr "NON VALIDO"
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr "indirizzo sconosciuto"
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr "indirizzo non valido"
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr ""
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8115,6 +8097,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, c-format
+msgid "failed to load configuration defaults"
+msgstr ""
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8335,63 +8337,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, c-format
-msgid "failed to load configuration defaults"
-msgstr ""
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-msgid "write the full configuration file, including default values"
-msgstr ""
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr ""
-
-#: src/util/gnunet-config.c:376
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr ""
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
-msgstr ""
-
-#: src/util/gnunet-config.c:387
-msgid "print available configuration sections"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
msgid "Manipulate GNUnet configuration files"
msgstr ""
@@ -8571,7 +8537,7 @@ msgstr "Errore di lettura da '%s': %s\n"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr ""
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, c-format
msgid "Error writing to `%s': %s\n"
msgstr ""
@@ -8609,33 +8575,39 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
msgid "Could not determine plugin installation path.\n"
msgstr ""
-#: src/util/program.c:252
-#, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
-msgstr ""
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
-#: src/util/program.c:272
-#, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-msgstr ""
+#: src/util/program.c:263
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
-#: src/util/program.c:288
-msgid "Unreadable or malformed configuration, exit ...\n"
-msgstr ""
+#: src/util/program.c:278
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/util/program.c:293
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
#: src/util/regex.c:139
#, c-format
diff --git a/po/sr.po b/po/sr.po
index 0306e08de..2599a0289 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.10.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2020-10-23 18:39+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -2189,93 +2189,93 @@ msgstr "# „HELLO“-и су добијени из података парња
msgid "# FIND PEER messages initiated"
msgstr "# НАЂИ ПАРЊАКА поруке су покренуте"
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
msgid "# requests TTL-dropped"
msgstr "# захтеви ТТЛ су одбачени"
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr "# Парњаци су изузети из рутирања због Блумфилтера"
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr "# Бирање парњака није успело"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
msgid "# PUT requests routed"
msgstr "# захтеви СТАВИ су рутирани"
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr "# СТАВИ поруке су у реду за пренос"
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr "# П2П поруке су одбачене због пуног реда"
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
msgid "# GET requests routed"
msgstr "# захтеви ДОБАВИ су рутирани"
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr "# ДОБАВИ поруке су у реду за пренос"
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr "# РЕЗУЛТАТ поруке су у реду за пренос"
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
#, fuzzy
msgid "# Expired PUTs discarded"
msgstr "# небитни одговори су одбачени"
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
msgid "# P2P PUT requests received"
msgstr "# захтеви П2П СТАВИ су примљени"
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
msgid "# P2P PUT bytes received"
msgstr "# бајтови П2П СТАВИ су примљени"
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због Блумфилтера"
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr "# захтеви НАЂИ ПАРЊАКА су занемарени због недостатка „HELLO“-а"
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
msgid "# P2P GET requests received"
msgstr "# захтеви П2П ДОБАВИ су примљени"
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
msgid "# P2P GET bytes received"
msgstr "# бајтови П2П ДОБАВИ су примљени"
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr "# захтеви П2П НАЂИ ПАРЊАКА су обрађени"
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
msgid "# P2P GET requests ONLY routed"
msgstr "# захтеви П2П ДОБАВИ су САМО рутирани"
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
#, fuzzy
msgid "# Expired results discarded"
msgstr "# небитни одговори су одбачени"
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr "# П2П РЕЗУЛТАТИ су примљени"
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
msgid "# P2P RESULT bytes received"
msgstr "# бајтови П2П РЕЗУЛТАТ су примљени"
@@ -2315,7 +2315,7 @@ msgstr "# Уноси су додати у табелу рутирања"
msgid "# DHT requests combined"
msgstr "# ДХТ захтеви су комбиновани"
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "Излазим јер је број парњака %u\n"
@@ -2331,7 +2331,7 @@ msgid "number of PUTs to perform per peer"
msgstr "број битова за тражење доказивања о раду"
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr "назив датотеке са подацима пријављивања за пробно место"
@@ -6633,7 +6633,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "Неисправан аргумент „%s“; очекујем цео број без знака\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr "ствара УКУПНОСТ број парњака"
@@ -6695,7 +6695,7 @@ msgstr ""
"места"
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr "Нетачан формат датотеке кључа домаћина: %s\n"
@@ -6767,12 +6767,12 @@ msgstr "„%s“ услуга се не може покренути јер се
msgid "%.s Unknown result code."
msgstr "%.s Непознат код резултата."
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
#, fuzzy
msgid "tolerate COUNT number of continuous timeout failures"
msgstr "толерише УКУПНО број непрекидних неуспеха истека времена"
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
@@ -6782,15 +6782,6 @@ msgstr ""
"профајлер не чека на притисак тастера већ наставља да ради све док се не "
"прими сигнал окончања"
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-msgid "Waiting for child to exit.\n"
-msgstr "Чекам на пород да изађе.\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Умножавам процес „%s“\n"
-
#: src/testbed/testbed_api.c:399
#, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6811,11 +6802,6 @@ msgstr "Датотека домаћина „%s“ нема података\n"
msgid "Hosts file %s cannot be read\n"
msgstr "Не могу да прочитам датотеку домаћина „%s“\n"
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr "Функција „%s“ је доступна само када је преведена са (--with-ll)\n"
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr "Повезивање контролера није успело. Излазим"
@@ -6846,21 +6832,15 @@ msgstr "Не могу да покренем главног контролора"
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr "Гасим пробно место због истека времена приликом подешавања.\n"
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-"Ниједан домаћин није учитан из „LoadLeveler“-а. Потребан је барем један "
-"домаћин\n"
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr "Ниједан домаћин није учитан. Потребан је барем један домаћин\n"
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr "Наведени размештај мора бити подржан пробним местом"
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
@@ -6869,7 +6849,7 @@ msgstr ""
"Највећи број ивица које парњак може имати у слободном размештају лествице не "
"може бити већи од %u. Дато је „%s = %llu“"
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
@@ -6878,17 +6858,17 @@ msgstr ""
"Број ивица које се могу успоставити приликом додавања новог чвора у "
"слободном размештају лествице не може бити већи од %u. Дато је „%s = %llu“"
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr "Нисам нашао датотеку размештаја „%s“\n"
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr "Датотека размештаја „%s“ нема података\n"
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr "Не могу да прочитам датотеку размештаја „%s“\n"
@@ -6967,17 +6947,17 @@ msgstr "Алат линије наредби за приезуп библиот
msgid "list COUNT number of keys"
msgstr "исписује УКУПНОСТ број парњака"
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr "Нисам нашао датотеку кључева домаћина: %s\n"
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr "Број кључа %u не постоји\n"
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
@@ -6986,42 +6966,42 @@ msgstr ""
"Покушали сте да направите пробно место са више од %u домаћина. Прво пре "
"свега израчунајте више кључева домаћина.\n"
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "Нисам успео да покренем кључ домаћина за парњака %u\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr "опција „PRIVATE_KEY“ у одељку „PEER“ недостаје у подешавањима\n"
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr ""
"Нисам успео да направим подешавање за парњака (нема довољно слободних "
"прикључника?)\n"
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "Не могу да отворим датотеку кључа домаћина „%s“: %s\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "Нисам успео да запишем датотеку кључа домаћина за парњака %u: %s\n"
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "Нисам успео да запишем датотеку подешавања „%s“ за парњака %u: %s\n"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, c-format
msgid "Failed to start `%s': %s\n"
msgstr "Нисам успео да покренем „%s“: %s\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, c-format
msgid "Failed to load configuration from %s\n"
msgstr "Нисам успео да учитам подешавање за „%s“\n"
@@ -7101,18 +7081,18 @@ msgstr "# „HELLO“ поруке су примљене"
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr "Услузи преноса недостају поставке подешавања кључа. Излазим.\n"
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8351,48 +8331,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "Порука „%.*s“ је поновљена %u пута у прошлости %s\n"
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "ГРЕШКА"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "УПОЗОРЕЊЕ"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "ПОДАЦИ"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "ПРОЧИШЋАВАЊЕ"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr "НИШТА"
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr "НЕИСПРАВНО"
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr "непозната адреса"
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr "неисправна адреса"
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8471,6 +8451,26 @@ msgstr ""
"Нисам успео да раширим „%s“ у „%s“ јер нисам нашао у [ПУТАЊАМА] нити је "
"дефинисано као променљива окружења\n"
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "аргумент „--section“ је потребан\n"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr "аргумент „--option“ је потребан за постављање вредности\n"
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Нисам успео да учитам подешавање за „%s“\n"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8695,67 +8695,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "аргумент „--section“ је потребан\n"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr "аргумент „--option“ је потребан за постављање вредности\n"
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Нисам успео да учитам подешавање за „%s“\n"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "Нисам успео да учитам подешавање за „%s“\n"
-
-#: src/util/gnunet-config.c:365
-#, fuzzy
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr "добија опцију вредности као назив датотеке (са $-ширењем)"
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr "назив опције за приступање"
-
-#: src/util/gnunet-config.c:376
-#, fuzzy
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr "Није дата датотека подешавања. Излазим\n"
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "Недостају поставке подешавања кључа.\n"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
-msgstr "назив одељка за приступање"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
-msgstr "вредност за постављање"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
msgid "Manipulate GNUnet configuration files"
msgstr "Управља ГНУнет датотекама подешавања"
@@ -8942,7 +8902,7 @@ msgstr "Грешка читања из „%s“: %s\n"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Грешка писања у „%s“: %s\n"
@@ -8985,33 +8945,38 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Покретање механизма прикључка није успело: %s!\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
msgid "Could not determine plugin installation path.\n"
msgstr "Не могу да одредим путању инсталирања прикључка.\n"
-#: src/util/program.c:252
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-#: src/util/program.c:272
+#: src/util/program.c:278
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-#: src/util/program.c:288
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "Лоше подешавање, излазим ...\n"
#: src/util/regex.c:139
@@ -9335,22 +9300,65 @@ msgstr "Поставља тунеле путем ВПН-а."
msgid "Failed to connect to the namestore!\n"
msgstr "Нисам успео да се повежем са смештајем назива!\n"
+#~ msgid "Waiting for child to exit.\n"
+#~ msgstr "Чекам на пород да изађе.\n"
+
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "Умножавам процес „%s“\n"
+
+#~ msgid "The function %s is only available when compiled with (--with-ll)\n"
+#~ msgstr "Функција „%s“ је доступна само када је преведена са (--with-ll)\n"
+
+#~ msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+#~ msgstr ""
+#~ "Ниједан домаћин није учитан из „LoadLeveler“-а. Потребан је барем један "
+#~ "домаћин\n"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "Нисам успео да учитам подешавање за „%s“\n"
+
+#, fuzzy
+#~ msgid "interpret option value as a filename (with $-expansion)"
+#~ msgstr "добија опцију вредности као назив датотеке (са $-ширењем)"
+
+#~ msgid "name of the option to access"
+#~ msgstr "назив опције за приступање"
+
+#, fuzzy
+#~ msgid "rewrite the configuration file, even if nothing changed"
+#~ msgstr "Није дата датотека подешавања. Излазим\n"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "Недостају поставке подешавања кључа.\n"
+
+#~ msgid "name of the section to access"
+#~ msgstr "назив одељка за приступање"
+
+#~ msgid "value to set"
+#~ msgstr "вредност за постављање"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "Лоше подешавање, излазим ...\n"
+
#~ msgid "Stop logging\n"
#~ msgstr "Заустављам дневничење\n"
-#, c-format
#~ msgid "Start logging `%s'\n"
#~ msgstr "Започињем дневничење „%s“\n"
-#, c-format
#~ msgid "Connected master [%u] with slave [%u]\n"
#~ msgstr "Повезан је надређени [%u] са потчињеним [%u]\n"
-#, c-format
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "Нисам успео да повежем надређеног парњака [%u] са потчињеним [%u]\n"
-#, c-format
#~ msgid ""
#~ "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u "
#~ "sec. = %u KiB/s\n"
@@ -9358,26 +9366,21 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Надређени [%u]: послао: %u KiB за %u сек. = %u KiB/s, примио: %u KiB за "
#~ "%u сек. = %u KiB/s\n"
-#, c-format
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "Неподржана вредност облика „%s“\n"
#~ msgid "Error when mapping zone to name\n"
#~ msgstr "Грешка приликом мапирања зоне у назив\n"
-#, c-format
#~ msgid "Found existing name `%s' for the given key\n"
#~ msgstr "Нађох постојећи назив „%s“ за дати кључ\n"
-#, c-format
#~ msgid "Found %u existing records for domain `%s'\n"
#~ msgstr "Нађох %u постојећа записа за домен „%s“\n"
-#, c-format
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "Нисам успео да направим страницу за „%s“\n"
-#, c-format
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "Нисам успео да поставим постпроцесор за „%s“\n"
@@ -9412,7 +9415,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Could not send list result to client\n"
#~ msgstr "Не могу да пошаљем резултат списка клијенту\n"
-#, c-format
#~ msgid "Starting default services `%s'\n"
#~ msgstr "Покрећем основне услуге „%s“\n"
@@ -9420,19 +9422,15 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "No default services configured, GNUnet will not really start right now.\n"
#~ msgstr "Основне услуге нису подешене, ГНУнет се неће баш сада покренути.\n"
-#, c-format
#~ msgid "Received %s message\n"
#~ msgstr "Примих %s поруку\n"
-#, c-format
#~ msgid "Received last message for %s \n"
#~ msgstr "Примих последњу поруку за %s \n"
-#, c-format
#~ msgid "Outbound quota configure for network `%s' is %llu\n"
#~ msgstr "Квота одлазности подешена за мрежу „%s“ је %llu\n"
-#, c-format
#~ msgid "Initializing solver `%s '`%s'\n"
#~ msgstr "Покрећем решавача „%s “„%s“\n"
@@ -9442,16 +9440,13 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Problem size too large, cannot allocate memory!\n"
#~ msgstr "Величина проблема је превелика, не могу да доделим меморију!\n"
-#, c-format
#~ msgid "Adding address for peer `%s' multiple times\n"
#~ msgstr "Додајем адресу за парњака „%s“ више пута\n"
-#, c-format
#~ msgid "Updating address property `%s' for peer `%s' %p not added before\n"
#~ msgstr ""
#~ "Освежавам својство адресе „%s“ за парњака „%s“ %p који није додат раније\n"
-#, c-format
#~ msgid ""
#~ "Adjusting inconsistent outbound quota configuration for network `%s', is "
#~ "%llu must be at least %llu\n"
@@ -9459,7 +9454,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Поправљам недоследно подешавање одлазне квоте за мрежу „%s“, која је %llu "
#~ "а мора бити најмање %llu\n"
-#, c-format
#~ msgid ""
#~ "Adjusting inconsistent inbound quota configuration for network `%s', is "
#~ "%llu must be at least %llu\n"
@@ -9467,52 +9461,44 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Поправљам недоследно подешавање долазне квоте за мрежу „%s“, која је %llu "
#~ "а мора бити најмање %llu\n"
-#, c-format
#~ msgid ""
#~ "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
#~ msgstr ""
#~ "Поправљам недоследно подешавање одлазне квоте за мрежу „%s“ са %llu на "
#~ "%.0f\n"
-#, c-format
#~ msgid ""
#~ "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
#~ msgstr ""
#~ "Поправљам недоследно подешавање долазне квоте за мрежу „%s“ са %llu на "
#~ "%.0f\n"
-#, c-format
#~ msgid ""
#~ "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
#~ msgstr ""
#~ "Користим основно подешавање квоте за мрежу „%s“ (улаз/излаз) %llu/%llu\n"
-#, c-format
#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
#~ msgstr "Неисправна врста мреже „%u“ „%s“: Прекидам везу!\n"
#~ msgid "Benchmarking done\n"
#~ msgstr "Оцењивање је готово\n"
-#, c-format
#~ msgid "Failed to connect peer 0 and %u\n"
#~ msgstr "Нисам успео да повежем парњака 0 и %u\n"
#~ msgid "Connecting peers on CORE level\n"
#~ msgstr "Повезујем парњаке на „CORE“ нивоу\n"
-#, c-format
#~ msgid "Connecting master [%u] with slave [%u]\n"
#~ msgstr "Повезујем надређеног [%u] са потчињеним [%u]\n"
-#, c-format
#~ msgid "Could not connect master [%u] and slave [%u]\n"
#~ msgstr "Не могу да повежем надређеног [%u] и потчињеног [%u]\n"
#~ msgid "Initialization failed, shutdown\n"
#~ msgstr "Покретање није успело, гасим\n"
-#, c-format
#~ msgid "Service `%s' is not running\n"
#~ msgstr "Услуга „%s“ није покренута\n"
@@ -9525,14 +9511,12 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Mesh audio channel not ready; audio data dropped\n"
#~ msgstr "Звучни канал меша није спреман; звучни подаци су одбачени\n"
-#, c-format
#~ msgid ""
#~ "No available phone for incoming call on line %u, sending HANG_UP signal\n"
#~ msgstr ""
#~ "Нема доступних телефона за долазни позив на линији %u, шаљем сигнал "
#~ "ПРЕКИД\n"
-#, c-format
#~ msgid "Received incoming channel on port %u\n"
#~ msgstr "Примих долазни канал на прикључник %u\n"
@@ -9540,11 +9524,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgstr ""
#~ "Клијент је ископчан са кључне услуге, покушавам поново да се повежем.\n"
-#, c-format
#~ msgid "Peer `%s'\n"
#~ msgstr "Парњак „%s“\n"
-#, c-format
#~ msgid ""
#~ "Received PING from `%s' for different identity: I am `%s', PONG identity: "
#~ "`%s'\n"
@@ -9561,14 +9543,12 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# encrypted bytes given to transport"
#~ msgstr "# шифровани бајтови су дати преносу"
-#, c-format
#~ msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
#~ msgstr "Неподржана порука врсте %u (%u бајта) је примљена са парњака „%s“\n"
#~ msgid "# messages discarded (expired prior to transmission)"
#~ msgstr "# поруке су одбачене (истекле су пре преноса)"
-#, c-format
#~ msgid "No `%s' specified for `%s' in configuration!\n"
#~ msgstr "Није наведено „%s“ за „%s“ у подешавањима!\n"
@@ -9578,7 +9558,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Sqlite datacache running\n"
#~ msgstr "Остава података Скулајта ради\n"
-#, c-format
#~ msgid "Failed to close statement %p: %d\n"
#~ msgstr "Нисам успео да затворим тврдњу „%p“: %d\n"
@@ -9612,7 +9591,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Failed to receive response from database.\n"
#~ msgstr "Нисам успео да примим одговор из базе података.\n"
-#, c-format
#~ msgid "Cannot use the same configuration for source and destination\n"
#~ msgstr "Не могу да користим исто подешавање за извор и одредиште\n"
@@ -9666,7 +9644,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# Bytes of bandwidth requested from core"
#~ msgstr "# Бајтови пропусног опсега које захтева језгро"
-#, c-format
#~ msgid ""
#~ "\n"
#~ "SUPU %s, %s, %d,my_identity = %s"
@@ -9674,7 +9651,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "\n"
#~ "SUPU %s, %s, %d,my_identity = %s"
-#, c-format
#~ msgid ""
#~ "\n"
#~ "SUPU %s, %s, %d"
@@ -9682,14 +9658,12 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "\n"
#~ "SUPU %s, %s, %d"
-#, c-format
#~ msgid "Configured DNS exit `%s' is not working / valid.\n"
#~ msgstr "Подешени ДНС излаз „%s“ не ради / није исправан.\n"
#~ msgid "only monitor DNS replies"
#~ msgstr "само надгледа ДНС одговоре"
-#, c-format
#~ msgid "`%s' must be installed SUID, refusing to run\n"
#~ msgstr "„%s“ мора бити инсталиран СУИБ, одбијам да радим\n"
@@ -9699,7 +9673,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# Bytes received from MESH"
#~ msgstr "# Бајтови су примљени од МЕША"
-#, c-format
#~ msgid "No service %s found for %s on port %d!\n"
#~ msgstr "Ниједна услуга %s није нађена %s на прикључнику %d!\n"
@@ -9721,11 +9694,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "GNUnet experimentation daemon"
#~ msgstr "Демон експериментисања ГНУнет-а"
-#, c-format
#~ msgid "Experiment `%s': Experiment signature is invalid\n"
#~ msgstr "Експеримент „%s“: Потпис експеримента је неисправан\n"
-#, c-format
#~ msgid ""
#~ "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
#~ "sec. \n"
@@ -9733,31 +9704,24 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Додајем експеримент „%s“ који ради из „%s“ у „%s“ сваке %llu сек. за %llu "
#~ "сек. \n"
-#, c-format
#~ msgid "Experiment `%s': Issuer missing\n"
#~ msgstr "Експеримент „%s“: Недостаје издавач\n"
-#, c-format
#~ msgid "Experiment `%s': Issuer invalid\n"
#~ msgstr "Експеримент „%s“: Неисправан издавач\n"
-#, c-format
#~ msgid "Experiment `%s': Issuer not accepted!\n"
#~ msgstr "Експеримент „%s“: Издавач није прихваћен!\n"
-#, c-format
#~ msgid "Experiment `%s': Version missing or invalid \n"
#~ msgstr "Експеримент „%s“: Недостаје издање или је неисправно \n"
-#, c-format
#~ msgid "Experiment `%s': Required capabilities missing \n"
#~ msgstr "Експеримент „%s“: Захтеване могућности недостају \n"
-#, c-format
#~ msgid "Experiment `%s': Required capabilities invalid \n"
#~ msgstr "Експеримент „%s“: Захтеване могућности су неисправне \n"
-#, c-format
#~ msgid "Failed to parse file `%s'\n"
#~ msgstr "Нисам успео да обрадим датотеку „%s“\n"
@@ -9771,57 +9735,44 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Invalid value for public key\n"
#~ msgstr "Неисправна вредност за јавни кључ\n"
-#, c-format
#~ msgid "Cannot read experiments file `%s'\n"
#~ msgstr "Не могу да прочитам датотеку експеримената „%s“\n"
-#, c-format
#~ msgid "Cannot send message to peer `%s' for experiment `%s'\n"
#~ msgstr "Не могу да пошаљем поруку парњаку „%s“ за екперимент „%s“\n"
-#, c-format
#~ msgid "Sending experimentation request to peer %s\n"
#~ msgstr "Шаљем захтев експериментисања парњаку %s\n"
-#, c-format
#~ msgid "Added peer `%s' as active node\n"
#~ msgstr "Додат је парњак „%s“ као активан чвор\n"
-#, c-format
#~ msgid "Connected to peer %s\n"
#~ msgstr "Повезан са парњаком „%s“\n"
-#, c-format
#~ msgid "Disconnected from peer %s\n"
#~ msgstr "Прекинута је веза са парњаком „%s“\n"
-#, c-format
#~ msgid "Peer `%s' did not respond to request for experiment `%s'\n"
#~ msgstr "Парњак „%s“ није одговорио на захтев за експериментом „%s“\n"
-#, c-format
#~ msgid "Starting inbound experiment `%s' with peer `%s'\n"
#~ msgstr "Покрећем експеримент долазности „%s“ са парњаком „%s“\n"
-#, c-format
#~ msgid "Starting outbound experiment `%s' with peer `%s'\n"
#~ msgstr "Покрећем експеримент одлазности „%s“ са парњаком „%s“\n"
-#, c-format
#~ msgid "Received %s message from peer %s for experiment `%s'\n"
#~ msgstr "Примих %s поруку са парњака %s за експеримент „%s“\n"
-#, c-format
#~ msgid "Failed to receive response for `%s' request from `%s' service.\n"
#~ msgstr "Нисам успео да примим одговор за „%s“ захтев од „%s“ услуге.\n"
-#, c-format
#~ msgid ""
#~ "Failed to receive valid response for `%s' request from `%s' service.\n"
#~ msgstr ""
#~ "Нисам успео да примим исправан одговор за „%s“ захтев од „%s“ услуге.\n"
-#, c-format
#~ msgid "Insufficient space for publishing: %s"
#~ msgstr "Недовољно простора за објављивање: %s"
@@ -9843,7 +9794,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "SKS URI malformed"
#~ msgstr "SKS УРИ је лоше"
-#, c-format
#~ msgid "Could not access hostkey file `%s'.\n"
#~ msgstr "Не могу да приступим датотеци кључа домаћина „%s“.\n"
@@ -9881,11 +9831,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Public key of the GNS zone to use (overrides default)"
#~ msgstr "Јавни кључ ГНС зоне за коришћење (преписује основно)"
-#, c-format
#~ msgid "Ego for `%s' not found, cannot perform lookup.\n"
#~ msgstr "Нисам нашао его за „%s“, не могу да обавим претрагу.\n"
-#, c-format
#~ msgid ""
#~ "Ego for `gns-master' not found, cannot perform lookup. Did you run "
#~ "gnunet-gns-import.sh?\n"
@@ -9896,7 +9844,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Specify the name of the ego of the zone to lookup the record in"
#~ msgstr "Наводи назив егоа зоне у којој ће се тражити запис"
-#, c-format
#~ msgid ""
#~ "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
#~ "that it is and refuse to perform a lookup. Did you run gnunet-gns-import."
@@ -9906,7 +9853,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "јесте и одбићу да обавим претраживање. Да ли сте покренули „gnunet-gns-"
#~ "import.sh“?\n"
-#, c-format
#~ msgid "Failed to connect to identity service\n"
#~ msgstr "Нисам успео да се повежем са услугом идентитета\n"
@@ -9916,26 +9862,21 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "No ego configured for `shorten-zone`\n"
#~ msgstr "Его није подешен за „shorten-zone“\n"
-#, c-format
#~ msgid "No ego configured for `%s`\n"
#~ msgstr "Није подешен его за `%s`\n"
-#, c-format
#~ msgid "Hostname `%s' is not well-formed, resolution fails\n"
#~ msgstr "Назив домаћина „%s“ није лепо оформљен, резолуција није успела\n"
-#, c-format
#~ msgid "Unable to parse PKEY record `%s'\n"
#~ msgstr "Не могу да обрадим „PKEY“ запис „%s“\n"
-#, c-format
#~ msgid "Hostlist file `%s' could not be removed\n"
#~ msgstr "Датотека списка домаћина „%s“ не може бити уклоњена\n"
#~ msgid "Advertisement message could not be queued by core\n"
#~ msgstr "Поруку оглашавања језгро не може да стави у ред\n"
-#, c-format
#~ msgid "Invalid tunnel owner `%s'\n"
#~ msgstr "Неисправан власник тунела „%s“\n"
@@ -9948,15 +9889,12 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Wrong CORE service\n"
#~ msgstr "Погрешна ЈЕЗГРЕНА услуга\n"
-#, c-format
#~ msgid "No default ego configured in identity service\n"
#~ msgstr "Није подешен основни его у услузи идентитета\n"
-#, c-format
#~ msgid "Identity service is not running\n"
#~ msgstr "Услуга идентитета није покренута\n"
-#, c-format
#~ msgid "Please pass valid port number as the first argument! (got `%s')\n"
#~ msgstr ""
#~ "Проследите исправан број прикључника као први аргумент! (добих „%s“)\n"
@@ -9977,7 +9915,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "malformed"
#~ msgstr "лоше"
-#, c-format
#~ msgid ""
#~ "Configuration requires `%s', but binary is not installed properly (SUID "
#~ "bit not set). Option disabled.\n"
@@ -9991,7 +9928,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Унутрашња ИП адреса није позната, не могу користити методу ИЦМП НАТ "
#~ "попречника\n"
-#, c-format
#~ msgid "Running gnunet-helper-nat-client %s %s %u\n"
#~ msgstr "Извршавам „gnunet-helper-nat-client“ %s %s %u\n"
@@ -10014,27 +9950,21 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgstr ""
#~ "Истекло је време преношења захтева понављања ка услузи „ПОДАЦИ_ПАРЊАКА“."
-#, c-format
#~ msgid "Could not connect to `%s' service.\n"
#~ msgstr "Не могу да се повежем са „%s“ услугом.\n"
-#, c-format
#~ msgid "Failure: Did not receive %s\n"
#~ msgstr "Неуспех: Нисам примио „%s“\n"
-#, c-format
#~ msgid "Failure adding HELLO: %s\n"
#~ msgstr "Неуспех додавања „HELLO“-а: %s\n"
-#, c-format
#~ msgid "Service `%s' is not running, please start GNUnet\n"
#~ msgstr "Услуга „%s“ није покренута, покрените ГНУнет\n"
-#, c-format
#~ msgid "`%s:%s' failed at %s:%d with error: %s"
#~ msgstr "`%s:%s' није успело на %s:%d са грешком: %s"
-#, c-format
#~ msgid "Unable to initialize Postgres: %s"
#~ msgstr "Не могу да покренем Постгрес: %s"
@@ -10065,7 +9995,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Failed to begin modifying state!\n"
#~ msgstr "Нисам успео да започнем стање измене!\n"
-#, c-format
#~ msgid "Unknown operator: %c\n"
#~ msgstr "Непознат оператор: %c\n"
@@ -10087,7 +10016,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Failed to get state variable!\n"
#~ msgstr "Нисам успео да добавим променљиву стања!\n"
-#, c-format
#~ msgid "`%s' failed at %s:%d with error: %s (%d)\n"
#~ msgstr "„%s“ није успело на %s:%d са грешком: %s (%d)\n"
@@ -10100,7 +10028,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Please give a session key for --input_key!\n"
#~ msgstr "Дајте кључ сесије за „--input_key“!\n"
-#, c-format
#~ msgid "Could not convert `%s' to integer.\n"
#~ msgstr "Не могу да претворим „%s“ у цео број.\n"
@@ -10111,26 +10038,21 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Зарезом раздвојена маска за бирање који елементи заправо требају бити "
#~ "поређени."
-#, c-format
#~ msgid "Client (%p) disconnected from us.\n"
#~ msgstr "Прекинута је веза клијента (%p) са нама.\n"
-#, c-format
#~ msgid "Could not send message to client (%p)!\n"
#~ msgstr "Не могу да пошаљем поруку клијенту (%p)!\n"
-#, c-format
#~ msgid "Sending session-end notification to client (%p) for session %s\n"
#~ msgstr "Шаљем обавештење о крају сесије клијенту (%p) за сесију %s\n"
-#, c-format
#~ msgid "Sent result to client (%p), this session (%s) has ended!\n"
#~ msgstr "Резултати су послати клијенту (%p), ова сесија (%s) је завршена!\n"
#~ msgid "Could not send service-response message via mesh!)\n"
#~ msgstr "Не могу да пошаљем поруку одговора услуге путем меша!)\n"
-#, c-format
#~ msgid ""
#~ "Failed to communicate with `%s', scalar product calculation aborted.\n"
#~ msgstr ""
@@ -10143,7 +10065,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Could not send service-request multipart message to channel!\n"
#~ msgstr "Не могу да пошаљем вишеделовну поруку захтева услуге каналу!\n"
-#, c-format
#~ msgid "Successfully created new channel to peer (%s)!\n"
#~ msgstr "Успешно је створен нови канал за парњака (%s)!\n"
@@ -10158,7 +10079,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgstr ""
#~ "Неисправна порука је примљена са клијента, подаци о сесији су нетачни!\n"
-#, c-format
#~ msgid ""
#~ "Duplicate session information received, cannot create new session with "
#~ "key `%s'\n"
@@ -10166,7 +10086,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Двоструки подаци сесије су примљени, не могу да направим нову сесију са "
#~ "кључем „%s“\n"
-#, c-format
#~ msgid ""
#~ "Got client-request-session with key %s, preparing channel to remote "
#~ "service.\n"
@@ -10174,11 +10093,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Добих сесију захтева клијента са кључем %s, припремам канал за удљену "
#~ "услугу.\n"
-#, c-format
#~ msgid "Creating new channel for session with key %s.\n"
#~ msgstr "Стварам нови канал за сесију са кључем „%s“.\n"
-#, c-format
#~ msgid ""
#~ "Got client-responder-session with key %s and a matching service-request-"
#~ "session set, processing.\n"
@@ -10186,7 +10103,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Добих сесију одговарача клијента са кључем %s и одговарајући скуп сесије "
#~ "захтева услуге, обрађујем.\n"
-#, c-format
#~ msgid ""
#~ "Got client-responder-session with key %s but NO matching service-request-"
#~ "session set, queuing element for later use.\n"
@@ -10194,27 +10110,22 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Добих сесију одговарача клијента са кључем %s али НЕ и одговарајући скуп "
#~ "сесије захтева услуге, стављам елемент у ред за касније коришћење.\n"
-#, c-format
#~ msgid "New incoming channel from peer %s.\n"
#~ msgstr "Нови долазни канал са парњака „%s“.\n"
-#, c-format
#~ msgid "Peer disconnected, terminating session %s with peer (%s)\n"
#~ msgstr ""
#~ "Веза са парњаком је прекинута, окончавам сесију %s са парњаком (%s)\n"
-#, c-format
#~ msgid "Got session with key %s and a matching element set, processing.\n"
#~ msgstr ""
#~ "Добих сесију са кључем „%s“ и одговарајући скуп елемената, обрађујем.\n"
-#, c-format
#~ msgid "Got session with key %s without a matching element set, queueing.\n"
#~ msgstr ""
#~ "Добих сесију са кључем „%s“ без одговарајућег скупа елемената, стављам у "
#~ "ред.\n"
-#, c-format
#~ msgid ""
#~ "Got message with duplicate session key (`%s'), ignoring service request.\n"
#~ msgstr ""
@@ -10242,7 +10153,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Could not connect to mesh service\n"
#~ msgstr "Не могу да се повежем са меш услугом\n"
-#, c-format
#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
#~ msgstr ""
#~ "Покушавам да се повежем са удаљеним домаћином, али услуга „%s“ није "
@@ -10267,11 +10177,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
#~ msgstr "Контрола ГНУнет размештаја (задржавајући П2П меш и Ф2Ф ограничења)"
-#, c-format
#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
#~ msgstr "Не могу да добијем исправну везу за „%s“ %s (%s)\n"
-#, c-format
#~ msgid ""
#~ "Address or session unknown: failed to update properties for peer `%s' "
#~ "plugin `%s' address `%s' session %p\n"
@@ -10279,42 +10187,35 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Адреса или сесија је непозната: нисам успео да својства за парњака „%s“ "
#~ "прикључак „%s“ адресу „%s“ сесију %p\n"
-#, c-format
#~ msgid ""
#~ "Dropping message of type %u and size %u, have %u/%u messages pending\n"
#~ msgstr ""
#~ "Одбацујем поруку врсте %u и величине %u, има %u/%u порука на чекању\n"
-#, c-format
#~ msgid "Rejecting control connection from peer `%s', which is not me!\n"
#~ msgstr "Одбацујем контролну везу од парњака „%s“, а то нисам ја!\n"
-#, c-format
#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
#~ msgstr "Списак забрана одбацује покушај повезивања са парњаком „%s“\n"
-#, c-format
#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
#~ msgstr "Списак забрана дозвољава покушај повезивања са парњаком „%s“\n"
#~ msgid "# REQUEST CONNECT messages received"
#~ msgstr "# ЗАХТЕВАЈ ПОВЕЖИ_СЕ поруке су примљене"
-#, c-format
#~ msgid "Received a request connect message for peer `%s'\n"
#~ msgstr "Примих поруку захтева повезивања за парњака „%s“\n"
#~ msgid "# REQUEST DISCONNECT messages received"
#~ msgstr "# ЗАХТЕВАЈ ПРЕКИНИ_ВЕЗУ поруке су примљене"
-#, c-format
#~ msgid "Received a request disconnect message for peer `%s'\n"
#~ msgstr "Примих поруку захтева прекида везе за парњака „%s“\n"
#~ msgid "# keepalives sent"
#~ msgstr "# одржавања у раду су послата"
-#, c-format
#~ msgid ""
#~ "Failed to send CONNECT message to peer `%s' using address `%s' session "
#~ "%p\n"
@@ -10330,7 +10231,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# SESSION_CONNECT messages sent"
#~ msgstr "# ПОВЕЗИВАЊЕ_СЕСИЈЕ поруке су послате"
-#, c-format
#~ msgid "Blacklisting disapproved to connect to peer `%s'\n"
#~ msgstr "Списак забрана није одобрио повезивање са парњаком „%s“\n"
@@ -10343,7 +10243,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# SET QUOTA messages ignored (no such peer)"
#~ msgstr "# ПОСТАВИ КВОТУ поруке су занемарене (нема таквог парњака)"
-#, c-format
#~ msgid ""
#~ "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
#~ "not happen.\n"
@@ -10354,20 +10253,16 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "# PING without HELLO messages sent"
#~ msgstr "# ПИНГ без „HELLO“ порука је послат"
-#, c-format
#~ msgid "Received a PING message with validation bug from `%s'\n"
#~ msgstr "Примих ПИНГ поруку са грешком потврђивања са „%s“\n"
-#, c-format
#~ msgid "Validation received new %s message for peer `%s' with size %u\n"
#~ msgstr ""
#~ "Потврђивање је примило нову „%s“ поруку за парњака „%s“ са величином %u\n"
-#, c-format
#~ msgid "Adding `%s' without addresses for peer `%s'\n"
#~ msgstr "Додајем „%s“ без адреса за парњака „%s“\n"
-#, c-format
#~ msgid ""
#~ "Peer `%s' %s %s\n"
#~ "\t%s%s\n"
@@ -10379,22 +10274,18 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "\t%s%s\n"
#~ "\t%s%s\n"
-#, c-format
#~ msgid "Peer `%s' %s `%s' \n"
#~ msgstr "Парњак „%s“ %s „%s“ \n"
#~ msgid "No transport plugins configured, peer will never communicate\n"
#~ msgstr "Нису подешени прикључци преноса, парњак неће никада комуницирати\n"
-#, c-format
#~ msgid "No port configured for plugin `%s', cannot test it\n"
#~ msgstr "Није подешен прикључник за прикључак „%s“, не могу да га тестирам\n"
-#, c-format
#~ msgid "Successfully connected to `%s'\n"
#~ msgstr "Успешно је успостављена веза са „%s“\n"
-#, c-format
#~ msgid "Successfully disconnected from `%s'\n"
#~ msgstr "Успешно је прекинута веза са „%s“\n"
@@ -10452,27 +10343,22 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Bluetooth address with invalid size encountered\n"
#~ msgstr "Наишли смо на адресу блутута са неисправном величином\n"
-#, c-format
#~ msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
#~ msgstr ""
#~ "Извршна помоћника „%s“ није СУИБ, не могу да покренем блутут пренос\n"
-#, c-format
#~ msgid "Binding to IPv4 address %s\n"
#~ msgstr "Свезујем за ИПв4 адресу %s\n"
-#, c-format
#~ msgid "Binding to IPv6 address %s\n"
#~ msgstr "Свезујем за ИПв6 адресу %s\n"
-#, c-format
#~ msgid "Trying to send with invalid session %p\n"
#~ msgstr "Покушавам да пошаљем са неисправном сесијом %p\n"
#~ msgid "# IPv4 broadcast HELLO beacons received via udp"
#~ msgstr "# ИПв4 свеодредишне „HELLO“ ознаке су примљене путем удп-а"
-#, c-format
#~ msgid ""
#~ "Trying to create session for address of unexpected length %u (should be "
#~ "%u or %u)\n"
@@ -10480,11 +10366,9 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Покушавам да направим сесију за адресу неочекиване дужине %u (треба бити "
#~ "%u или %u)\n"
-#, c-format
#~ msgid "Given `%s' option is out of range: %llu > %u\n"
#~ msgstr "Дата „%s“ опција је ван опсега: %llu > %u\n"
-#, c-format
#~ msgid "Invalid IPv6 address: `%s'\n"
#~ msgstr "Неисправна ИПв6 адреса: „%s“\n"
@@ -10506,18 +10390,15 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "WLAN address with invalid size encountered\n"
#~ msgstr "Наишли смо на адресу „WLAN“ са неисправном величином\n"
-#, c-format
#~ msgid "Received unexpected message of type %u in %s:%u\n"
#~ msgstr "Примих неочекивану поруку врсте %u у %s:%u\n"
#~ msgid "Failed to initialize testing library!\n"
#~ msgstr "Нисам успео да покренем библиотеку тестирања!\n"
-#, c-format
#~ msgid "Metadata `%s' failed to deserialize"
#~ msgstr "Метаподаци „%s“ нису успели да се десеријализују"
-#, c-format
#~ msgid ""
#~ "Could not determine valid hostname and port for service `%s' from "
#~ "configuration.\n"
@@ -10525,24 +10406,20 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Не могу да одредим исправан назив доамћина и прикључник за услугу „%s“ из "
#~ "подешавања.\n"
-#, c-format
#~ msgid "Could not connect to service `%s', configuration broken.\n"
#~ msgstr "Не могу да се повежем на услугу „%s“, подешавање је оштећено.\n"
-#, c-format
#~ msgid "Failure to transmit request to service `%s'\n"
#~ msgstr "Нисам успео да пренесем захтев услузи „%s“\n"
#~ msgid "Could not submit request, not expecting to receive a response.\n"
#~ msgstr "Не могу да предам захтев, не очекујем да примим одговор.\n"
-#, c-format
#~ msgid "Failed to create or access directory for log file `%s'\n"
#~ msgstr ""
#~ "Нисам успео да направим или да приступим директоријуму да забележим "
#~ "датотеку „%s“\n"
-#, c-format
#~ msgid ""
#~ "Failed to establish TCP connection to `%s:%u', no further addresses to "
#~ "try.\n"
@@ -10550,15 +10427,12 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Нисам успео да успоставим ТЦП везу са `%s:%u', нема будућих адреса за "
#~ "покушавање.\n"
-#, c-format
#~ msgid "Trying to connect to `%s' (%p)\n"
#~ msgstr "Покушавам да се повежем на „%s“ (%p)\n"
-#, c-format
#~ msgid "Attempt to connect to `%s' failed\n"
#~ msgstr "Покушај повезивања са „%s“ није успео\n"
-#, c-format
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "Не могу да остварим закључавање на датотеци „%s“: %s...\n"
@@ -10568,7 +10442,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "This may be ok if someone is currently generating a private key.\n"
#~ msgstr "Ово може бити у реду ако неко тренутно ствара лични кључ.\n"
-#, c-format
#~ msgid ""
#~ "When trying to read key file `%s' I found %u bytes but I need at least "
#~ "%u.\n"
@@ -10579,37 +10452,30 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "This may be ok if someone is currently generating a key.\n"
#~ msgstr "Ово може бити у реду ако неко тренутно ствара кључ.\n"
-#, c-format
#~ msgid "EdDSA signature verification failed at %s:%d: %s\n"
#~ msgstr "Провера „EdDSA“ потписа није успела на %s:%d: %s\n"
#~ msgid "print the hash of the public key in ASCII format"
#~ msgstr "исписује хеш јавног кључа у АСКРИ формату"
-#, c-format
#~ msgid "Could not resolve `%s' (%s): %s\n"
#~ msgstr "Не могу да решим „%s“ (%s): %s\n"
-#, c-format
#~ msgid "Could not find IP of host `%s': %s\n"
#~ msgstr "Не могу да нађем ИП домаћина „%s“: %s\n"
-#, c-format
#~ msgid "CreateProcess failed for binary %s (%d).\n"
#~ msgstr "„CreateProcess“ није успело за извршну „%s“ (%d).\n"
-#, c-format
#~ msgid "GetExitCodeProcess failed for binary %s (%d).\n"
#~ msgstr "„GetExitCodeProcess“ није успело за извршну „%s“ (%d).\n"
-#, c-format
#~ msgid "Must specify `%s' for `%s' in configuration!\n"
#~ msgstr "Морате навести „%s“ за „%s“ у подешавањима!\n"
#~ msgid "Looks like we're busy waiting...\n"
#~ msgstr "Изгледа да смо заузети чекајући...\n"
-#, c-format
#~ msgid "Attempt to cancel dead task %llu!\n"
#~ msgstr "Покушах да обришем неактиван задатак %llu!\n"
@@ -10618,7 +10484,6 @@ msgstr "Нисам успео да се повежем са смештајем
#~ "Не могу да приступим унапред свезаној прикључници, покушаћу да свежем "
#~ "себе самог\n"
-#, c-format
#~ msgid "signal (%d, %p) returned %d.\n"
#~ msgstr "сигнал (%d, %p) је дао %d.\n"
@@ -10661,14 +10526,11 @@ msgstr "Нисам успео да се повежем са смештајем
#~ msgid "Failed to setup mesh channel!\n"
#~ msgstr "Нисам успео да поставим меш канал!\n"
-#, c-format
#~ msgid "Assertion failed at %s:%d.\n"
#~ msgstr "Потврђивање није успело на %s:%d.\n"
-#, c-format
#~ msgid "External protocol violation detected at %s:%d.\n"
#~ msgstr "Повреда спољног протокола је откривена на %s:%d.\n"
-#, c-format
#~ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
#~ msgstr "„%s“ није успело на датотеци „%s“ на %s:%d са грешком: %s\n"
diff --git a/po/sv.po b/po/sv.po
index dfaa0f839..c87ec92ee 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2205,105 +2205,105 @@ msgstr "Meddelande mottaget från klient är ogiltig.\n"
msgid "# FIND PEER messages initiated"
msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
#, fuzzy
msgid "# requests TTL-dropped"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
#, fuzzy
msgid "# PUT requests routed"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
#, fuzzy
msgid "# PUT messages queued for transmission"
msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
#, fuzzy
msgid "# P2P messages dropped due to full queue"
msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
#, fuzzy
msgid "# GET requests routed"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
#, fuzzy
msgid "# GET messages queued for transmission"
msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
#, fuzzy
msgid "# RESULT messages queued for transmission"
msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
msgid "# Expired PUTs discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
#, fuzzy
msgid "# P2P PUT requests received"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
#, fuzzy
msgid "# P2P PUT bytes received"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
#, fuzzy
msgid "# P2P GET requests received"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
#, fuzzy
msgid "# P2P GET bytes received"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
#, fuzzy
msgid "# P2P FIND PEER requests processed"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
#, fuzzy
msgid "# P2P GET requests ONLY routed"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
msgid "# Expired results discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
#, fuzzy
msgid "# P2P RESULTS received"
msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
#, fuzzy
msgid "# P2P RESULT bytes received"
msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2346,7 +2346,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, fuzzy, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -2361,7 +2361,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6681,7 +6681,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "Ogiltigt argument: \"%s\"\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6720,7 +6720,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6790,27 +6790,17 @@ msgstr ""
msgid "%.s Unknown result code."
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
#: src/testbed/testbed_api.c:399
#, fuzzy, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6831,11 +6821,6 @@ msgstr ""
msgid "Hosts file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6866,43 +6851,39 @@ msgstr ""
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, fuzzy, c-format
msgid "Topology file %s not found\n"
msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
@@ -6977,59 +6958,59 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, fuzzy, c-format
msgid "Key number %u does not exist\n"
msgstr "antal meddelanden att använda per iteration"
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
#, fuzzy
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr "Inga applikationer definierade i konfiguration!\n"
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
#, fuzzy
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "Kunde inte skapa värdnyckel!\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "Kunde inte skapa användarkonto:"
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, fuzzy, c-format
msgid "Failed to start `%s': %s\n"
msgstr "Fel vid %s:%d.\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, fuzzy, c-format
msgid "Failed to load configuration from %s\n"
msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -7107,19 +7088,19 @@ msgstr "# krypterade PONG-meddelanden mottagna"
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
#, fuzzy
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr "GNUnet-konfiguration"
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8366,48 +8347,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr ""
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "FEL"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "VARNING"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr "MEDDELANDE"
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "INFO"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "FELSÖKNING"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr ""
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, fuzzy, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr "Konfigurationsfil \"%s\" skapad.\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, fuzzy, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8482,6 +8463,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8706,67 +8707,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-#, fuzzy
-msgid "name of the option to access"
-msgstr "Visa värde av alternativet"
-
-#: src/util/gnunet-config.c:376
-#, fuzzy
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr "använd konfigurationsfil FILNAMN"
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "GNUnet-konfiguration"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
#, fuzzy
msgid "Manipulate GNUnet configuration files"
msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8947,7 +8908,7 @@ msgstr "Fel vid skapandet av användare"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Fel vid skapandet av användare"
@@ -8985,34 +8946,39 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, fuzzy, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, fuzzy, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
#, fuzzy
msgid "Could not determine plugin installation path.\n"
msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-#: src/util/program.c:252
+#: src/util/program.c:251
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s', exiting ...\n"
msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/util/program.c:272
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/util/program.c:288
+#: src/util/program.c:278
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "Kunde inte spara konfigurationsfil \"%s\":"
#: src/util/regex.c:139
@@ -9342,27 +9308,59 @@ msgstr ""
msgid "Failed to connect to the namestore!\n"
msgstr "Misslyckades att ansluta till gnunetd.\n"
-#, fuzzy, c-format
+#, fuzzy
+#~ msgid "Waiting for child to exit.\n"
+#~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
+#, fuzzy
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "name of the option to access"
+#~ msgstr "Visa värde av alternativet"
+
+#, fuzzy
+#~ msgid "rewrite the configuration file, even if nothing changed"
+#~ msgstr "använd konfigurationsfil FILNAMN"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "GNUnet-konfiguration"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
#~ msgid "Start logging `%s'\n"
#~ msgstr "Startade samling \"%s\".\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "Kommando \"%s\" stöds ej. Avbryter.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unable to parse PKEY record `%s'\n"
#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -9389,7 +9387,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
#~ msgid "days"
#~ msgstr " dagar"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
diff --git a/po/vi.po b/po/vi.po
index bfb260eef..1d8f84f90 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.8.0a\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2008-09-10 22:05+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2225,107 +2225,107 @@ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\
msgid "# FIND PEER messages initiated"
msgstr "# các thông báo PING được tạo"
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
#, fuzzy
msgid "# requests TTL-dropped"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
#, fuzzy
msgid "# Peer selection failed"
msgstr "# các cuộc gọi HTTP select (lựa chọn)"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
#, fuzzy
msgid "# PUT requests routed"
msgstr "# các yêu cầu dht được định tuyến"
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
#, fuzzy
msgid "# PUT messages queued for transmission"
msgstr "# các thông báo PING được tạo"
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
#, fuzzy
msgid "# P2P messages dropped due to full queue"
msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
#, fuzzy
msgid "# GET requests routed"
msgstr "# các yêu cầu dht được định tuyến"
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
#, fuzzy
msgid "# GET messages queued for transmission"
msgstr "# các thông báo PING được tạo"
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
#, fuzzy
msgid "# RESULT messages queued for transmission"
msgstr "# các thông báo PING được tạo"
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
msgid "# Expired PUTs discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
#, fuzzy
msgid "# P2P PUT requests received"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
#, fuzzy
msgid "# P2P PUT bytes received"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
#, fuzzy
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
#, fuzzy
msgid "# P2P GET requests received"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
#, fuzzy
msgid "# P2P GET bytes received"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
#, fuzzy
msgid "# P2P FIND PEER requests processed"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
#, fuzzy
msgid "# P2P GET requests ONLY routed"
msgstr "# các yêu cầu dht được định tuyến"
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
msgid "# Expired results discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
#, fuzzy
msgid "# P2P RESULTS received"
msgstr "# Tín hiệu HTTP PUT được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
#, fuzzy
msgid "# P2P RESULT bytes received"
msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2368,7 +2368,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, fuzzy, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "tăng sổ tối đa các kết nối TCP/IP"
@@ -2383,7 +2383,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6736,7 +6736,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "Đối số không hợp lệ cho « %s ».\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6775,7 +6775,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6845,27 +6845,17 @@ msgstr "« %s » đang tắt.\n"
msgid "%.s Unknown result code."
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Đang đợi các đồng đẳng kết nối"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
#: src/testbed/testbed_api.c:399
#, fuzzy, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6886,11 +6876,6 @@ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được
msgid "Hosts file %s cannot be read\n"
msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6921,43 +6906,39 @@ msgstr ""
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, fuzzy, c-format
msgid "Topology file %s not found\n"
msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, fuzzy, c-format
msgid "Topology file %s has no data\n"
msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, fuzzy, c-format
msgid "Topology file %s cannot be read\n"
msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -7032,58 +7013,58 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, fuzzy, c-format
msgid "Key number %u does not exist\n"
msgstr "đặt số trình nền cần khởi chạy"
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
#, fuzzy
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "Lỗi tạo thư mục tạm thời."
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, fuzzy, c-format
msgid "Failed to start `%s': %s\n"
msgstr "Lỗi chạy %s: %s %d\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, fuzzy, c-format
msgid "Failed to load configuration from %s\n"
msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -7168,19 +7149,19 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
#, fuzzy
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr "Lưu cấu hình ngay bây giờ không?"
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8420,49 +8401,49 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "LỖI"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "CẢNH BÁO"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "TIN"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "GỠ LỖI"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr ""
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, fuzzy, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr ""
"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, fuzzy, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8540,6 +8521,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8766,66 +8767,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr ""
-
-#: src/util/gnunet-config.c:376
-#, fuzzy
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "Lưu cấu hình ngay bây giờ không?"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
#, fuzzy
msgid "Manipulate GNUnet configuration files"
msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -9006,7 +8968,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "Gặp lỗi khi tạo người dùng"
@@ -9044,34 +9006,39 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
#, fuzzy
msgid "Could not determine plugin installation path.\n"
msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-#: src/util/program.c:252
+#: src/util/program.c:251
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s', exiting ...\n"
msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/util/program.c:272
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/util/program.c:288
+#: src/util/program.c:278
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "Không thể lưu tập tin cấu hình « %s »:"
#: src/util/regex.c:139
@@ -9401,30 +9368,58 @@ msgid "Failed to connect to the namestore!\n"
msgstr "Không kết nối được đến trình nền gnunetd."
#, fuzzy
+#~ msgid "Waiting for child to exit.\n"
+#~ msgstr "Đang đợi các đồng đẳng kết nối"
+
+#, fuzzy
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#, fuzzy
+#~ msgid "rewrite the configuration file, even if nothing changed"
+#~ msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy
#~ msgid "Stop logging\n"
#~ msgstr "Theo dõi"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Start logging `%s'\n"
#~ msgstr "Đang bắt đầu tài về « %s »\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "Không thể tạo miền tên.\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unable to parse PKEY record `%s'\n"
#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -9451,7 +9446,7 @@ msgstr "Không kết nối được đến trình nền gnunetd."
#~ msgid "days"
#~ msgstr " ngày"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c68a3c645..1cd864c94 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2021-08-28 16:52+0200\n"
+"POT-Creation-Date: 2021-10-15 10:46+0200\n"
"PO-Revision-Date: 2011-07-09 12:12+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -2140,91 +2140,91 @@ msgstr ""
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:851
+#: src/dht/gnunet-service-dht_neighbours.c:855
msgid "# requests TTL-dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1035
-#: src/dht/gnunet-service-dht_neighbours.c:1072
+#: src/dht/gnunet-service-dht_neighbours.c:1042
+#: src/dht/gnunet-service-dht_neighbours.c:1079
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1088
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1253
msgid "# PUT requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1280
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1292
-#: src/dht/gnunet-service-dht_neighbours.c:1434
-#: src/dht/gnunet-service-dht_neighbours.c:1538
+#: src/dht/gnunet-service-dht_neighbours.c:1299
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+#: src/dht/gnunet-service-dht_neighbours.c:1545
msgid "# P2P messages dropped due to full queue"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1377
+#: src/dht/gnunet-service-dht_neighbours.c:1384
msgid "# GET requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1421
+#: src/dht/gnunet-service-dht_neighbours.c:1428
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1560
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1656
+#: src/dht/gnunet-service-dht_neighbours.c:1663
msgid "# Expired PUTs discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1664
+#: src/dht/gnunet-service-dht_neighbours.c:1671
msgid "# P2P PUT requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1675
msgid "# P2P PUT bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1909
+#: src/dht/gnunet-service-dht_neighbours.c:1916
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2072
+#: src/dht/gnunet-service-dht_neighbours.c:2079
msgid "# P2P GET requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2076
+#: src/dht/gnunet-service-dht_neighbours.c:2083
msgid "# P2P GET bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2142
+#: src/dht/gnunet-service-dht_neighbours.c:2149
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2163
+#: src/dht/gnunet-service-dht_neighbours.c:2170
msgid "# P2P GET requests ONLY routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2341
+#: src/dht/gnunet-service-dht_neighbours.c:2348
msgid "# Expired results discarded"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2358
+#: src/dht/gnunet-service-dht_neighbours.c:2365
msgid "# P2P RESULTS received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2362
+#: src/dht/gnunet-service-dht_neighbours.c:2369
msgid "# P2P RESULT bytes received"
msgstr ""
@@ -2264,7 +2264,7 @@ msgstr ""
msgid "# DHT requests combined"
msgstr ""
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:253
#, fuzzy, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "增加 TCP/IP 的最大连接数"
@@ -2279,7 +2279,7 @@ msgid "number of PUTs to perform per peer"
msgstr ""
#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
+#: src/testbed/gnunet-testbed-profiler.c:302
msgid "name of the file with the login information for the testbed"
msgstr ""
@@ -6491,7 +6491,7 @@ msgid "Invalid argument `%s'; expecting unsigned int\n"
msgstr "“%s”的参数无效。\n"
#: src/testbed/generate-underlay-topology.c:366
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:282
msgid "create COUNT number of peers"
msgstr ""
@@ -6530,7 +6530,7 @@ msgid ""
msgstr ""
#: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:278 src/util/gnunet-ecc.c:318
+#: src/testing/testing.c:289 src/util/gnunet-ecc.c:318
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
@@ -6600,26 +6600,17 @@ msgstr ""
msgid "%.s Unknown result code."
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:290
+#: src/testbed/gnunet-testbed-profiler.c:288
msgid "tolerate COUNT number of continuous timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:295
+#: src/testbed/gnunet-testbed-profiler.c:293
msgid ""
"run profiler in non-interactive mode where upon testbed setup the profiler "
"does not wait for a keystroke but continues to run until a termination "
"signal is received"
msgstr ""
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
#: src/testbed/testbed_api.c:399
#, fuzzy, c-format
msgid "Adding host %u failed with error: %s\n"
@@ -6640,11 +6631,6 @@ msgstr ""
msgid "Hosts file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:589
-#, c-format
-msgid "The function %s is only available when compiled with (--with-ll)\n"
-msgstr ""
-
#: src/testbed/testbed_api_testbed.c:822
msgid "Linking controllers failed. Exiting"
msgstr ""
@@ -6675,43 +6661,39 @@ msgstr ""
msgid "Shutting down testbed due to timeout while setup.\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1274
-msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:1286
+#: src/testbed/testbed_api_testbed.c:1276
msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1312
+#: src/testbed/testbed_api_testbed.c:1301
msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1368
+#: src/testbed/testbed_api_testbed.c:1357
#, c-format
msgid ""
"Maximum number of edges a peer can have in a scale free topology cannot be "
"more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1385
+#: src/testbed/testbed_api_testbed.c:1374
#, c-format
msgid ""
"The number of edges that can established when adding a new node to scale "
"free topology cannot be more than %u. Given `%s = %llu'"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1033
+#: src/testbed/testbed_api_topology.c:1033 src/testing/testing.c:2320
#, c-format
msgid "Topology file %s not found\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1041
+#: src/testbed/testbed_api_topology.c:1041 src/testing/testing.c:2328
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:1049
+#: src/testbed/testbed_api_topology.c:1049 src/testing/testing.c:2336
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
@@ -6786,58 +6768,58 @@ msgstr ""
msgid "list COUNT number of keys"
msgstr ""
-#: src/testing/testing.c:261
+#: src/testing/testing.c:272
#, c-format
msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:714
+#: src/testing/testing.c:725
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing.c:1188
+#: src/testing/testing.c:1199
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1197
+#: src/testing/testing.c:1208
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1218
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1220
+#: src/testing/testing.c:1231
#, fuzzy
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1236
+#: src/testing/testing.c:1247
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/testing/testing.c:1250
+#: src/testing/testing.c:1261
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "发送消息失败。\n"
-#: src/testing/testing.c:1278
+#: src/testing/testing.c:1289
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1384
+#: src/testing/testing.c:1395
#, fuzzy, c-format
msgid "Failed to start `%s': %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/testing/testing.c:1683
+#: src/testing/testing.c:1694
#, fuzzy, c-format
msgid "Failed to load configuration from %s\n"
msgstr "解析配置文件“%s”失败\n"
@@ -6916,19 +6898,19 @@ msgstr ""
msgid "GNUnet topology control"
msgstr ""
-#: src/transport/gnunet-communicator-tcp.c:3317
-#: src/transport/gnunet-communicator-udp.c:3790
-#: src/transport/gnunet-service-tng.c:10223
+#: src/transport/gnunet-communicator-tcp.c:3329
+#: src/transport/gnunet-communicator-udp.c:3814
+#: src/transport/gnunet-service-tng.c:10388
#: src/transport/gnunet-service-transport.c:2627
#, fuzzy
msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr "立即保存配置?"
-#: src/transport/gnunet-communicator-tcp.c:3655
+#: src/transport/gnunet-communicator-tcp.c:3671
msgid "GNUnet TCP communicator"
msgstr ""
-#: src/transport/gnunet-communicator-udp.c:3862
+#: src/transport/gnunet-communicator-udp.c:3889
msgid "GNUnet UDP communicator"
msgstr ""
@@ -8115,48 +8097,48 @@ msgstr ""
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
-#: src/util/common_logging.c:1106
+#: src/util/common_logging.c:1108
msgid "ERROR"
msgstr "错误"
-#: src/util/common_logging.c:1108
+#: src/util/common_logging.c:1110
msgid "WARNING"
msgstr "警告"
-#: src/util/common_logging.c:1110
+#: src/util/common_logging.c:1112
msgid "MESSAGE"
msgstr ""
-#: src/util/common_logging.c:1112
+#: src/util/common_logging.c:1114
msgid "INFO"
msgstr "信息"
-#: src/util/common_logging.c:1114
+#: src/util/common_logging.c:1116
msgid "DEBUG"
msgstr "调试"
-#: src/util/common_logging.c:1116
+#: src/util/common_logging.c:1118
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:1117
+#: src/util/common_logging.c:1119
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:1398
+#: src/util/common_logging.c:1400
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1443
+#: src/util/common_logging.c:1445
msgid "invalid address"
msgstr ""
-#: src/util/common_logging.c:1462
+#: src/util/common_logging.c:1464
#, fuzzy, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr "配置不满足配置规范文件“%s”的约束!\n"
-#: src/util/common_logging.c:1485
+#: src/util/common_logging.c:1487
#, fuzzy, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8231,6 +8213,26 @@ msgid ""
"as an environmental variable\n"
msgstr ""
+#: src/util/configuration_helper.c:133
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:147
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/util/configuration_helper.c:218
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/configuration_helper.c:262
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "解析配置文件“%s”失败\n"
+
#: src/util/container_bloomfilter.c:553
#, c-format
msgid ""
@@ -8453,65 +8455,27 @@ msgstr ""
msgid "run decoder modus, otherwise runs as encoder"
msgstr ""
-#: src/util/gnunet-config.c:187
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:201
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/util/gnunet-config.c:266
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:309
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/gnunet-config.c:354
+#: src/util/gnunet-config.c:139
msgid "test if the current installation supports the specified BACKEND"
msgstr ""
-#: src/util/gnunet-config.c:360
-#, fuzzy
-msgid "write the full configuration file, including default values"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/util/gnunet-config.c:365
-msgid "interpret option value as a filename (with $-expansion)"
-msgstr ""
-
-#: src/util/gnunet-config.c:370
-msgid "name of the option to access"
-msgstr ""
-
-#: src/util/gnunet-config.c:376
-msgid "rewrite the configuration file, even if nothing changed"
-msgstr ""
-
-#: src/util/gnunet-config.c:382
-msgid "output extra diagnostics"
+#: src/util/gnunet-config.c:145
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:387
-#, fuzzy
-msgid "print available configuration sections"
-msgstr "立即保存配置?"
-
-#: src/util/gnunet-config.c:393
-msgid "name of the section to access"
+#: src/util/gnunet-config.c:151
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
msgstr ""
-#: src/util/gnunet-config.c:398
-msgid "value to set"
+#: src/util/gnunet-config.c:157
+msgid "Provide the path under which GNUnet was installed"
msgstr ""
-#: src/util/gnunet-config.c:413
+#: src/util/gnunet-config.c:172
#, fuzzy
msgid "Manipulate GNUnet configuration files"
msgstr "更改配置文件中的一个值"
@@ -8692,7 +8656,7 @@ msgstr "创建用户出错"
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/util/helper.c:602
+#: src/util/helper.c:606
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "创建用户出错"
@@ -8730,34 +8694,39 @@ msgstr ""
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "插件机构初始化失败:%s!\n"
-#: src/util/plugin.c:156
+#: src/util/plugin.c:162
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:234
+#: src/util/plugin.c:240
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:414
+#: src/util/plugin.c:420
#, fuzzy
msgid "Could not determine plugin installation path.\n"
msgstr "无法确定用户界面定义文件。"
-#: src/util/program.c:252
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/program.c:263
#, fuzzy, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exiting ...\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/util/program.c:272
+#: src/util/program.c:278
#, fuzzy, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/util/program.c:288
+#: src/util/program.c:293
#, fuzzy
-msgid "Unreadable or malformed configuration, exit ...\n"
+msgid "Malformed configuration. Exiting ...\n"
msgstr "解析配置文件“%s”失败\n"
#: src/util/regex.c:139
@@ -9077,27 +9046,47 @@ msgstr ""
msgid "Failed to connect to the namestore!\n"
msgstr "初始化“%s”服务失败。\n"
-#, fuzzy, c-format
+#, fuzzy
+#~ msgid "Spawning process `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "write the full configuration file, including default values"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "print available configuration sections"
+#~ msgstr "立即保存配置?"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Unreadable or malformed configuration, exit ...\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
#~ msgid "Start logging `%s'\n"
#~ msgstr "未知的命令“%s”。\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to connect master peer [%u] with slave [%u]\n"
#~ msgstr "初始化“%s”服务失败。\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unsupported form value `%s'\n"
#~ msgstr "未知的命令“%s”。\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to create page for `%s'\n"
#~ msgstr "发送消息失败。\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Failed to setup post processor for `%s'\n"
#~ msgstr "解析配置文件“%s”失败\n"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Unable to parse PKEY record `%s'\n"
#~ msgstr "解析配置文件“%s”失败\n"
@@ -9124,7 +9113,7 @@ msgstr "初始化“%s”服务失败。\n"
#~ msgid "days"
#~ msgstr " 天"
-#, fuzzy, c-format
+#, fuzzy
#~ msgid "Could not acquire lock on file `%s': %s...\n"
#~ msgstr "无法解析“%s”(%s):%s\n"
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index 45e58299e..7ce73baef 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -681,6 +681,15 @@ GNUNET_TESTING_get_address (struct GNUNET_TESTING_NodeConnection *connection,
/**
+ * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
+ *
+ * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ */
+void
+GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology);
+
+
+/**
* Calculate the unique id identifying a node from a given connction.
*
* @param node_connection The connection we calculate the id from.
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 4d9b7c0cb..02cedc744 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1798,7 +1798,7 @@ get_first_value (char *line)
memcpy (copy, line, slen);
token = strtok_r (copy, ":", &rest);
token = strtok_r (NULL, ":", &rest);
- sscanf (token, "%u", &ret);
+ GNUNET_assert (1 == sscanf (token, "%u", &ret));
GNUNET_free (copy);
return ret;
}
@@ -1864,7 +1864,7 @@ get_second_value (char *line)
token = strtok_r (copy, ":", &rest);
token = strtok_r (NULL, ":", &rest);
token = strtok_r (NULL, ":", &rest);
- sscanf (token, "%u", &ret);
+ GNUNET_assert (1 == sscanf (token, "%u", &ret));
GNUNET_free (copy);
return ret;
}
@@ -1923,7 +1923,7 @@ get_connect_value (char *line, struct GNUNET_TESTING_NetjailNode *node)
{
node_connection->node_type = GNUNET_TESTING_GLOBAL_NODE;
token = strtok_r (NULL, ":", &rest);
- sscanf (token, "%u", &node_n);
+ GNUNET_assert (1 == sscanf (token, "%u", &node_n));
LOG (GNUNET_ERROR_TYPE_ERROR,
"node_n %u\n",
node_n);
@@ -1934,15 +1934,17 @@ get_connect_value (char *line, struct GNUNET_TESTING_NetjailNode *node)
{
node_connection->node_type = GNUNET_TESTING_SUBNET_NODE;
token = strtok_r (NULL, ":", &rest);
- sscanf (token, "%u", &node_n);
- node_connection->node_n = node_n;
- token = strtok_r (NULL, ":", &rest);
sscanf (token, "%u", &namespace_n);
node_connection->namespace_n = namespace_n;
+ token = strtok_r (NULL, ":", &rest);
+ sscanf (token, "%u", &node_n);
+ node_connection->node_n = node_n;
LOG (GNUNET_ERROR_TYPE_ERROR,
- "node_n %u namespace_n %u\n",
+ "node_n %u namespace_n %u node->node_n %u node->namespace_n %u\n",
node_n,
- namespace_n);
+ namespace_n,
+ node->node_n,
+ node->namespace_n);
}
while (NULL != (token = strtok_r (NULL, ":", &rest)))
{
@@ -1994,13 +1996,16 @@ node_connections (char *line, struct GNUNET_TESTING_NetjailNode *node)
if (NULL != temp)
{
slen = strlen (temp) + 1;
- copy = malloc (slen);
+ copy = GNUNET_malloc (slen);
memcpy (copy, temp, slen);
strtok_r (copy, ":", &rest);
value = strtok_r (rest, "|", &rest2);
while (NULL != value)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "node_connections value %s\n",
+ value);
node_connection = get_connect_value (value, node);
GNUNET_CONTAINER_DLL_insert (node->node_connections_head,
node->node_connections_tail,
@@ -2011,6 +2016,7 @@ node_connections (char *line, struct GNUNET_TESTING_NetjailNode *node)
value = strtok_r (NULL, "|", &rest2);
}
+ GNUNET_free (copy);
}
}
@@ -2056,13 +2062,7 @@ static int
log_namespaces (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
{
struct GNUNET_TESTING_NetjailNamespace *namespace = value;
- struct GNUNET_TESTING_NetjailRouter *router = namespace->router;
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "router_tcp: %u router_udp: %u spaces: %u\n",
- router->tcp_port,
- router->udp_port,
- namespace->namespace_n);
GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes, &log_nodes, NULL);
return GNUNET_YES;
}
@@ -2103,9 +2103,15 @@ GNUNET_TESTING_get_connections (unsigned int num, struct
struct GNUNET_TESTING_NetjailNamespace *namespace;
unsigned int namespace_n, node_m;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "gaga 1\n");
log_topo (topology);
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "gaga 2\n");
hkey = GNUNET_new (struct GNUNET_ShortHashCode);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "num: %u \n",
+ num);
if (topology->nodes_x >= num)
{
@@ -2118,10 +2124,10 @@ GNUNET_TESTING_get_connections (unsigned int num, struct
}
else
{
- namespace_n = (unsigned int) floor ((num - topology->nodes_x)
- / topology->nodes_m);
+ namespace_n = (unsigned int) ceil ((double) (num - topology->nodes_x)
+ / topology->nodes_m);
LOG (GNUNET_ERROR_TYPE_ERROR,
- "num: %u nodes_x: %u nodes_m: %u namespace_n: %u\n",
+ "ceil num: %u nodes_x: %u nodes_m: %u namespace_n: %u\n",
num,
topology->nodes_x,
topology->nodes_m,
@@ -2143,7 +2149,7 @@ GNUNET_TESTING_get_connections (unsigned int num, struct
hkey);
}
-
+ GNUNET_free (hkey);
return node->node_connections_head;
}
@@ -2172,10 +2178,74 @@ GNUNET_TESTING_get_pub_key (unsigned int num, struct
GNUNET_CRYPTO_eddsa_key_get_public (priv_key,
pub_key);
peer->public_key = *pub_key;
+ GNUNET_free (priv_key);
+ GNUNET_free (pub_key);
return peer;
}
+int
+free_nodes_cb (void *cls,
+ const struct GNUNET_ShortHashCode *key,
+ void *value)
+{
+ (void) cls;
+ struct GNUNET_TESTING_NetjailNode *node = value;
+ struct GNUNET_TESTING_NodeConnection *pos_connection;
+ struct GNUNET_TESTING_NodeConnection *tmp_connection;
+ struct GNUNET_TESTING_AddressPrefix *pos_prefix;
+ struct GNUNET_TESTING_AddressPrefix *tmp_prefix;
+
+ pos_connection = node->node_connections_head;
+
+ while (NULL != pos_connection->next)
+ {
+ pos_prefix = pos_connection->address_prefixes_head;
+ while (NULL != pos_prefix->next)
+ {
+ tmp_prefix = pos_prefix->next;
+ GNUNET_free (pos_prefix);
+ pos_prefix = tmp_prefix;
+ }
+ tmp_connection = pos_connection->next;
+ GNUNET_free (pos_connection);
+ pos_connection = tmp_connection;
+ }
+ return GNUNET_OK;
+}
+
+
+int
+free_namespaces_cb (void *cls,
+ const struct GNUNET_ShortHashCode *key,
+ void *value)
+{
+ (void) cls;
+ struct GNUNET_TESTING_NetjailNamespace *namespace = value;
+
+ GNUNET_free (namespace->router);
+ GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes, free_nodes_cb,
+ NULL);
+ return GNUNET_OK;
+
+}
+
+
+/**
+ * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
+ *
+ * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ */
+void
+GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
+{
+ GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
+ free_namespaces_cb, NULL);
+ GNUNET_CONTAINER_multishortmap_iterate (topology->map_globals, free_nodes_cb,
+ NULL);
+ GNUNET_free (topology);
+}
+
/**
* Calculate the unique id identifying a node from a given connction.
*
@@ -2252,7 +2322,7 @@ GNUNET_TESTING_get_address (struct GNUNET_TESTING_NodeConnection *connection,
}
else
{
- GNUNET_break (0);
+ GNUNET_assert (0);
}
return addr;
@@ -2296,24 +2366,19 @@ GNUNET_TESTING_get_topo_from_file (const char *filename)
uint64_t fs;
char *data;
char *token;
- char *key;
+ char *key = NULL;
unsigned int out;
char *rest = NULL;
char *value;
+ char *value2;
int ret;
- struct GNUNET_TESTING_NetjailTopology *topo = GNUNET_new (struct
- GNUNET_TESTING_NetjailTopology);
+ struct GNUNET_TESTING_NetjailTopology *topo;
struct GNUNET_TESTING_NetjailNode *node;
struct GNUNET_TESTING_NetjailRouter *router;
struct GNUNET_TESTING_NetjailNamespace *namespace;
struct GNUNET_ShortHashCode *hkey;
struct GNUNET_HashCode hc;
- topo->map_namespaces =
- GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
- topo->map_globals =
- GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -2339,14 +2404,22 @@ GNUNET_TESTING_get_topo_from_file (const char *filename)
return NULL;
}
- LOG (GNUNET_ERROR_TYPE_ERROR,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"data: %s\n",
data);
+ data[fs] = '\0';
token = strtok_r (data, "\n", &rest);
+ topo = GNUNET_new (struct GNUNET_TESTING_NetjailTopology);
+ topo->map_namespaces =
+ GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+ topo->map_globals =
+ GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
while (NULL != token)
{
+ if (NULL != key)
+ free (key);
key = get_key (token);
LOG (GNUNET_ERROR_TYPE_ERROR,
"In the loop with token: %s beginning with %s\n",
@@ -2457,12 +2530,12 @@ GNUNET_TESTING_get_topo_from_file (const char *filename)
LOG (GNUNET_ERROR_TYPE_ERROR,
"Get value for key udp_port on R.\n");
- value = get_value ("udp_port", token);
- ret = sscanf (value, "%u", &(router->udp_port));
+ value2 = get_value ("udp_port", token);
+ ret = sscanf (value2, "%u", &(router->udp_port));
GNUNET_break (0 != ret && 1 >= router->udp_port);
LOG (GNUNET_ERROR_TYPE_ERROR,
"udp_port: %s\n",
- value);
+ value2);
if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
topo->map_namespaces,
@@ -2554,6 +2627,7 @@ GNUNET_TESTING_get_topo_from_file (const char *filename)
}
token = strtok_r (NULL, "\n", &rest);
}
+ GNUNET_free (data);
return topo;
}
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem.c b/src/testing/testing_api_cmd_netjail_start_testsystem.c
index 9b567a01f..c3598d174 100644
--- a/src/testing/testing_api_cmd_netjail_start_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c
@@ -67,6 +67,12 @@ struct HelperMessage
struct NetJailState
{
/**
+ * Global state of the interpreter, used by a command
+ * to access information about other commands.
+ */
+ struct GNUNET_TESTING_Interpreter *is;
+
+ /**
* Context for our asynchronous completion.
*/
struct GNUNET_TESTING_AsyncContext ac;
@@ -77,12 +83,6 @@ struct NetJailState
struct GNUNET_TESTING_NetjailTopology *topology;
/**
- * Pointer to the return value of the test.
- *
- */
- unsigned int *rv;
-
- /**
* Head of the DLL which stores messages received by the helper.
*
*/
@@ -254,6 +254,7 @@ netjail_exec_cleanup (void *cls)
tbc_pos);
GNUNET_free (tbc_pos);
}
+ GNUNET_TESTING_free_topology (ns->topology);
GNUNET_free (ns);
}
@@ -429,18 +430,63 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
struct NetJailState *ns = cls;// tbc->ns;
struct HelperMessage *hp_msg;
unsigned int total_number = ns->local_m * ns->global_n + ns->known;
+ // uint16_t message_type = ntohs (message->type);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "total %u sysstarted %u peersstarted %u prep %u finished %u %u %u %u\n",
- total_number,
- ns->number_of_testsystems_started,
- ns->number_of_peers_started,
- ns->number_of_local_tests_prepared,
- ns->number_of_local_tests_finished,
- ns->local_m,
- ns->global_n,
- ns->known);
+ /*switch (message_type)
+ {
+ case GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY:
+ ns->number_of_testsystems_started++;
+ break;
+ case GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED:
+ ns->number_of_peers_started++;
+ if (ns->number_of_peers_started == total_number)
+ {
+ for (int i = 1; i <= ns->known; i++)
+ {
+ send_all_peers_started (0,i, ns);
+ }
+ for (int i = 1; i <= ns->global_n; i++)
+ {
+ for (int j = 1; j <= ns->local_m; j++)
+ {
+ send_all_peers_started (i,j, ns);
+ }
+ }
+ ns->number_of_peers_started = 0;
+ }
+ break;
+ case GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TEST_PREPARED:
+ ns->number_of_local_tests_prepared++;
+ if (ns->number_of_local_tests_prepared == total_number)
+ {
+ for (int i = 1; i <= ns->known; i++)
+ {
+ send_all_local_tests_prepared (0,i, ns);
+ }
+ for (int i = 1; i <= ns->global_n; i++)
+ {
+ for (int j = 1; j <= ns->local_m; j++)
+ {
+ send_all_local_tests_prepared (i,j, ns);
+ }
+ }
+ }
+ break;
+ case GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED:
+ ns->number_of_local_tests_finished++;
+ if (ns->number_of_local_tests_finished == total_number)
+ {
+ GNUNET_TESTING_async_finish (&ns->ac);
+ }
+ break;
+ default:
+ hp_msg = GNUNET_new (struct HelperMessage);
+ hp_msg->bytes_msg = message->size;
+ memcpy (&hp_msg[1], message, message->size);
+ GNUNET_CONTAINER_DLL_insert (ns->hp_messages_head, ns->hp_messages_tail,
+ hp_msg);
+ }*/
if (GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY == ntohs (message->type))
{
ns->number_of_testsystems_started++;
@@ -505,7 +551,16 @@ helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
}
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "total %u sysstarted %u peersstarted %u prep %u finished %u %u %u %u\n",
+ total_number,
+ ns->number_of_testsystems_started,
+ ns->number_of_peers_started,
+ ns->number_of_local_tests_prepared,
+ ns->number_of_local_tests_finished,
+ ns->local_m,
+ ns->global_n,
+ ns->known);
@@ -524,7 +579,7 @@ exp_cb (void *cls)
struct TestingSystemCount *tbc = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called exp_cb.\n");
- GNUNET_TESTING_interpreter_fail (tbc->ns->ac.is);
+ GNUNET_TESTING_async_fail (&(tbc->ns->ac));
}
@@ -560,8 +615,7 @@ create_helper_init_msg_ (const char *plugin_name)
*
*/
static void
-start_helper (struct NetJailState *ns, struct
- GNUNET_CONFIGURATION_Handle *config,
+start_helper (struct NetJailState *ns,
unsigned int m,
unsigned int n)
{
@@ -582,7 +636,6 @@ start_helper (struct NetJailState *ns, struct
struct GNUNET_TESTING_NetjailTopology *topology = ns->topology;
struct GNUNET_TESTING_NetjailNode *node;
struct GNUNET_TESTING_NetjailNamespace *namespace;
- unsigned int *rv = ns->rv;
if (0 == n)
@@ -633,14 +686,14 @@ start_helper (struct NetJailState *ns, struct
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"No SUID for %s!\n",
NETJAIL_EXEC_SCRIPT);
- *rv = 1;
+ GNUNET_TESTING_interpreter_fail (ns->is);
}
else if (GNUNET_NO == helper_check)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%s not found!\n",
NETJAIL_EXEC_SCRIPT);
- *rv = 1;
+ GNUNET_TESTING_interpreter_fail (ns->is);
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -729,8 +782,9 @@ start_helper (struct NetJailState *ns, struct
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Send handle is NULL!\n");
GNUNET_free (msg);
- *rv = 1;
+ GNUNET_TESTING_interpreter_fail (ns->is);
}
+ GNUNET_free (hkey);
}
@@ -746,12 +800,11 @@ netjail_exec_run (void *cls,
struct GNUNET_TESTING_Interpreter *is)
{
struct NetJailState *ns = cls;
- struct GNUNET_CONFIGURATION_Handle *config =
- GNUNET_CONFIGURATION_create ();
+ ns->is = is;
for (int i = 1; i <= ns->known; i++)
{
- start_helper (ns, config,
+ start_helper (ns,
i,
0);
}
@@ -760,7 +813,7 @@ netjail_exec_run (void *cls,
{
for (int j = 1; j <= ns->local_m; j++)
{
- start_helper (ns, config,
+ start_helper (ns,
j,
i);
}
diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem.c b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
index 33792f1b0..e37e955be 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -35,6 +35,11 @@
struct StopHelperState
{
+ /**
+ * The complete topology information.
+ */
+ struct GNUNET_TESTING_NetjailTopology *topology;
+
const char *helper_start_label;
/**
@@ -63,21 +68,10 @@ struct StopHelperState
static void
stop_testing_system_cleanup (void *cls)
{
+ struct StopHelperState *shs = cls;
-}
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-stop_testing_system_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- return GNUNET_OK;
+ GNUNET_TESTING_free_topology (shs->topology);
+ GNUNET_free (shs);
}
@@ -148,13 +142,13 @@ GNUNET_TESTING_cmd_stop_testing_system (const char *label,
shs->local_m = topology->nodes_m;
shs->global_n = topology->namespaces_n;
shs->known = topology->nodes_x;
+ shs->topology = topology;
struct GNUNET_TESTING_Command cmd = {
.cls = shs,
.label = label,
.run = &stop_testing_system_run,
.cleanup = &stop_testing_system_cleanup,
- .traits = &stop_testing_system_traits
};
return cmd;
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 025326de7..0bf919787 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -2119,10 +2119,9 @@ tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port)
* @param bindto String we extract the address part from.
* @return The extracted address string.
*/
-static char *
-extract_address (const char *bindto)
+static void
+extract_address (const char *bindto, char **addr)
{
-
char *start;
char *token;
char *cp;
@@ -2147,6 +2146,7 @@ extract_address (const char *bindto)
{
start++; /* skip over '['*/
cp[strlen (cp) - 1] = '\0'; /* eat ']'*/
+ *addr = GNUNET_strdup (start);
}
else
{
@@ -2154,23 +2154,20 @@ extract_address (const char *bindto)
if (strlen (bindto) == strlen (token))
{
token = strtok_r (cp, ":", &rest);
+ *addr = strdup (token);
}
else
{
token++;
res = GNUNET_strdup (token);
- GNUNET_free (cp);
- return res;
+ *addr = GNUNET_strdup (res);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "extract address 3\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "extract address with start %s\n",
- start);
-
- return GNUNET_strdup (start);
+ "tcp address: %s\n",
+ *addr);
+ GNUNET_free (cp);
}
@@ -2241,6 +2238,7 @@ extract_port (const char *addr_and_port)
GNUNET_free (cp);
return 0;
}
+ GNUNET_free (cp);
}
else
{
@@ -2250,7 +2248,6 @@ extract_port (const char *addr_and_port)
port = 0;
}
-
return port;
}
@@ -2269,10 +2266,11 @@ tcp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
unsigned int port;
struct sockaddr_in v4;
struct sockaddr_in6 v6;
- char *start;
+ char *start = GNUNET_malloc (sizeof(bindto));
// cp = GNUNET_strdup (bindto);
- start = extract_address (bindto);
+ start = GNUNET_malloc (sizeof(bindto));
+ extract_address (bindto, &start);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"start %s\n",
@@ -3604,7 +3602,8 @@ run (void *cls,
return;
}
- start = extract_address (bindto);
+ start = GNUNET_malloc (sizeof(bindto));
+ extract_address (bindto, &start);
if (1 == inet_pton (AF_INET, start, &v4.sin_addr))
{
diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index f0b47084b..c374fc2d0 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -58,6 +58,11 @@ struct TestState
*
*/
char *cfgname;
+
+ /**
+ * The complete topology information.
+ */
+ struct GNUNET_TESTING_NetjailTopology *topology;
};
static struct GNUNET_TESTING_Command block_send;
@@ -66,6 +71,8 @@ static struct GNUNET_TESTING_Command block_receive;
static struct GNUNET_TESTING_Command connect_peers;
+static struct GNUNET_TESTING_Command local_prepared;
+
/**
* Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -93,7 +100,8 @@ handle_test (void *cls,
GNUNET_TESTING_get_trait_async_context (&block_receive,
&ac);
- if ((NULL == ac) || (NULL == ac->cont))
+ GNUNET_assert (NULL != ac);
+ if (NULL == ac->cont)
GNUNET_TESTING_async_fail (ac);
else
GNUNET_TESTING_async_finish (ac);
@@ -111,7 +119,8 @@ all_peers_started ()
GNUNET_TESTING_get_trait_async_context (&block_send,
&ac);
- if ((NULL == ac) || (NULL == ac->cont))
+ GNUNET_assert (NULL != ac);
+ if (NULL == ac->cont)
GNUNET_TESTING_async_fail (ac);
else
GNUNET_TESTING_async_finish (ac);
@@ -136,10 +145,15 @@ handle_result (void *cls,
rv);
reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "message prepared\n");
ts->write_message (reply,
ntohs (reply->size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "message send\n");
GNUNET_free (ts->testdir);
GNUNET_free (ts->cfgname);
+ GNUNET_TESTING_free_topology (ts->topology);
GNUNET_free (ts);
}
@@ -167,6 +181,24 @@ notify_connect (void *cls,
/**
+ * Callback to set the flag indicating all peers are prepared to finish. Will be called via the plugin api.
+ */
+static void
+all_local_tests_prepared ()
+{
+ struct LocalPreparedState *lfs;
+
+ GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
+ &lfs);
+ GNUNET_assert (NULL != &lfs->ac);
+ if (NULL == lfs->ac.cont)
+ GNUNET_TESTING_async_fail (&lfs->ac);
+ else
+ GNUNET_TESTING_async_finish (&lfs->ac);
+}
+
+
+/**
* Function to start a local test case.
*
* @param write_message Callback to send a message to the master loop.
@@ -192,8 +224,14 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
struct GNUNET_TESTING_NetjailTopology *topology =
GNUNET_TESTING_get_topo_from_file (TOPOLOGY_CONFIG);
- if (0 == m_int)
- num = n_int;
+ ts->topology = topology;
+
+ sscanf (m, "%u", &m_int);
+ sscanf (n, "%u", &n_int);
+ sscanf (local_m, "%u", &local_m_int);
+
+ if (0 == n_int)
+ num = m_int;
else
num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
@@ -205,13 +243,11 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
"system-create",
num,
topology);
+ local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
+ "local-test-prepared",
+ write_message);
-
- sscanf (m, "%u", &m_int);
- sscanf (n, "%u", &n_int);
- sscanf (local_m, "%u", &local_m_int);
-
GNUNET_asprintf (&ts->cfgname,
"test_transport_api2_tcp_node1.conf");
@@ -253,8 +289,11 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
connect_peers,
GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
"start-peer",
- num),
+ "system-create",
+ num,
+ topology),
block_receive,
+ local_prepared,
GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
"start-peer"),
GNUNET_TESTING_cmd_system_destroy ("system-destroy",
@@ -262,6 +301,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
GNUNET_TESTING_cmd_end ()
};
+ ts->write_message = write_message;
+
GNUNET_TESTING_run (commands,
GNUNET_TIME_UNIT_FOREVER_REL,
&handle_result,
@@ -288,6 +329,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
api->start_testcase = &start_testcase;
api->all_peers_started = &all_peers_started;
+ api->all_local_tests_prepared = all_local_tests_prepared;
return api;
}
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index ee6dc0274..f3afbec48 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -58,11 +58,17 @@ struct TestState
*
*/
char *cfgname;
+
+ /**
+ * The complete topology information.
+ */
+ struct GNUNET_TESTING_NetjailTopology *topology;
};
static struct GNUNET_TESTING_Command block_send;
static struct GNUNET_TESTING_Command connect_peers;
+
static struct GNUNET_TESTING_Command local_prepared;
@@ -110,7 +116,8 @@ all_peers_started ()
GNUNET_TESTING_get_trait_async_context (&block_send,
&ac);
- if ((NULL == ac) || (NULL == ac->cont))
+ GNUNET_assert (NULL != ac);
+ if ((NULL == ac->cont))
GNUNET_TESTING_async_fail (ac);
else
GNUNET_TESTING_async_finish (ac);
@@ -142,6 +149,7 @@ handle_result (void *cls,
GNUNET_free (ts->testdir);
GNUNET_free (ts->cfgname);
+ GNUNET_TESTING_free_topology (ts->topology);
GNUNET_free (ts);
}
@@ -174,10 +182,11 @@ static void
all_local_tests_prepared ()
{
struct LocalPreparedState *lfs;
+
GNUNET_TESTING_get_trait_local_prepared_state (&local_prepared,
&lfs);
-
- if ((NULL == &lfs->ac) || (NULL == lfs->ac.cont))
+ GNUNET_assert (NULL != &lfs->ac);
+ if (NULL == lfs->ac.cont)
GNUNET_TESTING_async_fail (&lfs->ac);
else
GNUNET_TESTING_async_finish (&lfs->ac);
@@ -210,6 +219,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
struct GNUNET_TESTING_NetjailTopology *topology =
GNUNET_TESTING_get_topo_from_file (TOPOLOGY_CONFIG);
+ ts->topology = topology;
+
sscanf (m, "%u", &m_int);
sscanf (n, "%u", &n_int);
sscanf (local_m, "%u", &local_m_int);
diff --git a/src/transport/test_transport_simple_send.sh b/src/transport/test_transport_simple_send.sh
index 2dd269fcc..7e3ee032f 100755
--- a/src/transport/test_transport_simple_send.sh
+++ b/src/transport/test_transport_simple_send.sh
@@ -1,2 +1,7 @@
#!/bin/bash
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_topo.conf"
+if [ "$(sysctl -n kernel.unprivileged_userns_clone)" == 1 ]; then
+ exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_topo.conf"
+else
+ echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
+ exit 78
+fi
diff --git a/src/transport/test_transport_simple_send_topo.conf b/src/transport/test_transport_simple_send_topo.conf
index f878f9719..2c16201f5 100644
--- a/src/transport/test_transport_simple_send_topo.conf
+++ b/src/transport/test_transport_simple_send_topo.conf
@@ -1,4 +1,6 @@
M:2
N:1
X:0
-T:libgnunet_test_transport_plugin_cmd_simple_send \ No newline at end of file
+T:libgnunet_test_transport_plugin_cmd_simple_send
+P:1:1|{connect:{P:1:2:tcp}}
+P:1:2|{connect:{P:1:1:tcp}} \ No newline at end of file
diff --git a/src/transport/test_transport_udp_backchannel.sh b/src/transport/test_transport_udp_backchannel.sh
index 0c37be469..9c0b11fad 100755
--- a/src/transport/test_transport_udp_backchannel.sh
+++ b/src/transport/test_transport_udp_backchannel.sh
@@ -1,4 +1,9 @@
#!/bin/bash
+if [ "$(sysctl -n kernel.unprivileged_userns_clone)" == 1 ]; then
#exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; valgrind --leak-check=full --track-origins=yes --trace-children=yes --trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip ./test_transport_start_with_config test_transport_udp_backchannel_topo.conf"
exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_udp_backchannel_topo.conf"
# exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; valgrind --leak-check=full --track-origins=yes ./test_transport_start_with_config test_transport_udp_backchannel_topo.conf"
+else
+ echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
+ exit 78
+fi
diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
index d6bb46f7d..10729990d 100644
--- a/src/transport/transport-testing-cmds.h
+++ b/src/transport/transport-testing-cmds.h
@@ -63,12 +63,6 @@ struct ConnectPeersState
const char *start_peer_label;
/**
- * The peer identity of this peer.
- *
- */
- struct GNUNET_PeerIdentity *id;
-
- /**
* The topology of the test setup.
*/
struct GNUNET_TESTING_NetjailTopology *topology;
@@ -222,16 +216,19 @@ GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
* Create command.
*
* @param label name for command.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param num Number globally identifying the node.
* @param start_peer_label Label of the cmd to start a peer.
+ * @param start_peer_label Label of the cmd which started the test system.
+ * @param num Number globally identifying the node.
+ * @param The topology for the test setup.
* @return command.
*/
struct GNUNET_TESTING_Command
GNUNET_TRANSPORT_cmd_send_simple (const char *label,
const char *start_peer_label,
- uint32_t num);
+ const char *create_label,
+ uint32_t num,
+ struct GNUNET_TESTING_NetjailTopology *
+ topology);
/**
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 017d1bca3..2eb1b0914 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -72,6 +72,10 @@ connect_peers_run (void *cls,
cps->tl_system = tl_system;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "cps->num: %u \n",
+ cps->num);
+
cps->node_connections_head = GNUNET_TESTING_get_connections (cps->num,
cps->topology);
@@ -84,28 +88,15 @@ connect_peers_run (void *cls,
pos_prefix =
pos_prefix->next)
{
-
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "prefix: %s\n",
- pos_prefix->address_prefix);
-
addr = GNUNET_TESTING_get_address (pos_connection,
pos_prefix->address_prefix);
-
peer = GNUNET_TESTING_get_pub_key (num, tl_system);
-
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "num: %u pub_key %s addr: %s\n",
- num,
- GNUNET_CRYPTO_eddsa_public_key_to_string (&(peer->public_key)),
- addr);
-
- cps->id = peer;
-
GNUNET_TRANSPORT_application_validate (ah,
peer,
nt,
addr);
+ GNUNET_free (peer);
+ GNUNET_free (addr);
}
}
cps->con_num = con_num;
@@ -136,6 +127,7 @@ notify_connect (void *cls,
if (0 == GNUNET_memcmp (peer,
peer_connection))
con_num++;
+ GNUNET_free (peer_connection);
}
@@ -156,7 +148,6 @@ connect_peers_cleanup (void *cls)
{
struct ConnectPeersState *cps = cls;
- GNUNET_free (cps->id);
GNUNET_free (cps);
}
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
index 0631f7051..9c34c50d7 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -46,21 +46,18 @@ struct SendSimpleState
*
*/
const char *start_peer_label;
-};
+ /**
+ * Label of the cmd which started the test system.
+ *
+ */
+ const char *create_label;
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-send_simple_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
-{
- return GNUNET_OK;
-}
+ /**
+ * The topology we get the connected nodes from.
+ */
+ struct GNUNET_TESTING_NetjailTopology *topology;
+};
/**
@@ -77,7 +74,7 @@ send_simple_cleanup (void *cls)
/**
- * The run method of this cmd will send a simple message to the connected peer.
+ * The run method of this cmd will send a simple message to the connected peers.
*
*/
static void
@@ -92,31 +89,54 @@ send_simple_run (void *cls,
const struct GNUNET_TESTING_Command *peer1_cmd;
struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
struct GNUNET_HashCode hc;
- int node_number;
+ struct GNUNET_TESTING_NodeConnection *node_connections_head;
+ struct GNUNET_PeerIdentity *peer;
+ struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+ uint32_t num;
+ struct GNUNET_TESTING_NodeConnection *pos_connection;
+ const struct GNUNET_TESTING_Command *system_cmd;
+ struct GNUNET_TESTING_System *tl_system;
peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
sss->start_peer_label);
GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd,
&connected_peers_map);
- node_number = 1;
- GNUNET_CRYPTO_hash (&node_number, sizeof(node_number), &hc);
- memcpy (key,
- &hc,
- sizeof (*key));
-
- mq = GNUNET_CONTAINER_multishortmap_get (connected_peers_map,
- key);
-
- env = GNUNET_MQ_msg_extra (test,
- 2600 - sizeof(*test),
- GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
- test->num = htonl (sss->num);
- memset (&test[1],
- sss->num,
- 2600 - sizeof(*test));
- GNUNET_MQ_send (mq,
- env);
+ system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
+ sss->create_label);
+ GNUNET_TESTING_get_trait_test_system (system_cmd,
+ &tl_system);
+
+ node_connections_head = GNUNET_TESTING_get_connections (sss->num,
+ sss->topology);
+
+ for (int i = 0; i < 1; i++)
+ {
+ for (pos_connection = node_connections_head; NULL != pos_connection;
+ pos_connection = pos_connection->next)
+ {
+ num = GNUNET_TESTING_calculate_num (pos_connection, sss->topology);
+ peer = GNUNET_TESTING_get_pub_key (num, tl_system);
+ public_key = peer->public_key;
+ GNUNET_CRYPTO_hash (&public_key, sizeof(public_key), &hc);
+
+ memcpy (key,
+ &hc,
+ sizeof (*key));
+ mq = GNUNET_CONTAINER_multishortmap_get (connected_peers_map,
+ key);
+ env = GNUNET_MQ_msg_extra (test,
+ 1000 - sizeof(*test),
+ GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
+ test->num = htonl (sss->num);
+ memset (&test[1],
+ sss->num,
+ 1000 - sizeof(*test));
+ GNUNET_MQ_send (mq,
+ env);
+ }
+ }
+
GNUNET_free (key);
}
@@ -126,31 +146,34 @@ send_simple_run (void *cls,
* Create command.
*
* @param label name for command.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param num Number globally identifying the node.
* @param start_peer_label Label of the cmd to start a peer.
+ * @param start_peer_label Label of the cmd which started the test system.
+ * @param num Number globally identifying the node.
+ * @param The topology for the test setup.
* @return command.
*/
struct GNUNET_TESTING_Command
GNUNET_TRANSPORT_cmd_send_simple (const char *label,
const char *start_peer_label,
- uint32_t num)
+ const char *create_label,
+ uint32_t num,
+ struct GNUNET_TESTING_NetjailTopology *
+ topology)
{
struct SendSimpleState *sss;
sss = GNUNET_new (struct SendSimpleState);
sss->num = num;
sss->start_peer_label = start_peer_label;
- {
- struct GNUNET_TESTING_Command cmd = {
- .cls = sss,
- .label = label,
- .run = &send_simple_run,
- .cleanup = &send_simple_cleanup,
- .traits = &send_simple_traits
- };
-
- return cmd;
- }
+ sss->create_label = create_label;
+ sss->topology = topology;
+
+ struct GNUNET_TESTING_Command cmd = {
+ .cls = sss,
+ .label = label,
+ .run = &send_simple_run,
+ .cleanup = &send_simple_cleanup
+ };
+
+ return cmd;
}
diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index dc19f10eb..a026d48cc 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -235,6 +235,10 @@ start_peer_run (void *cls,
sps->tl_system = tl_system;
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Creating testing library with key number %u\n",
+ sps->no);
+
if (GNUNET_SYSERR ==
GNUNET_TESTING_configuration_create (tl_system,
sps->cfg))
@@ -255,9 +259,10 @@ start_peer_run (void *cls,
if (NULL == sps->peer)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- "Testing library failed to create unique configuration based on `%s': `%s'\n",
+ "Testing library failed to create unique configuration based on `%s': `%s' with key number %u\n",
sps->cfgname,
- emsg);
+ emsg,
+ sps->no);
GNUNET_free (emsg);
GNUNET_TESTING_interpreter_fail (is);
return;
@@ -337,6 +342,11 @@ start_peer_run (void *cls,
return;
}
sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps);
+ GNUNET_free (home);
+ GNUNET_free (transport_unix_path);
+ GNUNET_free (tcp_communicator_unix_path);
+ GNUNET_free (udp_communicator_unix_path);
+ GNUNET_free (bindto);
}