add it

diff --git a/po/it.po b/po/it.po
index b755da8da8be5b09cf2bb0b02bc40cbaa3f2ae51..0d81b37ce353bff3876bad49b21d45871a2830c5 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,15 @@
 # Italian translations for GNUnet package.
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNUnet package.
-# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018.
+#
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2019-04-07 14:40+0200\n"
-"PO-Revision-Date: 2018-08-29 13:48+0200\n"
+"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"PO-Revision-Date: 2019-04-23 20:58+0200\n"
 "Last-Translator: Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -16,87 +17,120 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
-"\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/arm_api.c:337
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/arm_monitor_api.c:321
+msgid "Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:164
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:170
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:218
+msgid "Misconfiguration (can not connect to the ARM service)"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "Unknown request status"
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242
-#, fuzzy
-msgid "is stopped"
-msgstr "# elementi memorizzati"
+#: src/arm/gnunet-arm.c:224
+msgid "Request does not fit into a message"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+msgid "Request timed out"
+msgstr "Richiesta scaduta"
+
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+msgid "Unknown request status"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:244
-msgid "is starting"
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#, c-format
+msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246
-msgid "is stopping"
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#, c-format
+msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248
-msgid "is starting already"
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#, c-format
+msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250
-msgid "is stopping already"
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#, c-format
+msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252
-msgid "is started already"
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#, c-format
+msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254
-msgid "is stopped already"
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#, c-format
+msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256
-msgid "service is not known to ARM"
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#, c-format
+msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258
-msgid "service failed to start"
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#, c-format
+msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260
-msgid "service cannot be manipulated because ARM is shutting down"
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#, c-format
+msgid "%s service failed to start"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:262
-msgid "Unknown result code."
+#, c-format
+msgid "%s service cannot be started because ARM is shutting down"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
+#, c-format
+msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:368
+#: src/arm/gnunet-arm.c:369
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
@@ -106,1059 +140,929 @@ msgstr ""
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
-#, c-format
-msgid "Failed to send a request to start the `%s' service: %s\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:421
+#, fuzzy, c-format
+#| msgid "Failed to start service `%s'\n"
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:468
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:479
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:525
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
 msgstr "Servizi in esecuzione:\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s arrestato.\n"
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:646
 #, c-format
 msgid "Starting %s...\n"
 msgstr "Avvio di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Arresto di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:660
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:724
 msgid "stop all GNUnet services"
 msgstr "arresta tutti i servizi GNUnet"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:730
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:733
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
-msgid "exit with error status if operation does not finish after DELAY"
+#: src/arm/gnunet-arm.c:744
+msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
 msgstr "elenca i servizi in esecuzione"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:388 src/transport/plugin_transport_tcp.c:1120
-#: src/transport/tcp_service_legacy.c:557
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3835
-#: src/transport/tcp_service_legacy.c:576
-#: src/transport/tcp_service_legacy.c:582 src/util/service.c:1150
-#: src/util/service.c:1156
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:457 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:521
-#: src/util/service.c:1195
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:462 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:526
-#: src/util/service.c:1200
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:495 src/transport/plugin_transport_tcp.c:1211
-#: src/transport/tcp_service_legacy.c:648 src/util/service.c:1236
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:517 src/transport/plugin_transport_tcp.c:1228
-#: src/transport/tcp_service_legacy.c:665 src/util/service.c:1254
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:556
-#: src/transport/plugin_transport_http_server.c:2688
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/tcp_service_legacy.c:696 src/util/service.c:1295
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
+#: src/arm/gnunet-service-arm.c:266
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:575
-#: src/transport/plugin_transport_http_server.c:2706
-#: src/transport/plugin_transport_tcp.c:1278
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1315
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/arm/gnunet-service-arm.c:302
+msgid "Could not send list result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:529
 #, c-format
 msgid "Failed to start service `%s'\n"
-msgstr ""
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/arm/gnunet-service-arm.c:997
+#: src/arm/gnunet-service-arm.c:540
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/arm/gnunet-service-arm.c:1109
+#: src/arm/gnunet-service-arm.c:639
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1144
+#: src/arm/gnunet-service-arm.c:661
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1187
+#: src/arm/gnunet-service-arm.c:695
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1346
+#: src/arm/gnunet-service-arm.c:831
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1651
+#: src/arm/gnunet-service-arm.c:1100
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1812
+#: src/arm/gnunet-service-arm.c:1193
 msgid "exit"
 msgstr "uscita"
 
-#: src/arm/gnunet-service-arm.c:1817
+#: src/arm/gnunet-service-arm.c:1198
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1822
+#: src/arm/gnunet-service-arm.c:1203
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/arm/gnunet-service-arm.c:1828
+#: src/arm/gnunet-service-arm.c:1209
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1854
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1870
+#: src/arm/gnunet-service-arm.c:1246
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
+#: src/arm/gnunet-service-arm.c:1500
+#, fuzzy, c-format
+#| msgid "Starting service `%s'\n"
+msgid "Starting default services `%s'\n"
+msgstr "Avvio del servizio '%s' in corso\n"
+
+#: src/arm/gnunet-service-arm.c:1511
+#, c-format
+msgid "Default service `%s' not configured correctly!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1524
+msgid "No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#: src/ats/ats_api_performance.c:468
 #, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/ats_api_performance.c:511
 #, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
+#: src/ats/gnunet-service-ats_addresses.c:1980
+#: src/ats/gnunet-service-ats_addresses.c:2024
 #, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
+msgid "Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
+#: src/ats/gnunet-ats-solver-eval.c:2205
+#: src/ats/gnunet-service-ats_addresses.c:1987
+#, c-format
+msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
+#: src/ats/gnunet-ats-solver-eval.c:2212
+#: src/ats/gnunet-service-ats_addresses.c:1995
+#, c-format
+msgid "No outbound quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "print logging"
+#: src/ats/gnunet-ats-solver-eval.c:2239
+#: src/ats/gnunet-service-ats_addresses.c:2031
+#, c-format
+msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
+#: src/ats/gnunet-ats-solver-eval.c:2246
+#: src/ats/gnunet-service-ats_addresses.c:2039
+#, c-format
+msgid "No outbound quota configure for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
+#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats-tests/gnunet-solver-eval.c:919
+msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-new.c:756
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
+#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: src/ats-tests/gnunet-solver-eval.c:922
+#: src/ats-tests/gnunet-solver-eval.c:925
+msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:2680
+msgid "print logging"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:314
+#: src/ats/gnunet-service-ats_addresses.c:2217
 #, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
+msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:359
+#: src/ats/gnunet-service-ats_addresses.c:2220
 #, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats/plugin_ats2_common.c:90
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s': `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
+#: src/ats/gnunet-service-ats_addresses.c:2243
+#, fuzzy
+#| msgid "Failed to start HTTP server\n"
+msgid "Failed to initialize solver!\n"
+msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/ats/plugin_ats_mlp.c:1274
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1870
+#: src/ats/plugin_ats_mlp.c:1329
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1914
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2476
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2516 src/ats/plugin_ats_mlp.c:2533
-#: src/ats/plugin_ats_mlp.c:2565 src/ats/plugin_ats_mlp.c:2583
-#: src/ats/plugin_ats_mlp.c:2602 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
-msgid "Invalid %s configuration %f \n"
+msgid "Adjusting inconsistent outbound quota configuration for network `%s', is %llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2671
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
+msgid "Adjusting inconsistent inbound quota configuration for network `%s', is %llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2680
+#: src/ats/plugin_ats_mlp.c:2142
 #, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
+msgid "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2690
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgid "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2699
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats/plugin_ats_proportional.c:1511
 #, c-format
-msgid "Invalid %s configuration %f\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:422
+#: src/ats-tests/ats-testing.c:72
+msgid "Benchmarking done\n"
+msgstr "Benchmark completato\n"
+
+#: src/ats-tests/ats-testing.c:105
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/ats-tests/ats-testing.c:413
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:429
+#: src/ats-tests/ats-testing.c:419
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
+#: src/ats-tests/ats-testing.c:450
+msgid "Connecting peers on CORE level\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:892
+#: src/ats-tests/ats-testing.c:461
 #, c-format
-msgid "Start logging `%s'\n"
+msgid "Connecting master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-ats-sim.c:90
+#: src/ats-tests/ats-testing.c:470
 #, c-format
-msgid ""
-"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
-"= %u KiB/s\n"
+msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:307
-#, c-format
-msgid "%u address resolutions had a timeout\n"
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+msgid "Initialization failed, shutdown\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:842
+msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:311
+#: src/ats-tests/ats-testing-log.c:893
 #, c-format
-msgid "ATS returned stat_results for %u addresses\n"
+msgid "Start logging `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:395
+#: src/ats-tests/gnunet-ats-sim.c:86
 #, c-format
-msgid ""
-"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
-"s, %s\n"
+msgid "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. = %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:402
-msgid "active "
+#: src/ats-tool/gnunet-ats.c:169
+#, c-format
+msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:402
-msgid "inactive "
+#: src/ats-tool/gnunet-ats.c:171
+#, c-format
+msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:232
 #, c-format
-msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:705
+#: src/ats-tool/gnunet-ats.c:413
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
+#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#, c-format
+msgid "Service `%s' is not running\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:773
+#: src/ats-tool/gnunet-ats.c:454
 #, c-format
-msgid "Please select one operation: %s or %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
-#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
+#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
+#, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
+#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
+#, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:862
+#: src/ats-tool/gnunet-ats.c:515
+#, c-format
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:869
+#: src/ats-tool/gnunet-ats.c:520
+#, c-format
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:887
+#: src/ats-tool/gnunet-ats.c:536
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:950
+#: src/ats-tool/gnunet-ats.c:594
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:596
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:960
-msgid "connect to PEER"
-msgstr ""
-
-#: src/ats-tool/gnunet-ats.c:964
+#: src/ats-tool/gnunet-ats.c:599
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:969
+#: src/ats-tool/gnunet-ats.c:601
 msgid "monitor mode"
-msgstr ""
+msgstr "modalità monitor"
 
-#: src/ats-tool/gnunet-ats.c:974
+#: src/ats-tool/gnunet-ats.c:603
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:979
+#: src/ats-tool/gnunet-ats.c:605
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:984
+#: src/ats-tool/gnunet-ats.c:607
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:990
+#: src/ats-tool/gnunet-ats.c:610
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:996
+#: src/ats-tool/gnunet-ats.c:612
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1001
+#: src/ats-tool/gnunet-ats.c:615
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:1011
+#: src/ats-tool/gnunet-ats.c:622
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:181
-msgid "duration until auction starts"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:186
-msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:193
-msgid "public auction outcome"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:198
-msgid "keep running in foreground until auction completes"
-msgstr ""
-
-#: src/auction/gnunet-auction-create.c:209
-msgid "create a new auction and start listening for bidders"
-msgstr ""
-
-#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
-#: src/conversation/gnunet-conversation-test.c:254
-#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:631
-#, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:718
-msgid "Extra arguments are not applicable in combination with this option.\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:795
-#, c-format
-msgid "Invalid target `%s'\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:832
-msgid "No action requested\n"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:857
-msgid "Provide information about a particular connection"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:861
-msgid "Activate echo mode"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:866
-msgid "Listen for connections using a shared secret among sender and recipient"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:871
-msgid "Provide information about a patricular peer"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:875
-msgid "Provide information about all peers"
-msgstr ""
-
-#: src/cadet/gnunet-cadet.c:879
-msgid "Provide information about all tunnels"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:523
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:535
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:529
-msgid ""
-"how many peers (random selection without replacement) receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:440
+msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:462
+#: src/consensus/gnunet-consensus-profiler.c:443
+#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
+#: src/set/gnunet-set-profiler.c:292
 msgid "number of values"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:541
+#: src/consensus/gnunet-consensus-profiler.c:446
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:548
+#: src/consensus/gnunet-consensus-profiler.c:449
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:480
-msgid "write statistics to file"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:559
-msgid "distribute elements to a static subset of good peers"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:564
+#: src/consensus/gnunet-consensus-profiler.c:452
+#: src/secretsharing/gnunet-secretsharing-profiler.c:550
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:515
-#: src/conversation/conversation_api_call.c:494
+#: src/conversation/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:470
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:277
+#: src/conversation/gnunet-conversation.c:264
 #, c-format
-msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:302
+#: src/conversation/gnunet-conversation.c:286
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:337
+#: src/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:324
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:360
+#: src/conversation/gnunet-conversation.c:342
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:375
+#: src/conversation/gnunet-conversation.c:356
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:387
+#: src/conversation/gnunet-conversation.c:368
 #, c-format
-msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
+msgid "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/conversation/gnunet-conversation.c:390
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:418
+#: src/conversation/gnunet-conversation.c:397
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Connessione stabilita con `%s'\n"
 
-#: src/conversation/gnunet-conversation.c:425
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:433
-#, c-format
-msgid "Call to `%s' terminated\n"
+#: src/conversation/gnunet-conversation.c:411
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:442
+#: src/conversation/gnunet-conversation.c:417
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:448
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:453
+#: src/conversation/gnunet-conversation.c:428
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:524
+#: src/conversation/gnunet-conversation.c:495
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/conversation/gnunet-conversation.c:540
-#: src/conversation/gnunet-conversation.c:554
+#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:525
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
-#: src/conversation/gnunet-conversation.c:603
+#: src/conversation/gnunet-conversation.c:518
+#: src/conversation/gnunet-conversation.c:575
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:562
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:588
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:572
+#: src/conversation/gnunet-conversation.c:544
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:627
+#: src/conversation/gnunet-conversation.c:599
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:616
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:699
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:704
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:710
-#: src/conversation/gnunet-conversation.c:734
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
-msgid ""
-"We had an internal error setting up our phone line. You can still make "
-"calls.\n"
+#: src/conversation/gnunet-conversation.c:686
+msgid "We had an internal error setting up our phone line. You can still make calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:724
+#: src/conversation/gnunet-conversation.c:695
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:729
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
-msgid "We are calling `%s', their phone should be ringing.\n"
+msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:748
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:754
+#: src/conversation/gnunet-conversation.c:725
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:783
-#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:831
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:863
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:880
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:915
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:923
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:970
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:972
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:974
-msgid ""
-"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
-"calls, no argument is needed to resume the current outgoing call."
+#: src/conversation/gnunet-conversation.c:945
+msgid "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:976
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:978
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:980
+#: src/conversation/gnunet-conversation.c:951
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:982
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1198
+#: src/conversation/gnunet-conversation.c:1151
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1211
+#: src/conversation/gnunet-conversation.c:1164
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1199
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1223
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
-msgid "sets the NAME of the ego to use for the caller ID"
+#: src/conversation/gnunet-conversation.c:1249
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1307
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1336
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/conversation/gnunet-conversation-test.c:121
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:145
+#: src/conversation/gnunet-conversation-test.c:149
 #, c-format
 msgid ""
 "\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+"We are now playing your recording back.  If you can hear it, your audio settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:216
+#: src/conversation/gnunet-conversation-test.c:215
 #, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+msgid "We will now be recording you for %s. After that time, the recording will be played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/template/gnunet-template.c:70
+msgid "help text"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:325
+#: src/conversation/gnunet-helper-audio-playback.c:305
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:587
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:653
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:658
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-record.c:550
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:672
+#: src/conversation/gnunet-helper-audio-playback.c:631
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
-#: src/conversation/gnunet-helper-audio-record.c:594
+#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:706
-#: src/conversation/gnunet-helper-audio-record.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:712
-#: src/conversation/gnunet-helper-audio-record.c:623
+#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:726
-#: src/conversation/gnunet-helper-audio-record.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:733
-#: src/conversation/gnunet-helper-audio-record.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-record.c:626
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:739
-#: src/conversation/gnunet-helper-audio-record.c:650
+#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:818
+#: src/conversation/gnunet-helper-audio-playback.c:768
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:353
+#: src/conversation/gnunet-helper-audio-playback-gst.c:325
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:344
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:432
+#: src/conversation/gnunet-helper-audio-record.c:420
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:474
+#: src/conversation/gnunet-helper-audio-record.c:458
 msgid "Got signal, exiting.\n"
 msgstr "Segnale ricevuto. Uscita in corso.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:483
 msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:505
+#: src/conversation/gnunet-helper-audio-record.c:488
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:513
+#: src/conversation/gnunet-helper-audio-record.c:496
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:517
+#: src/conversation/gnunet-helper-audio-record.c:500
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:524
+#: src/conversation/gnunet-helper-audio-record.c:507
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:533
+#: src/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:581
+#: src/conversation/gnunet-helper-audio-record.c:563
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:695
+#: src/conversation/gnunet-helper-audio-record.c:676
 msgid "ogg_stream_init() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:740
+#: src/conversation/gnunet-helper-audio-record.c:721
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to allocate %d bytes for second packet\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/conversation/gnunet-service-conversation.c:841
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:932
 #, c-format
-msgid "Failed to allocate %u bytes for second packet\n"
+msgid "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1305
+#: src/conversation/gnunet-service-conversation.c:1338
 #, c-format
-msgid "Could not open line, port %s already in use!\n"
+msgid "Received incoming channel on port %u\n"
 msgstr ""
 
 #: src/conversation/microphone.c:121
 msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
-#, c-format
-msgid "PHONE version %u not supported\n"
-msgstr ""
-
-#: src/conversation/plugin_gnsrecord_conversation.c:135
-#: src/conversation/plugin_gnsrecord_conversation.c:149
+#: src/conversation/plugin_gnsrecord_conversation.c:116
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
@@ -1167,805 +1071,663 @@ msgstr ""
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:90
-#, fuzzy
-msgid "fresh connection"
-msgstr "# connessioni attive"
-
-#: src/core/gnunet-core.c:93
-msgid "key sent"
-msgstr ""
-
-#: src/core/gnunet-core.c:96
-msgid "key received"
+#: src/core/core_api.c:767
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
-#, fuzzy
-msgid "connection established"
-msgstr "Connessione stabilita con `%s'\n"
-
-#: src/core/gnunet-core.c:102
-msgid "rekeying"
-msgstr ""
+#: src/core/gnunet-core.c:80
+#, c-format
+msgid "Peer `%s'\n"
+msgstr "Peer `%s'\n"
 
-#: src/core/gnunet-core.c:105
-msgid "disconnected"
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
+msgid "Connected to"
 msgstr ""
 
-#: src/core/gnunet-core.c:115
-#, fuzzy
-msgid "unknown state"
-msgstr "indirizzo sconosciuto"
-
-#: src/core/gnunet-core.c:120
-#, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
+msgid "Disconnected from"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
+#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:155
-msgid "Failed to connect to CORE service!\n"
-msgstr ""
-
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
+#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:186
+#: src/core/gnunet-core.c:244
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:347
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:105
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:371
-msgid "# dequeuing CAR (duplicate request)"
-msgstr ""
+#: src/core/gnunet-service-core.c:126
+#, fuzzy, c-format
+#| msgid "Starting service `%s'\n"
+msgid "Core service of `%4s' ready.\n"
+msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/core/gnunet-service-core.c:443
-#, c-format
-msgid "# bytes of messages of type %u received"
+#: src/core/gnunet-service-core_clients.c:370
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core_clients.c:480
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core_clients.c:526
 #, c-format
-msgid "# messages of type %u discarded (client busy)"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:988
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1009
-#, fuzzy, c-format
-msgid "Core service of `%s' ready.\n"
-msgstr "Avvio del servizio '%s' in corso\n"
-
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:535
 msgid "# bytes encrypted"
 msgstr "# byte crittografati"
 
-#: src/core/gnunet-service-core_kx.c:677
+#: src/core/gnunet-service-core_kx.c:586
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:779
-msgid "# PAYLOAD dropped (out of order)"
+#: src/core/gnunet-service-core_kx.c:673
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:829
-msgid "# key exchanges initiated"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:891
+#: src/core/gnunet-service-core_kx.c:713
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:925
-#, fuzzy
-msgid "# PING messages transmitted"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:810
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1005
-msgid "# duplicate ephemeral keys ignored"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1040
-msgid "# EPHEMERAL_KEYs rejected (bad signature)"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:816
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# ephemeral keys received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1054
+#: src/core/gnunet-service-core_kx.c:850
 #, c-format
-msgid ""
-"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
-"our system time (%llu not in [%llu,%llu]).\n"
+msgid "Ephemeral key message from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1060
-msgid "# EPHEMERAL_KEY messages rejected due to time"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1080
+#: src/core/gnunet-service-core_kx.c:861
 #, fuzzy
-msgid "# valid ephemeral keys received"
-msgstr "# messaggi PONG ricevuti"
+#| msgid "# SYN messages received"
+msgid "# EPHEMERAL_KEY messages received"
+msgstr "# messaggi SYN ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1180
-#: src/transport/gnunet-service-transport_validation.c:1129
+#: src/core/gnunet-service-core_kx.c:951
+#: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:959
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1248
+#: src/core/gnunet-service-core_kx.c:986
+#, c-format
+msgid "Received PING from `%s' for different identity: I am `%s', PONG identity: `%s'\n"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1003
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1274
+#: src/core/gnunet-service-core_kx.c:1029
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1287
+#: src/core/gnunet-service-core_kx.c:1039
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/transport/gnunet-service-transport_validation.c:1462
+#: src/core/gnunet-service-core_kx.c:1096
+#: src/transport/gnunet-service-transport_validation.c:1328
 msgid "# PONG messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1358
+#: src/core/gnunet-service-core_kx.c:1102
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1107
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1137
 msgid "# PONG messages decrypted"
 msgstr "# messaggi PONG decrittati"
 
-#: src/core/gnunet-service-core_kx.c:1436
+#: src/core/gnunet-service-core_kx.c:1171
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1447
+#: src/core/gnunet-service-core_kx.c:1181
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1454
+#: src/core/gnunet-service-core_kx.c:1188
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1642
+#: src/core/gnunet-service-core_kx.c:1328
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1650
+#: src/core/gnunet-service-core_kx.c:1335
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1653
+#: src/core/gnunet-service-core_kx.c:1338
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1742
-#: src/core/gnunet-service-core_kx.c:1768
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1408
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1755
+#: src/core/gnunet-service-core_kx.c:1395
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1797
+#: src/core/gnunet-service-core_kx.c:1437
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1805
+#: src/core/gnunet-service-core_kx.c:1445
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
-#: src/dht/gnunet-service-dht_neighbours.c:741
-#: src/dht/gnunet-service-dht_neighbours.c:804
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:617
-#: src/topology/gnunet-daemon-topology.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:720
-#: src/transport/gnunet-service-transport_neighbours.c:728
-msgid "# peers connected"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:296
-msgid "# type map refreshes sent"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:416
-msgid "# outdated typemap confirmations received"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:433
-msgid "# valid typemap confirmations received"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
-msgid "# type maps received"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:212
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/credential/credential_misc.c:88
-#, c-format
-msgid "Unable to parse CRED record string `%s'\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:994
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:280
-#: src/credential/gnunet-credential.c:434
-#, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:361
-#: src/credential/gnunet-credential.c:423
-#, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:372
-#: src/credential/gnunet-credential.c:444
-#, c-format
-msgid "Failed to connect to CREDENTIAL\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:379
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:387
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:403
-#, c-format
-msgid "Subject public key needed\n"
+#: src/core/gnunet-service-core_kx.c:1480
+msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:414
-#, c-format
-msgid "Subject public key `%s' is not well-formed\n"
+#: src/core/gnunet-service-core_neighbours.c:168
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:451
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:335
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:504
-#, c-format
-msgid "Issuer ego required\n"
+#: src/core/gnunet-service-core_neighbours.c:252
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:516
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:536
-msgid "create credential"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:540
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:545
-msgid "The public key of the subject to lookup the credential for"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:550
-msgid "The name of the credential presented by the subject"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:555
-msgid "The public key of the authority to verify the credential against"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:560
-msgid "The ego to use"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:565
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:570
-msgid "The time to live for the credential"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:574
-msgid "collect credentials"
-msgstr ""
-
-#: src/credential/gnunet-credential.c:588
-msgid "GNUnet credential resolver tool"
+#: src/core/gnunet-service-core_sessions.c:216
+#: src/core/gnunet-service-core_sessions.c:288
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1141
+#: src/transport/gnunet-service-transport_neighbours.c:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3438
+msgid "# peers connected"
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:185
-#: src/gns/gnunet-gns-helper-service-w32.c:727
-#, c-format
-msgid "Failed to connect to GNS\n"
+#: src/core/gnunet-service-core_sessions.c:255
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore.c:1019
-#: src/namestore/gnunet-namestore-fcfsd.c:1138
-#, c-format
-msgid "Failed to connect to namestore\n"
+#: src/core/gnunet-service-core_sessions.c:426
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/credential/plugin_gnsrecord_credential.c:186
-#, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+msgid "# type maps received"
 msgstr ""
 
-#: src/credential/plugin_rest_credential.c:1128
-msgid "GNS REST API initialized\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
-#: src/datastore/gnunet-service-datastore.c:757
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
+#: src/datastore/gnunet-service-datastore.c:838
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
 msgid "# items stored"
 msgstr "# elementi memorizzati"
 
-#: src/datacache/datacache.c:206
+#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
+#, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
+
+#: src/datacache/datacache.c:184
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:217
+#: src/datacache/datacache.c:192
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:345
+#: src/datacache/datacache.c:295
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:355
+#: src/datacache/datacache.c:304
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:385
-msgid "# requests for random value received"
-msgstr ""
-
-#: src/datacache/datacache.c:417
-msgid "# proximity search requests received"
+#: src/datacache/plugin_datacache_heap.c:406
+msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:553
-msgid "Heap datacache running\n"
+#: src/datacache/plugin_datacache_postgres.c:392
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:118
-#: src/datacache/plugin_datacache_sqlite.c:127
-#: src/datastore/plugin_datastore_mysql.c:892
-#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:81 src/my/my.c:93
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:52
-#: src/reclaim/plugin_reclaim_sqlite.c:52
+#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_sqlite.c:52
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:56
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:53
-#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:819 src/include/gnunet_common.h:828
-#: src/scalarproduct/scalarproduct.h:35
+#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:863
-#: src/datastore/plugin_datastore_sqlite.c:508
-#: src/namecache/plugin_namecache_sqlite.c:229
-#: src/namestore/plugin_namestore_sqlite.c:265
-#: src/reclaim/plugin_reclaim_sqlite.c:336
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/datacache/plugin_datacache_sqlite.c:450
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:348
-msgid "DATASTORE disconnected"
+#: src/datacache/plugin_datacache_sqlite.c:484
+#: src/datastore/plugin_datastore_sqlite.c:404
+#: src/namecache/plugin_namecache_sqlite.c:295
+#: src/namestore/plugin_namestore_sqlite.c:327
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:468
-msgid "Disconnected from DATASTORE"
+#: src/datacache/plugin_datacache_sqlite.c:491
+#, fuzzy, c-format
+#| msgid "Failed to start service `%s'\n"
+msgid "Failed to close statement %p: %d\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/datacache/plugin_datacache_template.c:125
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:569
+#: src/datastore/datastore_api.c:310
+#, fuzzy
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to transmit request to drop database.\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/datastore/datastore_api.c:394
+#, fuzzy
+#| msgid "Request timed out"
+msgid "# queue entry timeouts"
+msgstr "Richiesta scaduta"
+
+#: src/datastore/datastore_api.c:443
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:599
+#: src/datastore/datastore_api.c:471
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:760
-msgid "# status messages received"
-msgstr ""
-
-#: src/datastore/datastore_api.c:814
-msgid "# Results received"
+#: src/datastore/datastore_api.c:491
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:920
+#: src/datastore/datastore_api.c:533
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1034
-msgid "# PUT requests executed"
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1095
-msgid "# RESERVE requests executed"
-msgstr ""
+#: src/datastore/datastore_api.c:638
+#, fuzzy
+#| msgid "# bytes sent via SMTP"
+msgid "# bytes sent to datastore"
+msgstr "# byte inviati via SMTP"
 
-#: src/datastore/datastore_api.c:1160
-msgid "# RELEASE RESERVE requests executed"
+#: src/datastore/datastore_api.c:770
+msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:1238
-msgid "# REMOVE requests executed"
-msgstr ""
+#: src/datastore/datastore_api.c:784
+#, fuzzy
+#| msgid "Error reading from `%s': %s\n"
+msgid "Error reading response from datastore service"
+msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/datastore/datastore_api.c:1298
-msgid "# GET REPLICATION requests executed"
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
+msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1360
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/datastore/datastore_api.c:806
+msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1441
-msgid "# GET requests executed"
+#: src/datastore/datastore_api.c:876
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:189
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
+#: src/datastore/datastore_api.c:944
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
+#: src/datastore/datastore_api.c:1005
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:261
-msgid "Error queueing datastore GET operation\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1065
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# UPDATE requests executed"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412
-#, c-format
-msgid "Unable to open dump file: %s\n"
+#: src/datastore/datastore_api.c:1129
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:326
-#, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr ""
+#: src/datastore/datastore_api.c:1174
+#, fuzzy
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to receive response from database.\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/datastore/gnunet-datastore.c:340
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
+#: src/datastore/datastore_api.c:1233
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
+#: src/datastore/datastore_api.c:1300
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:389
-msgid "Error queueing datastore PUT operation\n"
+#: src/datastore/datastore_api.c:1363
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:432
-msgid "Input file is not of a supported format\n"
+#: src/datastore/datastore_api.c:1424
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:458
-msgid "Failed connecting to the datastore.\n"
+#: src/datastore/gnunet-datastore.c:114
+#, c-format
+msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:470
+#: src/datastore/gnunet-datastore.c:200
 #, c-format
-msgid "Please choose at least one operation: %s, %s\n"
+msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:493
-msgid "Dump all records from the datastore"
+#: src/datastore/gnunet-datastore.c:246
+msgid "specifies the configuration to use to access an alternative datastore; will merge that datastore into our current datastore"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:497
-msgid "Insert records into the datastore"
+#: src/datastore/gnunet-datastore.c:255
+msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:502
-msgid "File to dump or insert"
+#: src/datastore/gnunet-service-datastore.c:351
+msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:511
-msgid "Manipulate GNUnet datastore"
+#: src/datastore/gnunet-service-datastore.c:425
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:338
-msgid "# bytes expired"
+#: src/datastore/gnunet-service-datastore.c:483
+#: src/gns/gnunet-gns-helper-service-w32.c:223
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:420
-msgid "# bytes purged (low-priority)"
+#: src/datastore/gnunet-service-datastore.c:514
+#: src/gns/gnunet-gns-helper-service-w32.c:262
+msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:562
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:603
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
-"%llu bytes\n"
+msgid "Insufficient space (%llu bytes are available) to satisfy `%s' request for %llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:614
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:620
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/datastore/gnunet-service-datastore.c:688
+msgid "Insufficient space to satisfy request and requested amount is larger than cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:627
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:837
-#: src/datastore/gnunet-service-datastore.c:1469
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:773
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:876
+#: src/datastore/gnunet-service-datastore.c:1010
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:907
-#, fuzzy
-msgid "# GET KEY requests received"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/datastore/gnunet-service-datastore.c:920
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1050
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# UPDATE requests received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/datastore/gnunet-service-datastore.c:1080
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:989
+#: src/datastore/gnunet-service-datastore.c:1113
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1036
+#: src/datastore/gnunet-service-datastore.c:1138
 msgid "Content not found"
 msgstr "Contenuto non trovato"
 
-#: src/datastore/gnunet-service-datastore.c:1043
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1088
+#: src/datastore/gnunet-service-datastore.c:1178
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1137
-#, c-format
-msgid ""
-"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1143
-#: src/datastore/gnunet-service-datastore.c:1318
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
-msgid "New payload: %lld\n"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1197
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1209
+#: src/datastore/gnunet-service-datastore.c:1290
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1269
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1325
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1336
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1506
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1522
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1527
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr "# dimensione cache"
 
-#: src/datastore/gnunet-service-datastore.c:1543
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1561
-#: src/datastore/gnunet-service-datastore.c:1577
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1609
+#: src/datastore/gnunet-service-datastore.c:1582
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:893
-msgid "Heap database running\n"
+#: src/datastore/gnunet-service-datastore.c:1611
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1616
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:371
-#: src/datastore/plugin_datastore_mysql.c:423
-#: src/datastore/plugin_datastore_mysql.c:1075
-msgid "MySQL statement run failure"
+#: src/datastore/gnunet-service-datastore.c:1619
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:678
-msgid "Data too large"
+#: src/datastore/plugin_datastore_heap.c:820
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:848
+#: src/datastore/plugin_datastore_mysql.c:783
+#, fuzzy, c-format
+#| msgid "Failed to start service `%s'\n"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/datastore/plugin_datastore_mysql.c:791
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1180
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:280
-#: src/datastore/plugin_datastore_postgres.c:897
-msgid "Postgress exec failure"
-msgstr ""
-
-#: src/datastore/plugin_datastore_postgres.c:858
+#: src/datastore/plugin_datastore_postgres.c:824
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:956
+#: src/datastore/plugin_datastore_postgres.c:860
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/datastore/plugin_datastore_sqlite.c:57
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:59
+#: src/testbed/gnunet-daemon-testbed-underlay.c:58
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:173
-#: src/namestore/plugin_namestore_sqlite.c:206
-#: src/peerstore/plugin_peerstore_sqlite.c:535
-#: src/reclaim/plugin_reclaim_sqlite.c:212
+#: src/datastore/plugin_datastore_sqlite.c:255
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:629
-msgid "sqlite bind failure"
+#: src/datastore/plugin_datastore_sqlite.c:663
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1327
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1361
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Using sqlite page utilization to estimate payload (%llu pages of size %llu bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1405
-#: src/namecache/plugin_namecache_sqlite.c:557
-#: src/namestore/plugin_namestore_sqlite.c:751
-#: src/reclaim/plugin_reclaim_sqlite.c:711
+#: src/datastore/plugin_datastore_sqlite.c:1215
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:253
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/dht_api.c:376
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to connect to the DHT service!\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1973,829 +1735,1032 @@ msgid ""
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:159
-#, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:219
-msgid "Issuing DHT GET with key"
+#: src/dht/gnunet-dht-get.c:173
+msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:253
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:263
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:280
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:319
-msgid "how long should the monitor command run"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
-#: src/nse/gnunet-nse-profiler.c:878
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:337
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:949 src/rps/gnunet-rps-profiler.c:2962
-msgid "number of peers to start"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:300
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/dht/gnunet-dht-get.c:225
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
+#: src/dht/gnunet-dht-monitor.c:293
+msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
+#: src/dht/gnunet-dht-put.c:118
+msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+#: src/dht/gnunet-dht-put.c:121
+msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1009
-msgid "Measure quality and performance of the DHT service."
+#: src/dht/gnunet-dht-put.c:124
+msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:134
+#: src/dht/gnunet-dht-put.c:153
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:142
-msgid "Could not connect to DHT service!\n"
+#: src/dht/gnunet-dht-put.c:160
+#, c-format
+msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:176
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:188
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:211
-msgid "use DHT's record route option"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:369
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to connect to transport service!\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:838
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:483
+#: src/dht/gnunet-service-dht_clients.c:513
+#: src/dht/gnunet-service-xdht_clients.c:927
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:616
+#: src/dht/gnunet-service-dht_clients.c:597
+#: src/dht/gnunet-service-xdht_clients.c:1013
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:842
+#: src/dht/gnunet-service-dht_clients.c:798
+#: src/dht/gnunet-service-xdht_clients.c:1214
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1027
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-xdht_clients.c:498
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1042
+#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-xdht_clients.c:511
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1088
+#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-xdht_clients.c:548
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1095
+#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-xdht_clients.c:571
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1173
+#: src/dht/gnunet-service-dht_clients.c:1166
+#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-xdht_clients.c:625
+#: src/dht/gnunet-service-xdht_clients.c:668
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:73
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-xdht_clients.c:635
+msgid "Could not pass reply to client, message too big!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:83
+#: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
+#: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:219
+#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:225
+#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:231
+#: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:243
+#: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:247
+#: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:282
+#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:86
+#: src/dht/gnunet-service-dht_hello.c:84
+#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:679
+#: src/dht/gnunet-service-dht_neighbours.c:516
+msgid "# Preference updates given to core"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:852
+#: src/dht/gnunet-service-dht_neighbours.c:764
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:703
+msgid "# Bytes transmitted to other peers"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:742
+msgid "# Bytes of bandwidth requested from core"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:889
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1055
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1072
-#: src/dht/gnunet-service-dht_neighbours.c:1114
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
-#: src/dht/gnunet-service-dht_neighbours.c:1455
-#: src/dht/gnunet-service-dht_neighbours.c:1558
+#: src/dht/gnunet-service-dht_neighbours.c:1323
+#: src/dht/gnunet-service-dht_neighbours.c:1440
+#: src/dht/gnunet-service-dht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:794
+#: src/dht/gnunet-service-xdht_neighbours.c:860
+#: src/dht/gnunet-service-xdht_neighbours.c:919
+#: src/dht/gnunet-service-xdht_neighbours.c:981
+#: src/dht/gnunet-service-xdht_neighbours.c:1041
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1400
+#: src/dht/gnunet-service-dht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
-msgid "# Expired PUTs discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:1684
+#: src/dht/gnunet-service-dht_neighbours.c:1636
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1688
+#: src/dht/gnunet-service-dht_neighbours.c:1639
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1914
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1922
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2084
+#: src/dht/gnunet-service-dht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2088
+#: src/dht/gnunet-service-dht_neighbours.c:1907
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2153
+#: src/dht/gnunet-service-dht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2174
+#: src/dht/gnunet-service-dht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2351
-msgid "# Expired results discarded"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:2367
+#: src/dht/gnunet-service-dht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2371
+#: src/dht/gnunet-service-dht_neighbours.c:2055
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:223
+#: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:237
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:243
+#: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:249
+#: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:261
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:339
+#: src/dht/gnunet-service-dht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:415
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:437
+#: src/dht/gnunet-service-dht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:189
+#: src/dht/gnunet-service-xdht_neighbours.c:1398
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1514
+#: src/dht/gnunet-service-xdht_neighbours.c:1524
+#: src/dht/gnunet-service-xdht_neighbours.c:1530
+#: src/dht/gnunet-service-xdht_neighbours.c:1536
+#: src/dht/gnunet-service-xdht_neighbours.c:1545
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:198
+#: src/dht/plugin_block_dht.c:145
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:209
+#: src/dht/plugin_block_dht.c:155
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS queries"
+#: src/dns/dnsparser.c:257
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:370
-msgid "Monitor DNS queries."
+#: src/dns/dnsparser.c:856
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:237
-msgid "set A records"
+#: src/dns/dnsstub.c:175
+#, c-format
+msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:243
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to send DNS request to %s\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/dns/dnsstub.c:299
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:368
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:440
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:355
+msgid "only monitor DNS queries"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:358
+msgid "only monitor DNS replies"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:369
+msgid "Monitor DNS queries."
+msgstr ""
+
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
+msgstr ""
+
+#: src/dns/gnunet-dns-redirector.c:239
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:256
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:462
+#: src/dns/gnunet-service-dns.c:456
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:610
+#: src/dns/gnunet-service-dns.c:603
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:740
+#: src/dns/gnunet-service-dns.c:714
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:815
+#: src/dns/gnunet-service-dns.c:792
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:930
+#: src/dns/gnunet-service-dns.c:907
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:946
+#: src/dns/gnunet-service-dns.c:923
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:955
+#: src/dns/gnunet-service-dns.c:932
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
-msgid "DNS interceptor got non-DNS packet (dropped)\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:967
+#: src/dns/gnunet-service-dns.c:942
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1034
+#: src/dns/gnunet-service-dns.c:1009
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1092
+#: src/dv/gnunet-dv.c:169
+msgid "verbose output"
+msgstr ""
+
+#: src/dv/gnunet-dv.c:178
+msgid "Print information about DV state"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:802
 #, c-format
-msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:960
-msgid "# TCP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:853
+msgid "# Bytes transmitted via mesh channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1061
-msgid "# ICMP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1340
-msgid "# UDP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1047
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
-#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
-#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
-#: src/exit/gnunet-daemon-exit.c:2207
-msgid "# Bytes received from CADET"
+#: src/exit/gnunet-daemon-exit.c:1054
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1467
-msgid "# UDP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1130
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1575
-msgid "# UDP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1204
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1615
-msgid "# TCP service creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1256
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1704
-msgid "# TCP IP-exit creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1270
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1788
-msgid "# TCP DATA requests dropped (no session)"
+#: src/exit/gnunet-daemon-exit.c:1296
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1825
-msgid "# TCP data requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1323
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1956
-msgid "# ICMP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:1369
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
-#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
-#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1377
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
-#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
-#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1759
+msgid "# TCP packets sent via TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1872
+#, fuzzy
+#| msgid "# active connections"
+msgid "# TCP service creation requests received via mesh"
+msgstr "# connessioni attive"
+
+#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
+#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
+#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
+#: src/exit/gnunet-daemon-exit.c:2966
+msgid "# Bytes received from MESH"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
+#, c-format
+msgid "No service %s found for %s on port %d!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1914
+msgid "# TCP requests dropped (no such service)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1971
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2076
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# TCP data requests received via mesh"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/exit/gnunet-daemon-exit.c:2090
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2210
-msgid "# ICMP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2150
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
-#: src/vpn/gnunet-service-vpn.c:2096
+#: src/exit/gnunet-daemon-exit.c:2324
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/exit/gnunet-daemon-exit.c:2573
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# ICMP service requests received via mesh"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
-#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
-msgid "# Inbound CADET channels created"
+#: src/exit/gnunet-daemon-exit.c:2748
+msgid "# UDP packets sent via TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2862
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# UDP IP-exit requests received via mesh"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/exit/gnunet-daemon-exit.c:2969
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# UDP service requests received via mesh"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/exit/gnunet-daemon-exit.c:2995
+msgid "# UDP requests dropped (no such service)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3031
+msgid "# Inbound MESH channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
 #, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2541
-msgid "# Messages transmitted via cadet channels"
+#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2719
-msgid "# ICMP packets dropped (not allowed)"
+#: src/exit/gnunet-daemon-exit.c:3300
+#, c-format
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2727
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2801
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:3337
+#, c-format
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2873
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:3527
+msgid "This system does not support IPv4, will disable IPv4 functions despite them being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2921
-msgid "# Packets received from TUN"
+#: src/exit/gnunet-daemon-exit.c:3535
+msgid "This system does not support IPv6, will disable IPv6 functions despite them being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2935
-msgid "# Bytes received from TUN"
+#: src/exit/gnunet-daemon-exit.c:3542
+msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2961
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:3548
+msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use ENABLE_IPv6=YES\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3664
+msgid "Must be a number"
+msgstr "Deve essere un numero"
+
+#: src/exit/gnunet-daemon-exit.c:3813
+msgid "Daemon to run to provide an IP exit node for the VPN"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:55
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:77
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:83
+#, fuzzy
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to create statistics!\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:120
+msgid "GNUnet experimentation daemon"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2988
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
 #, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3034
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
 #, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu sec. \n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
 #, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
 #, c-format
-msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
 #, c-format
-msgid "`%s' is not a valid port number (for domain `%s')!"
+msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3318
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
 #, c-format
-msgid "No addresses found for hostname `%s' of service `%s'!\n"
+msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
 #, c-format
-msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3357
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
 #, c-format
-msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3501
-msgid ""
-"This system does not support IPv4, will disable IPv4 functions despite them "
-"being enabled in the configuration\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
+#, fuzzy, c-format
+#| msgid "Failed to start service `%s'\n"
+msgid "Failed to parse file `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
+msgid "No valid experiment issuers configured! Set value to public keys of issuers! Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3509
-msgid ""
-"This system does not support IPv6, will disable IPv6 functions despite them "
-"being enabled in the configuration\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+msgid "Invalid value for public key\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3516
-msgid ""
-"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
-"ENABLE_IPv4=YES\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
+#, c-format
+msgid "Cannot read experiments file `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3522
-msgid ""
-"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
-"ENABLE_IPv6=YES\n"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3690
-msgid "Must be a number"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3805
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
-msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
-msgid "No useful service enabled.  Exiting.\n"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
+#, fuzzy, c-format
+#| msgid "Connection established to `%s'\n"
+msgid "Connected to peer %s\n"
+msgstr "Connessione stabilita con `%s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
+#, c-format
+msgid "Disconnected from peer %s\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3966
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+msgid "Failed to connect to CORE service!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
+#, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
+#, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
+#, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:275
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1554
+#: src/fragmentation/defragmentation.c:456
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:538
+#: src/fragmentation/defragmentation.c:521
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:556
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:208
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:245
+#: src/fragmentation/fragmentation.c:211
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:278
+#: src/fragmentation/fragmentation.c:237
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:325
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:331
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:456
+#: src/fragmentation/fragmentation.c:405
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:463
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:487
+#: src/fragmentation/fragmentation.c:435
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:499
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:474
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:518
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1126
+#: src/fs/fs_api.c:1066
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1646
+#: src/fs/fs_api.c:1571
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1662
+#: src/fs/fs_api.c:1585
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2322
+#: src/fs/fs_api.c:2242
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2332
+#: src/fs/fs_api.c:2252
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2478
+#: src/fs/fs_api.c:2395
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
+#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2696
+#: src/fs/fs_api.c:2610
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2959
+#: src/fs/fs_api.c:2855
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3054
+#: src/fs/fs_api.c:2949
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:213
+#: src/fs/fs_directory.c:208
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+#: src/fs/fs_download.c:322
+msgid "Recursive downloads of directories larger than 4 GB are not supported on 32-bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:335
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:347
-#, c-format
-msgid ""
-"Failed to access full directroy contents of `%s' for recursive download\n"
-msgstr ""
-
-#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
+#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:956
+#: src/fs/fs_download.c:905
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1047
+#: src/fs/fs_download.c:987
 #, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)"
+msgid "Internal error or bogus download URI (expected %u bytes at depth %u and offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1013
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1099
+#: src/fs/fs_download.c:1036
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1111
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1120
+#: src/fs/fs_download.c:1055
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1220
+#: src/fs/fs_download.c:1153
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1885
+#: src/fs/fs_download.c:1944
 msgid "Invalid URI"
 msgstr ""
 
-#: src/fs/fs_getopt.c:235
+#: src/fs/fs_getopt.c:192
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+msgid "Unknown metadata type in metadata option `%s'.  Using metadata type `unknown' instead.\n"
+msgstr ""
+
+#: src/fs/fs_list_indexed.c:90
+#, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:152
+#: src/fs/fs_list_indexed.c:113
 #, c-format
-msgid "Failed to receive response from `%s' service.\n"
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:196
+#: src/fs/fs_list_indexed.c:151
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:128
+#: src/fs/fs_misc.c:126
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
@@ -2805,981 +2770,945 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:232
+#: src/fs/fs_namespace.c:229
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:324
+#: src/fs/fs_namespace.c:320
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:470
+#: src/fs/fs_namespace.c:466
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:725
-#, fuzzy, c-format
-msgid "Can not index file `%s': %s.\n"
-msgstr "Connessione stabilita con `%s'\n"
-
-#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:827 src/fs/fs_publish.c:848
-#: src/fs/fs_publish.c:878 src/fs/fs_publish.c:1144
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:784
-msgid "error on index-start request to `fs' service"
+#: src/fs/fs_publish.c:669
+msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:829
+#: src/fs/fs_publish.c:681
+#, fuzzy
+#| msgid "unknown"
+msgid "unknown error"
+msgstr "sconosciuto"
+
+#: src/fs/fs_publish.c:725
 msgid "failed to compute hash"
-msgstr ""
+msgstr "impossibile calcolare l'hash"
 
-#: src/fs/fs_publish.c:849
+#: src/fs/fs_publish.c:745
 msgid "filename too long"
-msgstr ""
+msgstr "nome file troppo lungo"
 
-#: src/fs/fs_publish.c:880
+#: src/fs/fs_publish.c:770
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:906
+#: src/fs/fs_publish.c:793
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:995 src/fs/fs_publish.c:1031
-msgid "Can not create LOC URI. Will continue with CHK instead.\n"
-msgstr ""
-
-#: src/fs/fs_publish.c:1098
+#: src/fs/fs_publish.c:862
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1106
+#: src/fs/fs_publish.c:868
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1146
+#: src/fs/fs_publish.c:915
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1385
+#: src/fs/fs_publish.c:1151
 #, c-format
-msgid "Datastore failure: %s"
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1476
+#: src/fs/fs_publish.c:1243
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:220
+#: src/fs/fs_publish_ksk.c:219
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:241
+#: src/fs/fs_publish_ublock.c:219
 msgid "Internal error."
-msgstr ""
+msgstr "Errore interno."
 
-#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
+#: src/fs/fs_search.c:813
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:979
+#: src/fs/fs_search.c:872
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:68
+#: src/fs/fs_unindex.c:64
 msgid "Failed to read file"
+msgstr "Impossibile leggere il file"
+
+#: src/fs/fs_unindex.c:234
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:275
-msgid "Error communicating with `fs' service."
+#: src/fs/fs_unindex.c:242
+msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:326
+#: src/fs/fs_unindex.c:250
+msgid "Invalid response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:291
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:384
+#: src/fs/fs_unindex.c:355
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:443
+#: src/fs/fs_unindex.c:414
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:639
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:704
+#: src/fs/fs_unindex.c:673
 msgid "Failed to compute hash of file."
-msgstr ""
+msgstr "Impossibile calcolare l'hash del file."
 
-#: src/fs/fs_uri.c:234
+#: src/fs/fs_uri.c:222
 #, no-c-format
-msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:281
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:311
-msgid "Malformed KSK URI (`++' not allowed)"
-msgstr ""
-
-#: src/fs/fs_uri.c:318
-msgid "Malformed KSK URI (quotes not balanced)"
-msgstr ""
-
-#: src/fs/fs_uri.c:388
-msgid "Malformed SKS URI (wrong syntax)"
-msgstr ""
-
-#: src/fs/fs_uri.c:429
-msgid "Malformed CHK URI (wrong syntax)"
+#: src/fs/fs_uri.c:299
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:444
-msgid "Malformed CHK URI (failed to decode CHK)"
+#: src/fs/fs_uri.c:306
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:523
-msgid "LOC URI malformed (wrong syntax)"
+#: src/fs/fs_uri.c:376
+msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:538
-msgid "LOC URI malformed (no CHK)"
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
+msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:548
-msgid "LOC URI malformed (missing LOC)"
+#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
+msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:556
-msgid "LOC URI malformed (wrong syntax for public key)"
+#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
+msgid "LOC URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
-msgid "LOC URI malformed (could not find signature)"
-msgstr ""
-
-#: src/fs/fs_uri.c:576
-msgid "LOC URI malformed (wrong syntax for signature)"
+#: src/fs/fs_uri.c:559
+msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
-msgid "LOC URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
-msgid "LOC URI malformed (wrong syntax for expiration time)"
+#: src/fs/fs_uri.c:586
+msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "LOC URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:598
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
-msgid "LOC URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:636
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:643
-msgid "invalid argument"
+#: src/fs/fs_uri.c:860
+msgid "Lacking key configuration settings.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:655
-msgid "Unrecognized URI type"
+#: src/fs/fs_uri.c:866
+#, c-format
+msgid "Could not access hostkey file `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
+#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1092
+#: src/fs/fs_uri.c:1083
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:232
+#: src/fs/gnunet-auto-share.c:236
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
-#: src/fs/gnunet-auto-share.c:305
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:407
+#: src/fs/gnunet-auto-share.c:401
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:494
+#: src/fs/gnunet-auto-share.c:488
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:504
+#: src/fs/gnunet-auto-share.c:497
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:713
+#: src/fs/gnunet-auto-share.c:686
 #, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
+msgid "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:907
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:813
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:648
+#: src/fs/gnunet-daemon-fsprofiler.c:660
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:105
+#: src/fs/gnunet-directory.c:94
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:108
+#: src/fs/gnunet-directory.c:97
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:143
+#: src/fs/gnunet-directory.c:132
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:156
+#: src/fs/gnunet-directory.c:145
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:165
+#: src/fs/gnunet-directory.c:154
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:194
+#: src/fs/gnunet-directory.c:183
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:139
+#: src/fs/gnunet-download.c:137
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:149
+#: src/fs/gnunet-download.c:147
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:158
+#: src/fs/gnunet-download.c:157
 #, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:184
+#: src/fs/gnunet-download.c:179
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:201
+#: src/fs/gnunet-download.c:194
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:215 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:234
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:872
-#: src/fs/gnunet-search.c:273 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:315
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:344
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:354
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:359
+#: src/fs/gnunet-download.c:318
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:364
+#: src/fs/gnunet-download.c:322
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:368
+#: src/fs/gnunet-download.c:325
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:386
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fs/gnunet-download.c:339
+msgid "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
+#: src/fs/gnunet-fs.c:117
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:130
+#: src/fs/gnunet-fs.c:127
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:217
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:233
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:239
+#: src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:246
+#: src/fs/gnunet-publish.c:260
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 "L'URI è `%s'.\n"
 "\n"
 
-#: src/fs/gnunet-publish.c:259
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr ""
-"L'URI è `%s'.\n"
-"\n"
-
-#: src/fs/gnunet-publish.c:275
-msgid "Starting cleanup after abort\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:282
-msgid "Cleanup after abort completed.\n"
+#: src/fs/gnunet-publish.c:283
+msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:288
-msgid "Cleanup after abort failed.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:430
+#: src/fs/gnunet-publish.c:401
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:435
+#: src/fs/gnunet-publish.c:403
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:590
+#: src/fs/gnunet-publish.c:542
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:615
+#: src/fs/gnunet-publish.c:565
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:649
+#: src/fs/gnunet-publish.c:598
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:600
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:659
+#: src/fs/gnunet-publish.c:605
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:610
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:671
+#: src/fs/gnunet-publish.c:614
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-publish.c:618
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
-msgid "Error scanning directory.\n"
-msgstr ""
+#: src/fs/gnunet-publish.c:625
+#, fuzzy
+#| msgid "Internal error."
+msgid "Internal error scanning directory.\n"
+msgstr "Errore interno."
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:749
+#: src/fs/gnunet-publish.c:682
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:763
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
+#: src/fs/gnunet-publish.c:695
+msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:754
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:832
+#: src/fs/gnunet-publish.c:760
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:210
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859
-#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1344
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:911
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:916
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-publish.c:835
+msgid "print list of extracted keywords that would be used, but do not perform upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:922
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-publish.c:839
+msgid "add an additional keyword for the top-level file or directory (this option can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:928
+#: src/fs/gnunet-publish.c:843
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:932
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/fs/gnunet-publish.c:846
+msgid "do not index, perform full insertion (stores entire file in encrypted form in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:938
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/fs/gnunet-publish.c:851
+msgid "specify ID of an updated version to be published in the future (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-publish.c:859
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:959
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-publish.c:865
+msgid "only simulate the process but do not do any actual publishing (useful to compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/fs/gnunet-publish.c:869
+msgid "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:971
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/fs/gnunet-publish.c:873
+msgid "URI to be published (can be used instead of passing a file to add keywords to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:989
+#: src/fs/gnunet-publish.c:889
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:127
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:207
+#: src/fs/gnunet-search.c:191
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:263
+#: src/fs/gnunet-search.c:240
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:287
+#: src/fs/gnunet-search.c:264
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:295
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:329
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:335
+#: src/fs/gnunet-search.c:305
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:351
+#: src/fs/gnunet-search.c:316
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
-msgid "# client searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:436
-msgid "# replies received for local clients"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:605
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:836
-msgid "# client searches received"
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
+#, c-format
+msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:875
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_cp.c:682
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1040
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1280
-msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/fs/gnunet-service-fs_cp.c:721
+msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1202
-#, c-format
-msgid "Failed to connect to `%s' service.\n"
+#: src/fs/gnunet-service-fs_cp.c:727
+msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:370
-msgid "# replies received via cadet"
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:384
-msgid "# replies received via cadet dropped"
+#: src/fs/gnunet-service-fs_cp.c:845
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:265
-msgid "# queries received via CADET not answered"
+#: src/fs/gnunet-service-fs_cp.c:898
+msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:320
-msgid "# Blocks transferred via cadet"
+#: src/fs/gnunet-service-fs_cp.c:906
+msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:346
-msgid "# queries received via cadet"
+#: src/fs/gnunet-service-fs_cp.c:920
+msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:388
-#, fuzzy
-msgid "# cadet client connections rejected"
-msgstr "# connessioni attive"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:435
-#, fuzzy
-msgid "# cadet connections active"
-msgstr "# connessioni attive"
-
-#: src/fs/gnunet-service-fs_cp.c:685
-msgid "# migration stop messages received"
+#: src/fs/gnunet-service-fs_cp.c:958
+msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:689
-#, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+#: src/fs/gnunet-service-fs_cp.c:1026
+msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:722 src/fs/gnunet-service-fs_cp.c:1344
-msgid "# P2P searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:817
-msgid "# artificial delays introduced (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:874
-msgid "# replies dropped due to type mismatch"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:882
-msgid "# replies received for other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:896
-msgid "# replies dropped due to insufficient cover traffic"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:943
-msgid "# P2P searches destroyed due to ultimate reply"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1014
-msgid "# requests done for free (low load)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1039
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1061
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1147
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1139
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1204
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1173
+msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1195
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1240
-msgid "# requests dropped due to full reply queue"
+#: src/fs/gnunet-service-fs_cp.c:1246
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1296
-msgid "# requests dropped due TTL underflow"
+#: src/fs/gnunet-service-fs_cp.c:1270
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1707
+#: src/fs/gnunet-service-fs_cp.c:1670
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:134
-#: src/fs/gnunet-service-fs_indexing.c:195
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:151
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, c-format
 msgid "Error writing `%s'.\n"
+msgstr "Errore durante la scrittura di `%s'.\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:237
+#, c-format
+msgid "Index request received for file `%s' is already indexed as `%s'.  Permitting anyway.\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:275
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:253
+#: src/fs/gnunet-service-fs_indexing.c:477
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:357
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:361
+#: src/fs/gnunet-service-fs_indexing.c:559
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:394
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:518
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-service-fs_lc.c:256
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:427
-msgid "# delay heap timeout (ms)"
+#: src/fs/gnunet-service-fs_lc.c:327
+msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:438
-msgid "# query plans executed"
+#: src/fs/gnunet-service-fs_lc.c:362
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_client.c:484
+msgid "# replies received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_client.c:498
+msgid "# replies received via mesh dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:260
+msgid "# Blocks transferred via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:352
+msgid "# queries received via mesh not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:432
+msgid "# queries received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:476
+#, fuzzy
+#| msgid "# active connections"
+msgid "# mesh client connections rejected"
+msgstr "# connessioni attive"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
+#, fuzzy
+#| msgid "# active connections"
+msgid "# mesh connections active"
+msgstr "# connessioni attive"
+
+#: src/fs/gnunet-service-fs_pe.c:269
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:466
+#: src/fs/gnunet-service-fs_pe.c:400
+msgid "# transmission failed (core has no bandwidth)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:433
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:536
+#: src/fs/gnunet-service-fs_pe.c:484
+msgid "# delay heap timeout (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:492
+msgid "# query plans executed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:552
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:546
+#: src/fs/gnunet-service-fs_pe.c:560
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
-#: src/fs/gnunet-service-fs_pe.c:788
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:330
+#: src/fs/gnunet-service-fs_pr.c:311
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:858
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:894
+#: src/fs/gnunet-service-fs_pr.c:844
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:853
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:918
+#: src/fs/gnunet-service-fs_pr.c:867
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:935
+#: src/fs/gnunet-service-fs_pr.c:880
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1065
+#: src/fs/gnunet-service-fs_pr.c:1001
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1093
+#: src/fs/gnunet-service-fs_pr.c:1029
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1131
+#: src/fs/gnunet-service-fs_pr.c:1064
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
-msgid "# Replies received from CADET"
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Replies received from MESH"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1314
+#: src/fs/gnunet-service-fs_pr.c:1244
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1264
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1395
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1454
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1509
+#: src/fs/gnunet-service-fs_pr.c:1311
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1524
+#: src/fs/gnunet-service-fs_pr.c:1326
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1548
+#: src/fs/gnunet-service-fs_pr.c:1335
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1562
+#: src/fs/gnunet-service-fs_pr.c:1350
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1583
+#: src/fs/gnunet-service-fs_pr.c:1377
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1588
+#: src/fs/gnunet-service-fs_pr.c:1382
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1626
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1467
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1639
+#: src/fs/gnunet-service-fs_pr.c:1478
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1693
+#: src/fs/gnunet-service-fs_pr.c:1566
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1749
+#: src/fs/gnunet-service-fs_pr.c:1651
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:646
+#: src/fs/gnunet-service-fs_push.c:631
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3797,2422 +3726,2284 @@ msgstr ""
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:129
+#: src/fs/gnunet-unindex.c:130
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:146
+#: src/fs/gnunet-unindex.c:147
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:178
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_tld_api.c:348
-msgid "Expected a base32-encoded public zone key\n"
+#: src/gns/gns_api.c:393
+msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:127
+#: src/gns/gnunet-bcd.c:123
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:357
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, c-format
-msgid "Invalid port number %u.  Exiting.\n"
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:362
+#: src/gns/gnunet-bcd.c:360
 #, c-format
-msgid "Businesscard HTTP server starts on %u\n"
+msgid "Businesscard HTTP server starts on %llu\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:376
+#: src/gns/gnunet-bcd.c:374
 #, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:523
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:536
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:214
+#: src/gns/gnunet-dns2gns.c:228
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:400
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:440
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:600
+#: src/gns/gnunet-dns2gns.c:701
+msgid "No ego configured for `dns2gns` subsystem\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:727
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:748
+#: src/gns/gnunet-dns2gns.c:749
+msgid "No valid GNS zone specified!\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:770
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:753
-msgid "UDP port to listen on for inbound DNS requests; default: 2853"
+#: src/gns/gnunet-dns2gns.c:773
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:776
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:779
+msgid "UDP port to listen on for inbound DNS requests; default: 53"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:782
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:795
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
-msgid "how long to wait between queries"
+#: src/gns/gnunet-gns.c:227
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:308
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:587
-msgid "how long to wait for an answer"
+#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#, c-format
+msgid "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:591
-msgid "look for GNS2DNS records instead of ANY"
+#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#, c-format
+msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:399
 #, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:449
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:452
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:455
+msgid "Specify timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:458
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
-msgid "GNUnet GNS resolver tool"
+#: src/gns/gnunet-gns.c:461
+msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
+#: src/gns/gnunet-gns.c:464
+msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:701
-msgid ""
-"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
-"gns-import.sh?\n"
+#: src/gns/gnunet-gns.c:478
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:768
+#, 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.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:739
+#: src/gns/gnunet-gns-helper-service-w32.c:838
 #, c-format
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:452
+#: src/gns/gnunet-gns-import.c:479
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1062
+#: src/transport/plugin_transport_http_client.c:1077
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:833
 #, c-format
-msgid "Unsupported CURL TLS backend %d\n"
+msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:856
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:879
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:892
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:907
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:917
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:941
 #, c-format
-msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1086
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:1602
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:1973
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2684
-#, c-format
-msgid "Unable to import certificate from `%s'\n"
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2003
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Unable to import certificate %s\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/gns/gnunet-gns-proxy.c:2885
+#: src/gns/gnunet-gns-proxy.c:2177
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2196
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:2504
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:2533
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:2970
+msgid "No ego configured for `shorten-zone`\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3010
 #, c-format
-msgid "Failed to load X.509 key and certificate from `%s'\n"
+msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3821
-msgid "listen on specified port (default: 7777)"
+#: src/gns/gnunet-gns-proxy.c:3072
+#, c-format
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
-msgid "pem file to use as CA"
+#: src/gns/gnunet-gns-proxy.c:3113
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
-msgid "disable use of IPv6"
+#: src/gns/gnunet-gns-proxy.c:3116
+msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3135
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:506
-msgid "Properly base32-encoded public key required"
+#: src/gns/gnunet-service-gns.c:862
+msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:542
+#: src/gns/gnunet-service-gns.c:870
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:561
-#: src/zonemaster/gnunet-service-zonemaster.c:875
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/gns/gnunet-service-gns.c:903
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:259
+#: src/gns/gnunet-service-gns.c:919
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "valid public key required"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:366
+#: src/gns/gnunet-service-gns_interceptor.c:369
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:700
-#, c-format
-msgid "Protocol `%s' unknown, skipping labels.\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:711
-#, c-format
-msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:914
+#: src/gns/gnunet-service-gns_resolver.c:816
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:958
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1365
-#, c-format
-msgid "VPN returned empty result for `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:1806
+#: src/gns/gnunet-service-gns_resolver.c:1317
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1849
-#, c-format
-msgid "GNS lookup failed (zero records found for `%s')\n"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_resolver.c:2264
+#: src/gns/gnunet-service-gns_resolver.c:1817
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2287
+#: src/gns/gnunet-service-gns_resolver.c:1841
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2450
+#: src/gns/gnunet-service-gns_resolver.c:2123
 #, c-format
-msgid "GNS namecache returned empty result for `%s'\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2585
+#: src/gns/gnunet-service-gns_resolver.c:2272
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:181
+#: src/gns/plugin_gnsrecord_gns.c:151
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:212
+#: src/gns/plugin_gnsrecord_gns.c:180
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:233
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:258
+#: src/gns/plugin_gnsrecord_gns.c:217
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:294
-#, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr ""
-
-#: src/gns/plugin_rest_gns.c:452
-msgid "Gns REST API initialized\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:359
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:380
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:402
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:487
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:523
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:542
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:565
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:588
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:603
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:630
-#, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:646
-#, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:663
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:687
-#: src/gnsrecord/plugin_gnsrecord_dns.c:703
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:126
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:129
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:147
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:174
+#: src/hello/gnunet-hello.c:170
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:210
+#: src/hello/gnunet-hello.c:195
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:219
+#: src/hello/gnunet-hello.c:203
 #, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
+msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:1110
+#: src/hello/hello.c:944
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1119
+#: src/hello/hello.c:953
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:1129
+#: src/hello/hello.c:963
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:1140
+#: src/hello/hello.c:973
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1158
+#: src/hello/hello.c:990
 #, c-format
-msgid "Plugin `%s' not found, skipping address\n"
+msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1166
+#: src/hello/hello.c:999
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1181
+#: src/hello/hello.c:1018
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:259
+msgid "None of the functions for the hostlist daemon were enabled.  I have no reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:376
+#: src/hostlist/gnunet-daemon-hostlist.c:308
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:381
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/hostlist/gnunet-daemon-hostlist.c:313
+msgid "bootstrap using hostlists (it is highly recommended that you always use this option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:385
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:390
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:406
+#: src/hostlist/gnunet-daemon-hostlist.c:335
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/hostlist-client.c:288
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/hostlist-client.c:664
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+msgid "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/hostlist-client.c:836
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/hostlist-client.c:1049
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/hostlist-client.c:1285
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/hostlist-client.c:1296
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/hostlist-client.c:1329
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/hostlist-client.c:1331
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/hostlist-client.c:1376
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
-#, c-format
-msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/hostlist-client.c:1471
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/hostlist-client.c:1483
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/hostlist-client.c:1495
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1499
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/hostlist-server.c:137
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/hostlist-server.c:161
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
-#: src/peerinfo-tool/gnunet-peerinfo.c:385
-#: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:862
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/hostlist-server.c:210
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/hostlist-server.c:268
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/hostlist-server.c:271
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/hostlist-server.c:284
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/hostlist-server.c:288
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/hostlist-server.c:296
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/hostlist-server.c:299
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/hostlist-server.c:303
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/hostlist-server.c:304
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/hostlist-server.c:346
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
-#: src/transport/gnunet-service-transport.c:2827
-msgid "Could not access PEERINFO service.  Exiting.\n"
+#: src/hostlist/hostlist-server.c:390
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
+#: src/transport/gnunet-service-transport.c:1114
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/hostlist-server.c:590
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
-#, fuzzy, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/hostlist-server.c:630
 #, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+#| msgid "`%s' is not a valid IP address.\n"
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/hostlist-server.c:673
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:179
+#: src/identity/gnunet-identity.c:165
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:201
+#: src/identity/gnunet-identity.c:184
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:356
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:362
+#: src/identity/gnunet-identity.c:330
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:367
+#: src/identity/gnunet-identity.c:333
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:373
-msgid ""
-"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+#: src/identity/gnunet-identity.c:336
+msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:378
+#: src/identity/gnunet-identity.c:339
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:384
-msgid ""
-"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+#: src/identity/gnunet-identity.c:342
+msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:398
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:391
+#: src/identity/gnunet-service-identity.c:338
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:416
+#: src/identity/gnunet-service-identity.c:362
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
-#: src/identity/gnunet-service-identity.c:790
-#: src/identity/gnunet-service-identity.c:918
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:515
+#: src/identity/gnunet-service-identity.c:446
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:610
+#: src/identity/gnunet-service-identity.c:516
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:765
+#: src/identity/gnunet-service-identity.c:647
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:808
-#: src/identity/gnunet-service-identity.c:936
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:971
+#: src/identity/gnunet-service-identity.c:829
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1029
+#: src/identity/gnunet-service-identity.c:902
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1039
+#: src/identity/gnunet-service-identity.c:914
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1297
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/json/json.c:123
-#, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr ""
-
-#: src/my/my.c:196 src/my/my.c:215
-#, c-format
-msgid "%s failed at %s:%d with error: %s\n"
-msgstr ""
-
-#: src/mysql/mysql.c:180
+#: src/mesh/gnunet-mesh.c:357
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/mysql/mysql.c:187
+#: src/mesh/gnunet-mesh.c:607
 #, c-format
-msgid "Could not access file `%s': %s\n"
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:107
+#: src/mesh/gnunet-mesh.c:650
 #, c-format
-msgid "No records found for `%s'"
+msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+#: src/mesh/gnunet-mesh.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:183
-#, c-format
-msgid "You must specify which zone should be accessed\n"
+#: src/mesh/gnunet-mesh.c:807
+msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:193
-#, c-format
-msgid "Invalid public key for zone `%s'\n"
+#: src/mesh/gnunet-mesh.c:810
+msgid "activate echo mode"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:201
-#, c-format
-msgid "You must specify a name\n"
-msgstr "È necessario specificare un nome\n"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1575
-msgid "name of the record to add/delete/display"
+#: src/mesh/gnunet-mesh.c:816
+msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:238
-msgid "spezifies the public key of the zone to look in"
+#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
+msgid "provide information about all peers"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1632
-msgid "GNUnet zone manipulation tool"
+#: src/mesh/gnunet-mesh.c:825
+msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/namecache/namecache_api.c:296
-msgid "Namecache failed to cache block"
+#: src/mesh/gnunet-mesh.c:828
+msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/namecache/namecache_api.c:383
-msgid "Error communicating with namecache service"
+#: src/mesh/gnunet-service-mesh_peer.c:390
+msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:121
-#: src/namecache/plugin_namecache_flat.c:255
-#: src/namestore/plugin_namestore_heap.c:179
-#: src/namestore/plugin_namestore_heap.c:412
-#: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:538
+#: src/mysql/mysql.c:174
 #, c-format
-msgid "Unable to initialize file: %s.\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:132
-#: src/namestore/plugin_namestore_heap.c:190
-#: src/peerstore/plugin_peerstore_flat.c:394
+#: src/mysql/mysql.c:181
 #, c-format
-msgid "Unable to get filesize: %s.\n"
+msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:151
-#: src/namestore/plugin_namestore_heap.c:203
-#: src/peerstore/plugin_peerstore_flat.c:406
+#: src/namecache/gnunet-namecache.c:109
 #, c-format
-msgid "Unable to read file: %s.\n"
-msgstr ""
-
-#: src/namecache/plugin_namecache_flat.c:410
-msgid "flat plugin running\n"
+msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/plugin_namecache_sqlite.c:183
-#: src/namecache/plugin_namecache_sqlite.c:197
-#: src/namestore/plugin_namestore_sqlite.c:219
-#: src/namestore/plugin_namestore_sqlite.c:230
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
-msgid "Failed to setup database at `%s'\n"
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namecache/gnunet-namecache.c:185
 #, c-format
-msgid "Adding record failed: %s\n"
+msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
 #, c-format
-msgid "Deleting record failed, record does not exist%s%s\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namecache/gnunet-namecache.c:203
 #, c-format
-msgid "Deleting record failed%s%s\n"
+msgid "You must specify a name\n"
+msgstr "È necessario specificare un nome\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "A %s record exists already under `%s', no other records can be added.\n"
+#: src/namecache/gnunet-namecache.c:237
+msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
-#, c-format
-msgid "Records already exist under `%s', cannot add `%s' record.\n"
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
-#, c-format
-msgid ""
-"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:96
+#, fuzzy
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to create indices\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/namestore/gnunet-namestore.c:303
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:332
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:339
 #, c-format
-msgid "Failed to replace records: %s\n"
+msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1009
+#: src/namestore/gnunet-namestore.c:558
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1032 src/namestore/gnunet-namestore.c:1065
-#: src/namestore/gnunet-namestore.c:1074 src/namestore/gnunet-namestore.c:1093
-#: src/namestore/gnunet-namestore.c:1116 src/namestore/gnunet-namestore.c:1148
-#, c-format
-msgid "Missing option `%s' for operation `%s'\n"
+#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore-fcfsd.c:970
+msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1033
-msgid "replace"
+#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
+#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
+#: src/namestore/gnunet-namestore.c:665
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1066 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1094 src/namestore/gnunet-namestore.c:1118
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1084
+#: src/namestore/gnunet-namestore.c:595
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1106
+#: src/namestore/gnunet-namestore.c:615
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:651
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1149
+#: src/namestore/gnunet-namestore.c:666
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1192
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1221
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:715
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1249
+#: src/namestore/gnunet-namestore.c:750
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1289
-#, c-format
-msgid "No default ego configured in identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1341
+#: src/namestore/gnunet-namestore.c:790
 #, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1357
-#, c-format
-msgid "Cannot connect to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1407
-msgid "Empty record line argument is not allowed.\n"
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1423
+#: src/namestore/gnunet-namestore.c:817
 #, c-format
-msgid "Invalid expiration time `%s' (must be without unit)\n"
+msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1435 src/namestore/gnunet-namestore.c:1453
-#: src/namestore/gnunet-namestore.c:1470
+#: src/namestore/gnunet-namestore.c:853
 #, c-format
-msgid "Missing entries in record line `%s'.\n"
+msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1444
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Comando `%s' sconosciuto.\n"
-
-#: src/namestore/gnunet-namestore.c:1484
+#: src/namestore/gnunet-namestore.c:865
 #, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
+msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1548
+#: src/namestore/gnunet-namestore.c:913
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1552
+#: src/namestore/gnunet-namestore.c:916
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1556
+#: src/namestore/gnunet-namestore.c:919
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1561
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+#: src/namestore/gnunet-namestore.c:922
+msgid "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1566
+#: src/namestore/gnunet-namestore.c:925
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1570
+#: src/namestore/gnunet-namestore.c:928
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:934
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1585
-msgid ""
-"set record set to values given by (possibly multiple) RECORDLINES; can be "
-"specified multiple times"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1590
+#: src/namestore/gnunet-namestore.c:937
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1595
+#: src/namestore/gnunet-namestore.c:940
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1600
+#: src/namestore/gnunet-namestore.c:943
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1604
+#: src/namestore/gnunet-namestore.c:946
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1608
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+#: src/namestore/gnunet-namestore.c:949
+msgid "create shadow record (only valid if all other records of the same type have expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1613
+#: src/namestore/gnunet-namestore.c:952
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:549
+#: src/namestore/gnunet-namestore-fcfsd.c:464
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:576
+#: src/namestore/gnunet-namestore-fcfsd.c:491
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:597
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:629
+#: src/namestore/gnunet-namestore-fcfsd.c:525
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:689
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:777
+#: src/namestore/gnunet-namestore-fcfsd.c:652
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:796
+#: src/namestore/gnunet-namestore-fcfsd.c:668
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:832
+#: src/namestore/gnunet-namestore-fcfsd.c:704
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:841
+#: src/namestore/gnunet-namestore-fcfsd.c:712
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1071
+#: src/namestore/gnunet-namestore-fcfsd.c:910
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1099
+#: src/namestore/gnunet-namestore-fcfsd.c:936
 msgid "Failed to start HTTP server\n"
-msgstr ""
+msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:978
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1173
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1192
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:900
+#: src/namestore/gnunet-service-namestore.c:655
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:2043
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/namestore_api.c:391
+#: src/namestore/namestore_api.c:275
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_heap.c:773
-msgid "heap file database running\n"
-msgstr ""
-
-#: src/namestore/plugin_rest_namestore.c:1079
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:193
-msgid "Suggested configuration changes:\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:219
-#, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:226
-#, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "run autoconfiguration"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:351
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:459
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:464
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:366
-msgid "write configuration file (for autoconfiguration)"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:378
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:403
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
-#: src/nat-auto/nat_auto_api_test.c:409
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:568
-#: src/nat-auto/nat_auto_api_test.c:575
-msgid "NAT test failed to start NAT library\n"
+#: src/nat/gnunet-nat-server.c:321
+msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto.c:342
-msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+#: src/nat/nat_auto.c:170
+msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/nat/nat_auto.c:203
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+#: src/nat/nat_auto.c:204
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/nat/nat_auto.c:225
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/nat/nat_auto.c:274
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+#: src/nat/nat_auto.c:344
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#: src/nat/nat_auto.c:360
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+#: src/nat/nat_auto.c:413
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+#: src/nat/nat_auto.c:414
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/nat_auto.c:447
+msgid "gnunet-helper-nat-server found, testing it\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+#: src/nat/nat_auto.c:448
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:76
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:78
-msgid "IPC failure"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:80
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:82
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:84
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:86
-msgid "`upnpc` command not found"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:88
-msgid "Failed to run `upnpc` command"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:90
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:92
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:94
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:96
-msgid "Failed to run `external-ip` command"
+#: src/nat/nat_auto.c:482
+msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:98
-msgid "`external-ip' command output invalid"
+#: src/nat/nat_auto.c:483
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:102
-msgid "Could not determine interface with internal/local network address"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:104
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:106
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:108
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:110
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api.c:112
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
-#: src/nat-auto/nat_auto_api_test.c:481
+#: src/nat/nat.c:867
 #, c-format
-msgid "Failed to find valid PORT in section `%s'\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:526
+#: src/nat/nat.c:917
 #, c-format
-msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
-msgid "which IP and port are we locally using to bind/listen to"
+#: src/nat/nat.c:1205
+msgid "malformed"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:443
-msgid "which remote IP and port should be asked for connection reversal"
+#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#, c-format
+msgid "Configuration requires `%s', but binary is not installed properly (SUID bit not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:449
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
+#: src/nat/nat.c:1426
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:454
-msgid "enable STUN processing"
+#: src/nat/nat.c:1442
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
-msgid "watch for connection reversal requests"
+#: src/nat/nat_mini.c:155
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:481
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat/nat_mini.c:175
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1339
-#, c-format
-msgid "Malformed punched hole specification `%s' (lacks port)\n"
+#: src/nat/nat_mini.c:201
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1349
-#, c-format
-msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
+#: src/nat/nat_mini.c:366
+msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1365
-#, c-format
-msgid "Malformed punched hole specification `%s' (lacks `]')\n"
+#: src/nat/nat_mini.c:512
+msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1376
-#, c-format
-msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+#: src/nat/nat_mini.c:540
+msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1841
-msgid "Connection reversal request failed\n"
+#: src/nat/nat_mini.c:604
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1914
-msgid ""
-"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP\n"
+#: src/nat/nat_mini.c:608
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:186
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/nat/nat_test.c:351
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:273
+#: src/nat/nat_test.c:423
 #, c-format
-msgid "Failed to start %s\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:196
-msgid "`external-ip' command not found\n"
+#: src/nse/gnunet-nse.c:117
+msgid "NSE service is not running\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:656
-msgid "`upnpc' command not found\n"
+#: src/nse/gnunet-nse.c:122
+msgid "Error while checking if NSE service is running or not\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
+#: src/nse/gnunet-nse.c:168
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:854
+#: src/nse/gnunet-nse-profiler.c:861
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:873
+#: src/nse/gnunet-nse-profiler.c:870
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:876
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:885
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+#: src/nse/gnunet-service-nse.c:1517
+#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:313
+#: src/peerinfo/gnunet-service-peerinfo.c:352
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
+#: src/peerinfo/gnunet-service-peerinfo.c:371
+#: src/peerinfo/gnunet-service-peerinfo.c:388
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:449
+#: src/peerinfo/gnunet-service-peerinfo.c:466
 msgid "# peers known"
 msgstr "# peer conosciuti"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:492
+#: src/peerinfo/gnunet-service-peerinfo.c:503
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:659
+#: src/peerinfo/gnunet-service-peerinfo.c:653
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:667
+#: src/peerinfo/gnunet-service-peerinfo.c:658
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#: src/peerinfo/gnunet-service-peerinfo.c:994
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#: src/peerinfo/gnunet-service-peerinfo.c:1287
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
+#: src/peerinfo/gnunet-service-peerinfo.c:1298
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
+#: src/peerinfo/peerinfo_api.c:236
+msgid "aborted due to explicit disconnect request"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:356
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "failed to transmit request (service down?)"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/peerinfo/peerinfo_api.c:506
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
+msgid "Received invalid message from `PEERINFO' service."
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:678
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
+msgstr ""
+
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, c-format
-msgid "%sPeer `%s'\n"
+msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
 #, c-format
-msgid "\tExpires: %s \t %s\n"
+msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:299
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, c-format
-msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:466
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Failure: Did not receive %s\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:480
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:799
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Io sono il peer '%s''.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:843
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:852
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:862
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:873
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:879
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "Print information about peers."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:168
+#: src/transport/gnunet-service-transport_plugins.c:128
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:173
+#: src/transport/gnunet-service-transport_plugins.c:133
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:165
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:796
-msgid "Peerinfo REST API initialized\n"
-msgstr ""
-
-#: src/peerstore/gnunet-peerstore.c:91
-msgid "peerstore"
-msgstr ""
-
-#: src/peerstore/gnunet-service-peerstore.c:598
+#: src/postgres/postgres.c:59
 #, c-format
-msgid "Could not load database backend `%s'\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:605 src/peerstore/peerstore_api.c:657
-msgid "Unexpected iteration response, this should not happen.\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:671
-msgid "Received a malformed response from service."
+msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:807
-msgid "Received a watch result for a non existing watch.\n"
-msgstr ""
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+#| msgid "Failed to create statistics!\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:453
-#, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
+#: src/psycstore/gnunet-service-psycstore.c:200
+msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:488
-#, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:224
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to test membership!\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:570
-#, c-format
-msgid "Unable to create indices: %s.\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:246
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to store fragment!\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/pq/pq_prepare.c:84
-#, c-format
-msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:272
+#, fuzzy
+#| msgid "Failed to read file"
+msgid "Failed to get fragment!\n"
+msgstr "Impossibile leggere il file"
 
-#: src/pt/gnunet-daemon-pt.c:423
-msgid "Failed to pack DNS request.  Dropping.\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:299
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to get message!\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/pt/gnunet-daemon-pt.c:429
-msgid "# DNS requests mapped to VPN"
+#: src/psycstore/gnunet-service-psycstore.c:328
+msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:483
-msgid "# DNS records modified"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:356
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to get master counters!\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/pt/gnunet-daemon-pt.c:667
-msgid "# DNS replies intercepted"
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
+msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:674
-msgid "Failed to parse DNS request.  Dropping.\n"
+#: src/psycstore/gnunet-service-psycstore.c:408
+msgid "Failed to begin modifying state!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:712
-msgid "# DNS requests dropped (timeout)"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:431
+#, fuzzy, c-format
+#| msgid "Unknown command `%s'\n"
+msgid "Unknown operator: %c\n"
+msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/pt/gnunet-daemon-pt.c:768
-msgid "# DNS requests intercepted"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:441
+#, fuzzy
+#| msgid "Failed to read file"
+msgid "Failed to end modifying state!\n"
+msgstr "Impossibile leggere il file"
 
-#: src/pt/gnunet-daemon-pt.c:773
-msgid "# DNS requests dropped (DNS cadet channel down)"
+#: src/psycstore/gnunet-service-psycstore.c:479
+msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:781
-msgid "# DNS requests dropped (malformed)"
+#: src/psycstore/gnunet-service-psycstore.c:495
+msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:876
-msgid "# DNS replies received"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
+#, fuzzy
+#| msgid "Failed to read file"
+msgid "Failed to reset state!\n"
+msgstr "Impossibile leggere il file"
 
-#: src/pt/gnunet-daemon-pt.c:893
-msgid "# DNS replies dropped (too late?)"
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
+msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1262
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to get state variable!\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
 #, c-format
-msgid "Failed to connect to %s service.  Exiting.\n"
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1307
-msgid "Daemon to run to perform IP protocol translation to GNUnet"
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:467
+#: src/psycstore/plugin_psycstore_sqlite.c:276
 #, c-format
-msgid "Ego is required\n"
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:475
-#, c-format
-msgid "Attribute value missing!\n"
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+msgid "SQLite database running\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:483
-#, c-format
-msgid "Requesting party key is required!\n"
+#: src/pt/gnunet-daemon-pt.c:482
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:506
-msgid "Add attribute"
+#: src/pt/gnunet-daemon-pt.c:488
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:512
-msgid "Attribute value"
+#: src/pt/gnunet-daemon-pt.c:541
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:517
-msgid "Ego"
+#: src/pt/gnunet-daemon-pt.c:717
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:522
-msgid "Audience (relying party)"
+#: src/pt/gnunet-daemon-pt.c:723
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:526
-msgid "List attributes for Ego"
+#: src/pt/gnunet-daemon-pt.c:826
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:531
-msgid "Issue a ticket"
+#: src/pt/gnunet-daemon-pt.c:883
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:536
-msgid "Consume a ticket"
+#: src/pt/gnunet-daemon-pt.c:888
+msgid "# DNS requests dropped (DNS mesh channel down)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:541
-msgid "Revoke a ticket"
+#: src/pt/gnunet-daemon-pt.c:896
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:546
-msgid "Type of attribute"
+#: src/pt/gnunet-daemon-pt.c:969
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:551
-msgid "Expiration interval of the attribute"
+#: src/pt/gnunet-daemon-pt.c:985
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2279
-#: src/reclaim/plugin_rest_reclaim.c:1079
-msgid "Identity Provider REST API initialized\n"
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
+#, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:436
-msgid "failed to store record\n"
+#: src/pt/gnunet-daemon-pt.c:1347
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:267
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using cadet."
+msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1386
+#: src/regex/gnunet-regex-profiler.c:1288
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1427
-#: src/regex/gnunet-regex-simulation-profiler.c:630
+#: src/regex/gnunet-regex-profiler.c:1299
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr ""
+
+#: src/regex/gnunet-regex-profiler.c:1328
+#: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1433
-#: src/regex/gnunet-regex-simulation-profiler.c:638
+#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1440
+#: src/regex/gnunet-regex-profiler.c:1341
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1350
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1370
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1557
+#: src/regex/gnunet-regex-profiler.c:1455
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1563
+#: src/regex/gnunet-regex-profiler.c:1458
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1461
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1576
+#: src/regex/gnunet-regex-profiler.c:1464
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1595
+#: src/regex/gnunet-regex-profiler.c:1479
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:689
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:719
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:152
+#: src/regex/regex_api.c:131
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:212
-#, c-format
-msgid "Search string `%s' is too long!\n"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:986
-msgid "listen on specified port (default: 7776)"
-msgstr ""
-
-#: src/rest/gnunet-rest-server.c:1003
-msgid "GNUnet REST server"
-msgstr ""
-
-#: src/rest/plugin_rest_copying.c:209
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:129
+#: src/revocation/gnunet-revocation.c:126
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:134
+#: src/revocation/gnunet-revocation.c:131
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:140
+#: src/revocation/gnunet-revocation.c:137
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:163
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:168
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:173
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:178
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:186
+#: src/revocation/gnunet-revocation.c:183
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:323
+#: src/revocation/gnunet-revocation.c:294
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:352
+#: src/revocation/gnunet-revocation.c:324
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:345
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:393
+#: src/revocation/gnunet-revocation.c:365
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:403
+#: src/revocation/gnunet-revocation.c:375
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437
+#: src/revocation/gnunet-revocation.c:407
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:450
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
+#: src/revocation/gnunet-revocation.c:421
+msgid "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:470
+#: src/revocation/gnunet-revocation.c:441
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:491
+#: src/revocation/gnunet-revocation.c:463
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:516
+#: src/revocation/gnunet-revocation.c:488
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:504
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:541
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
+#: src/revocation/gnunet-revocation.c:507
+msgid "revoke the private key associated for the the private key associated with the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:546
+#: src/revocation/gnunet-revocation.c:510
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:552
+#: src/revocation/gnunet-revocation.c:513
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:459
-msgid "# unsupported revocations received via set union"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:468
-msgid "# revocation messages received via set union"
+#: src/revocation/gnunet-service-revocation.c:272
+msgid "Duplicate revocation received from peer. Ignored.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:434
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:477
-msgid "# revocation set unions failed"
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
-msgid "# revocation set unions completed"
+#: src/revocation/gnunet-service-revocation.c:812
+msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:525
-msgid "SET service crashed, terminating revocation service\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:225
+msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:867
-msgid "Could not open revocation database file!"
+#: src/scalarproduct/gnunet-scalarproduct.c:232
+msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:260
-msgid "Seed a PeerID"
+#: src/scalarproduct/gnunet-scalarproduct.c:239
+msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:264
-msgid "Get updates of view (0 for infinite updates)"
+#: src/scalarproduct/gnunet-scalarproduct.c:251
+#, c-format
+msgid "Tried to set initiator mode, as peer ID was given. However, `%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:268
-msgid "Get peers from biased stream"
+#: src/scalarproduct/gnunet-scalarproduct.c:278
+#: src/scalarproduct/gnunet-scalarproduct.c:314
+#, c-format
+msgid "Could not convert `%s' to int32_t.\n"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2967
-msgid "duration of the profiling"
+#: src/scalarproduct/gnunet-scalarproduct.c:286
+msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2972
-msgid "timeout for the profiling"
+#: src/scalarproduct/gnunet-scalarproduct.c:346
+#, c-format
+msgid "Could not convert `%s' to integer.\n"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2977
-msgid "number of PeerIDs to request"
+#: src/scalarproduct/gnunet-scalarproduct.c:407
+msgid "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2993
-msgid "Measure quality and performance of the RPS service."
+#: src/scalarproduct/gnunet-scalarproduct.c:410
+msgid "A comma separated mask to select which elements should actually be compared."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:220
-msgid "You must specify at least one message ID to check!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:413
+msgid "[Optional] peer to calculate our scalarproduct with. If this parameter is not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:227
-msgid "This program needs a session identifier for comparing vectors.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:416
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:425
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-service-scalarproduct.c:541
 #, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
+msgid "Client (%p) disconnected from us.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:258
-msgid "Need elements to compute the scalarproduct, got none.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:613
+#: src/scalarproduct/gnunet-service-scalarproduct.c:702
+#, c-format
+msgid "Could not send message to client (%p)!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:280
+#: src/scalarproduct/gnunet-service-scalarproduct.c:619
 #, c-format
-msgid "Malformed input, could not parse `%s'\n"
+msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-service-scalarproduct.c:712
 #, c-format
-msgid "Could not convert `%s' to int64_t.\n"
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:766
+#: src/scalarproduct/gnunet-service-scalarproduct.c:855
+msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:325
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
 #, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
-#: src/scalarproduct/gnunet-scalarproduct.c:357
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
+#, fuzzy
+#| msgid "Starting service `%s'\n"
+msgid "Transmitting service request.\n"
+msgstr "Avvio del servizio '%s' in corso\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+msgid "Could not send service-request multipart message to channel!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:363
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
+#, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:369
-msgid "Transaction ID shared with peer."
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
+msgid "Could not send message to channel!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:379
-msgid "Calculate the Vectorproduct with a GNUnet peer."
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
+msgid "Too short message received from client!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
-msgid "Connect to CADET failed\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
+msgid "Invalid message received from client, session information incorrect!\n"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:185
-msgid "Keys given to SCALARPRODUCT not unique!\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
+#, c-format
+msgid "Duplicate session information received, cannot create new session with key `%s'\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg start delay"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
+#, c-format
+msgid "Got client-request-session with key %s, preparing channel to remote service.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "dkg timeout"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
+#, c-format
+msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:628
-msgid "threshold"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
+#, c-format
+msgid "Got client-responder-session with key %s and a matching service-request-session set, processing.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:633
-msgid "also profile decryption"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
+#, c-format
+msgid "Got client-responder-session with key %s but NO matching service-request-session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2008
-msgid "Could not connect to CADET service\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#, c-format
+msgid "New incoming channel from peer %s.\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:252
-msgid "number of element in set A-B"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:258
-msgid "number of element in set B-A"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:264
-msgid "number of common elements in A and B"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:270
-msgid "hash num"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
+#, c-format
+msgid "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:276
-msgid "ibf size"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
+msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:444
-msgid "use byzantine mode"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Connect to MESH failed\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:450
-msgid "force sending full set"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
+msgid "Mesh initialized\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:456
-msgid "number delta operation"
+#: src/scalarproduct/scalarproduct_api.c:246
+#, fuzzy
+#| msgid "# SYN messages received"
+msgid "# SUC responder result messages received"
+msgstr "# messaggi SYN ricevuti"
+
+#: src/scalarproduct/scalarproduct_api.c:300
+#, fuzzy
+#| msgid "# bytes encrypted"
+msgid "# bytes sent to scalarproduct"
+msgstr "# byte crittografati"
+
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to send a message to the statistics service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:538
+msgid "dkg start delay"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:468
-msgid "operation to execute"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:541
+msgid "dkg timeout"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:474
-msgid "element size"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:544
+msgid "threshold"
 msgstr ""
 
-#: src/sq/sq.c:54
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:547
+msgid "also profile decryption"
 msgstr ""
 
-#: src/sq/sq.c:61
-msgid "Failure in sqlite3_reset (!)\n"
+#: src/set/gnunet-service-set.c:1431
+msgid "Could not connect to mesh service\n"
 msgstr ""
 
-#: src/sq/sq.c:139
-#, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
+#: src/set/gnunet-set-ibf-profiler.c:221
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:338
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+#: src/set/gnunet-set-ibf-profiler.c:224
+msgid "number of element in set B-A"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "hash num"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "ibf size"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:295
+msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:1086
+#: src/statistics/gnunet-service-statistics.c:280
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:450
+#: src/statistics/gnunet-service-statistics.c:346
+#, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:140
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:453
+#: src/statistics/gnunet-statistics.c:142
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:528
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:536
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:579
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:594
+#: src/statistics/gnunet-statistics.c:234
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:261
 #, c-format
-msgid "Invalid argument `%s'\n"
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:747
+#: src/statistics/gnunet-statistics.c:269
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:755
+#: src/statistics/gnunet-statistics.c:276
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:786
+#: src/statistics/gnunet-statistics.c:308
 #, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:819
+#: src/statistics/gnunet-statistics.c:334
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:824
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:830
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:836
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:842
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:847
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:852
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:858
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:864
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:881
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:753
+#: src/statistics/statistics_api.c:519
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:225
-msgid "Need at least 2 arguments\n"
+#: src/statistics/statistics_api.c:1090
+msgid "Failed to receive acknowledgement from statistics service, some statistics might have been lost!\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:223
+msgid "Need atleast 2 arguments\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:230
+#: src/testbed/generate-underlay-topology.c:228
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:237
+#: src/testbed/generate-underlay-topology.c:235
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:242
+#: src/testbed/generate-underlay-topology.c:240
 #, c-format
 msgid "Invalid topology: %s\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:255
+#: src/testbed/generate-underlay-topology.c:252
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:261
+#: src/testbed/generate-underlay-topology.c:258
 #, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:269
+#: src/testbed/generate-underlay-topology.c:266
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:283
+#: src/testbed/generate-underlay-topology.c:280
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:289
+#: src/testbed/generate-underlay-topology.c:286
 #, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:282
+#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:352
+#: src/testbed/generate-underlay-topology.c:344
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
-"The following options are available for TOPO followed by TOPOOPTS if "
-"applicable:\n"
+"The following options are available for TOPO followed by TOPOOPTS if applicable:\n"
 "\t LINE\n"
 "\t RING\n"
 "\t RANDOM <num_rnd_links>\n"
@@ -6227,230 +6018,182 @@ msgid ""
 "\t cap: the maximum number of links a node can have\n"
 "\t m: the number of links a node should have while joining the network\n"
 "\t filename: the path of the file which contains topology information\n"
-"NOTE: the format of the above file is descibed here: https://www.gnunet.org/"
-"content/topology-file-format\n"
+"NOTE: the format of the above file is descibed here: https://www.gnunet.org/content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:315
+#: src/testbed/gnunet-daemon-latency-logger.c:325
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
-msgid ""
-"Daemon to restrict incoming transport layer connections during testbed "
-"deployments"
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid "Daemon to restrict incoming transport layer connections during testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
+#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:471
+#: src/testbed/gnunet-daemon-testbed-underlay.c:474
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:728
-#, c-format
-msgid ""
-"Cannot open %s for writing load statistics.  Not logging load statistics\n"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1159
-#, c-format
-msgid "%s is stopped"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1161
-#, c-format
-msgid "%s is starting"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1163
-#, c-format
-msgid "%s is stopping"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1165
-#, c-format
-msgid "%s is starting already"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1167
-#, c-format
-msgid "%s is stopping already"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1169
-#, c-format
-msgid "%s is started already"
-msgstr ""
-
-#: src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/testbed/gnunet-service-testbed_cpustatus.c:730
 #, c-format
-msgid "%s is stopped already"
+msgid "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1173
-#, c-format
-msgid "%s service is not known to ARM"
+#: src/testbed/gnunet-service-testbed_peers.c:1015
+msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1175
-#, c-format
-msgid "%s service failed to start"
+#: src/testbed/gnunet-service-testbed_peers.c:1021
+msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1179
-#, c-format
-msgid "%.s Unknown result code."
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#: src/testbed/gnunet_testbed_mpi_spawn.c:125
 msgid "Waiting for child to exit.\n"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#: src/testbed/gnunet_testbed_mpi_spawn.c:247
 #, c-format
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:287
-msgid "tolerate COUNT number of continious timeout failures"
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:291
-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"
+#: src/testbed/gnunet-testbed-profiler.c:296
+msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/testbed_api.c:410
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
+#: src/testbed/gnunet-testbed-profiler.c:299
+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/testbed_api_hosts.c:413
+#: src/testbed/testbed_api_hosts.c:415
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:421
+#: src/testbed/testbed_api_hosts.c:423
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:428
+#: src/testbed/testbed_api_hosts.c:430
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:569
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:818
+#: src/testbed/testbed_api_hosts.c:1586
+#, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:819
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:986
+#: src/testbed/testbed_api_testbed.c:988
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1052
+#: src/testbed/testbed_api_testbed.c:1054
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1141
+#: src/testbed/testbed_api_testbed.c:1143
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1145
+#: src/testbed/testbed_api_testbed.c:1147
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1183
+#: src/testbed/testbed_api_testbed.c:1185
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1201
+#: src/testbed/testbed_api_testbed.c:1203
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1261
+#: src/testbed/testbed_api_testbed.c:1263
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1273
+#: src/testbed/testbed_api_testbed.c:1275
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1297
+#: src/testbed/testbed_api_testbed.c:1299
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1347
+#: src/testbed/testbed_api_testbed.c:1349
 #, c-format
-msgid ""
-"Maximum number of edges a peer can have in a scale free topology cannot be "
-"more than %u.  Given `%s = %llu'"
+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:1363
+#: src/testbed/testbed_api_testbed.c:1365
 #, 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'"
+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:1028
+#: src/testbed/testbed_api_topology.c:960
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1036
+#: src/testbed/testbed_api_topology.c:966
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1044
+#: src/testbed/testbed_api_topology.c:973
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1066
+#: src/testbed/testbed_api_topology.c:995
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1075
-#: src/testbed/testbed_api_topology.c:1099
+#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1081
-#: src/testbed/testbed_api_topology.c:1105
+#: src/testbed/testbed_api_topology.c:1010
+#: src/testbed/testbed_api_topology.c:1034
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1087
-#: src/testbed/testbed_api_topology.c:1111
+#: src/testbed/testbed_api_topology.c:1016
+#: src/testbed/testbed_api_topology.c:1040
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1145
+#: src/testbed/testbed_api_topology.c:1074
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -6460,848 +6203,929 @@ msgstr ""
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:253
+#: src/testing/gnunet-testing.c:258
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:355
 msgid "create unique configuration files"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:365
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+#: src/testing/gnunet-testing.c:359
+msgid "number of unique configuration files to create, or number of the hostkey to extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:372
+#: src/testing/gnunet-testing.c:361
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:378
+#: src/testing/gnunet-testing.c:363
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:391
+#: src/testing/gnunet-testing.c:376
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:89
+#: src/testing/list-keys.c:90
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:272
+#: src/testing/list-keys.c:93
+msgid "skip COUNT number of keys in the beginning"
+msgstr ""
+
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:715
+#: src/testing/testing.c:718
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1161
+#: src/testing/testing.c:1157
 #, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
+msgid "You attempted to create a testbed with more than %u hosts.  Please precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1170
+#: src/testing/testing.c:1166
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1180
+#: src/testing/testing.c:1176
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1193
+#: src/testing/testing.c:1189
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1207
+#: src/testing/testing.c:1203
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1215
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1244
+#: src/testing/testing.c:1240
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1346
+#: src/testing/testing.c:1342
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1649
+#: src/testing/testing.c:1706
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/friends.c:126
+#: src/topology/friends.c:100
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 
-#: src/topology/friends.c:180
+#: src/topology/friends.c:154
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
-msgstr ""
+msgstr "# nodi in blacklist"
 
-#: src/topology/gnunet-daemon-topology.c:344
-msgid "# connect requests issued to ATS"
+#: src/topology/gnunet-daemon-topology.c:388
+msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:538
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:640
-#: src/topology/gnunet-daemon-topology.c:726
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 msgid "# friends connected"
-msgstr ""
+msgstr "# amici connessi"
 
-#: src/topology/gnunet-daemon-topology.c:923
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:956
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:963
+#: src/topology/gnunet-daemon-topology.c:1029
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:985
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:988
+#: src/topology/gnunet-daemon-topology.c:1052
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:995
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+#: src/topology/gnunet-daemon-topology.c:1057
+msgid "Fewer friends specified than required by minimum friend count. Will only connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1001
-msgid ""
-"More friendly connections required than target total number of connections.\n"
+#: src/topology/gnunet-daemon-topology.c:1063
+msgid "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1054
-#: src/transport/plugin_transport_wlan.c:1517
+#: src/topology/gnunet-daemon-topology.c:1094
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1233
-msgid "GNUnet topology control"
+#: src/topology/gnunet-daemon-topology.c:1151
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2328
-#: src/transport/gnunet-communicator-udp.c:2882
-#: src/transport/gnunet-service-tng.c:4888
-#: src/transport/gnunet-service-transport.c:2795
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/topology/gnunet-daemon-topology.c:1290
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2392
-msgid "GNUnet TCP communicator"
+#: src/transport/gnunet-service-transport_blacklist.c:271
+#, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2953
-msgid "GNUnet UDP communicator"
+#: src/transport/gnunet-service-transport_blacklist.c:279
+#, c-format
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:802
-msgid ""
-"Maximum number of UNIX connections exceeded, dropping incoming message\n"
+#: src/transport/gnunet-service-transport_blacklist.c:464
+#: src/transport/gnunet-service-transport_blacklist.c:745
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1073
-#: src/transport/plugin_transport_unix.c:1403
-#, c-format
-msgid "Cannot create path to `%s'\n"
+#: src/transport/gnunet-service-transport.c:220
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1162
-msgid "GNUnet UNIX domain socket communicator"
+#: src/transport/gnunet-service-transport.c:424
+msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
+#: src/transport/gnunet-service-transport.c:515
+msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:452
-msgid "# messages dropped due to slow client"
+#: src/transport/gnunet-service-transport.c:686
+#, c-format
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:826
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:733
+#, c-format
+msgid "Address or session unknown: failed to update properties for peer `%s' plugin `%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1563
-msgid "# bytes payload discarded due to not connected peer"
+#: src/transport/gnunet-service-transport.c:1084
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1723
-msgid "# bytes total received"
+#: src/transport/gnunet-service-transport_clients.c:432
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1820
-msgid "# bytes payload received"
+#: src/transport/gnunet-service-transport_clients.c:439
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2137
-#: src/transport/gnunet-service-transport.c:2609
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport_clients.c:596
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2613
-#, c-format
-msgid "Disallowing connection to peer `%s' on transport %s\n"
+#: src/transport/gnunet-service-transport_clients.c:737
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2721
+#: src/transport/gnunet-service-transport_clients.c:770
 #, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
+msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2730
+#: src/transport/gnunet-service-transport_clients.c:776
 #, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:195
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_clients.c:801
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# REQUEST CONNECT messages received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/gnunet-service-transport_clients.c:815
+#, c-format
+msgid "Received a request connect message for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:805
-msgid "# session creation failed"
+#: src/transport/gnunet-service-transport_clients.c:826
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# REQUEST DISCONNECT messages received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/gnunet-service-transport_clients.c:840
+#, c-format
+msgid "Received a request disconnect message for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1053
-msgid "# DISCONNECT messages sent"
+#: src/transport/gnunet-service-transport_hello.c:181
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1176
-msgid "# disconnects due to quota of 0"
+#: src/transport/gnunet-service-transport_neighbours.c:1095
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1324
-#: src/transport/gnunet-service-transport_neighbours.c:1785
+#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1629
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1329
+#: src/transport/gnunet-service-transport_neighbours.c:1225
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1395
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
-msgid "# KEEPALIVES sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1515
-msgid "# KEEPALIVE messages discarded (peer unknown)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1523
-msgid "# KEEPALIVE messages discarded (no session)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1533
-msgid "# KEEPALIVES received in good order"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1343
+#, fuzzy
+#| msgid "# SYN messages sent"
+msgid "# keepalives sent"
+msgstr "# messaggi SYN inviati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1578
-msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1376
+msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
-msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1384
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1595
-msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1431
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1604
-msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1440
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1609
-msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1448
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1615
-msgid "# KEEPALIVE_RESPONSEs received (OK)"
+#: src/transport/gnunet-service-transport_neighbours.c:1456
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1682
+#: src/transport/gnunet-service-transport_neighbours.c:1534
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1716
+#: src/transport/gnunet-service-transport_neighbours.c:1568
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1731
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1854
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 #, c-format
-msgid "Failed to send SYN message to peer `%s'\n"
+msgid "Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1874
-msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1705
+msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1913
+#: src/transport/gnunet-service-transport_neighbours.c:1751
 #, fuzzy
-msgid "# SYN messages sent"
+#| msgid "# PONG messages decrypted"
+msgid "# SESSION_CONNECT messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1930
+#: src/transport/gnunet-service-transport_neighbours.c:1767
 #, c-format
-msgid "Failed to transmit SYN message to %s\n"
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1960
-msgid "# Failed attempts to switch addresses (failed to send SYN)"
+#: src/transport/gnunet-service-transport_neighbours.c:1794
+msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2028
+#: src/transport/gnunet-service-transport_neighbours.c:1844
 #, c-format
-msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
+msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2082
+#: src/transport/gnunet-service-transport_neighbours.c:1899
 #, fuzzy
-msgid "# SYN_ACK messages sent"
+#| msgid "# PONG messages decrypted"
+msgid "# CONNECT_ACK messages sent"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2099
+#: src/transport/gnunet-service-transport_neighbours.c:1914
 #, c-format
-msgid "Failed to transmit SYN_ACK message to %s\n"
+msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2262
+#: src/transport/gnunet-service-transport_neighbours.c:2192
+#, c-format
+msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2312
 #, fuzzy
-msgid "# SYN messages received"
+#| msgid "# PONG messages received"
+msgid "# CONNECT messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2267
+#: src/transport/gnunet-service-transport_neighbours.c:2317
 #, c-format
-msgid "SYN request from peer `%s' ignored due impending shutdown\n"
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2654
+#: src/transport/gnunet-service-transport_neighbours.c:2590
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3139
+#: src/transport/gnunet-service-transport_neighbours.c:3012
+msgid "# Failed attempts to switch addresses (no response)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 #, fuzzy
-msgid "# SYN_ACK messages received"
+#| msgid "# PONG messages received"
+msgid "# CONNECT_ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3147
-msgid "# unexpected SYN_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3115
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3165
-#: src/transport/gnunet-service-transport_neighbours.c:3189
-msgid "# unexpected SYN_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3201
-msgid "# unexpected SYN_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3176
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3226
+#: src/transport/gnunet-service-transport_neighbours.c:3200
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3239
-msgid "# unexpected SYN_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3208
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3412
+#: src/transport/gnunet-service-transport_neighbours.c:3396
 #, fuzzy
-msgid "# ACK messages received"
+#| msgid "# PONG messages received"
+msgid "# SESSION_ACK messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3448
-msgid "# unexpected ACK messages"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3536
-msgid "# quota messages ignored (malformed)"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3424
+#, fuzzy
+#| msgid "# PONG messages decrypted"
+msgid "# unexpected SESSION_ACK messages"
+msgstr "# messaggi PONG decrittati"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3543
+#: src/transport/gnunet-service-transport_neighbours.c:3490
 #, fuzzy
-msgid "# QUOTA messages received"
+#| msgid "# PONG messages received"
+msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3583
+#: src/transport/gnunet-service-transport_neighbours.c:3505
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3590
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3601
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3736
+#: src/transport/gnunet-service-transport_neighbours.c:3687
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:158
+#: src/transport/gnunet-service-transport_plugins.c:120
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:223
-#: src/transport/gnunet-service-transport_plugins.c:231
-#: src/transport/gnunet-service-transport_plugins.c:239
-#: src/transport/gnunet-service-transport_plugins.c:247
-#: src/transport/gnunet-service-transport_plugins.c:255
-#: src/transport/gnunet-service-transport_plugins.c:263
-#: src/transport/gnunet-service-transport_plugins.c:271
-#: src/transport/gnunet-service-transport_plugins.c:279
-#: src/transport/gnunet-service-transport_plugins.c:287
-#: src/transport/gnunet-service-transport_plugins.c:295
-#: src/transport/gnunet-service-transport_plugins.c:303
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
+#: src/transport/gnunet-service-transport_plugins.c:242
+#: src/transport/gnunet-service-transport_plugins.c:250
+#: src/transport/gnunet-service-transport_plugins.c:258
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:310
+#: src/transport/gnunet-service-transport_plugins.c:265
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:388
-msgid "# Addresses in validation map"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:491
-#: src/transport/gnunet-service-transport_validation.c:677
-#: src/transport/gnunet-service-transport_validation.c:997
-#: src/transport/gnunet-service-transport_validation.c:1610
-msgid "# validations running"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:532
-msgid "# address records discarded (timeout)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:580
-msgid "# address records discarded (blacklist)"
+#: src/transport/gnunet-service-transport_validation.c:488
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:668
-msgid "# PINGs for address validation sent"
+#: src/transport/gnunet-service-transport_validation.c:558
+#, c-format
+msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This should not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:748
-msgid "# validations delayed by global throttle"
-msgstr ""
+#: src/transport/gnunet-service-transport_validation.c:616
+#, fuzzy
+#| msgid "# SYN messages sent"
+msgid "# PING without HELLO messages sent"
+msgstr "# messaggi SYN inviati"
 
-#: src/transport/gnunet-service-transport_validation.c:785
+#: src/transport/gnunet-service-transport_validation.c:722
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1175
+#: src/transport/gnunet-service-transport_validation.c:1062
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1072
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1191
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1199
+#: src/transport/gnunet-service-transport_validation.c:1083
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1212
+#: src/transport/gnunet-service-transport_validation.c:1095
 #, c-format
-msgid ""
-"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
-"having this address.\n"
+msgid "Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1103
+#, c-format
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1267
+#: src/transport/gnunet-service-transport_validation.c:1157
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1318
+#: src/transport/gnunet-service-transport_validation.c:1206
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1327
+#: src/transport/gnunet-service-transport_validation.c:1215
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1356
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1518
+#: src/transport/gnunet-service-transport_validation.c:1371
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1573
-msgid "# validations succeeded"
+#: src/transport/gnunet-service-transport_validation.c:1493
+#, c-format
+msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1628
-msgid "# HELLOs given to peerinfo"
+#: src/transport/gnunet-service-transport_validation.c:1500
+#, c-format
+msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:413
+#: src/transport/gnunet-transport.c:367
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:423
+#: src/transport/gnunet-transport.c:375
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:467
+#: src/transport/gnunet-transport.c:415
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:480
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:494
+#: src/transport/gnunet-transport.c:438
 #, fuzzy
-msgid "Failed to list connections, timeout occurred\n"
+#| msgid "# active connections"
+msgid "Failed to list connections, timeout occured\n"
 msgstr "# connessioni attive"
 
-#: src/transport/gnunet-transport.c:527
-#, c-format
-msgid "Transmitting %u bytes\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:561
+#: src/transport/gnunet-transport.c:559
 #, c-format
 msgid ""
-"Successfully connected to `%s', starting to send benchmark data in %u Kb "
-"blocks\n"
+"Peer `%s' %s %s\n"
+"\t%s%s\n"
+"\t%s%s\n"
+"\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
-#, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
+#: src/transport/gnunet-transport.c:586
+#, fuzzy, c-format
+#| msgid "Peer `%s'\n"
+msgid "Peer `%s' %s `%s' \n"
+msgstr "Peer `%s'\n"
+
+#: src/transport/gnunet-transport.c:712
+msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:726
 #, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:618
-msgid "Connected to"
+#: src/transport/gnunet-transport.c:789
+#, c-format
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:647
-msgid "Disconnected from"
+#: src/transport/gnunet-transport.c:810
+#, c-format
+msgid "Successfully connected to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:682
+#: src/transport/gnunet-transport.c:834
 #, c-format
-msgid "Received %u bytes\n"
+msgid "Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:719
+#: src/transport/gnunet-transport.c:865
 #, c-format
-msgid "Peer `%s': %s %s in state `%s' until %s\n"
+msgid "Successfully disconnected from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:731
+#: src/transport/gnunet-transport.c:888
 #, c-format
-msgid "Peer `%s': %s %s\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1144
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
+#: src/transport/gnunet-transport.c:950
+#, c-format
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1251
+#: src/transport/gnunet-transport.c:975
 #, c-format
-msgid ""
-"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s %s\n"
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1264
+#: src/transport/gnunet-transport.c:986
 #, c-format
-msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1294
-msgid "Failed to connect to transport service for disconnection\n"
+#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to send connect request to transport service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/transport/gnunet-transport.c:1266
+#, c-format
+msgid "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1300
-msgid "Blacklisting request in place, stop with CTRL-C\n"
+#: src/transport/gnunet-transport.c:1274
+#, c-format
+msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1408
+#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
+#: src/transport/gnunet-transport.c:1419
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
 #: src/transport/gnunet-transport.c:1362
+#, fuzzy
+#| msgid "Failed to start service.\n"
+msgid "Failed to send request to transport service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/transport/gnunet-transport.c:1381
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1433
-msgid "print information for all peers (instead of only connected peers)"
+#: src/transport/gnunet-transport.c:1465
+msgid "print information for all peers (instead of only connected peers )"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1437
+#: src/transport/gnunet-transport.c:1468
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1441
-msgid "disconnect from a peer"
+#: src/transport/gnunet-transport.c:1471
+msgid "connect to a peer"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1474
+#, fuzzy
+#| msgid "# friends connected"
+msgid "disconnect to a peer"
+msgstr "# amici connessi"
+
+#: src/transport/gnunet-transport.c:1477
+msgid "print information for all pending validations "
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1480
+msgid "print information for all pending validations continously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1445
+#: src/transport/gnunet-transport.c:1483
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1453
-msgid ""
-"provide information about all connects and disconnect events (continuously)"
+#: src/transport/gnunet-transport.c:1489
+msgid "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1457
+#: src/transport/gnunet-transport.c:1491
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1493
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1466
-msgid "monitor plugin sessions"
+#: src/transport/gnunet-transport.c:1495
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/transport/gnunet-transport.c:1498
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1507
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
+#: src/transport/plugin_transport_bluetooth.c:621
+msgid "# Bluetooth ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:640
+#, fuzzy
+#| msgid "# PONG messages decrypted"
+msgid "# Bluetooth messages defragmented"
+msgstr "# messaggi PONG decrittati"
+
+#: src/transport/plugin_transport_bluetooth.c:686
+#: src/transport/plugin_transport_bluetooth.c:737
+#: src/transport/plugin_transport_bluetooth.c:1942
+msgid "# Bluetooth sessions allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:837
+#, fuzzy
+#| msgid "# PONG messages decrypted"
+msgid "# Bluetooth message fragments sent"
+msgstr "# messaggi PONG decrittati"
+
+#: src/transport/plugin_transport_bluetooth.c:861
+msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
+#: src/transport/plugin_transport_bluetooth.c:969
+#: src/transport/plugin_transport_bluetooth.c:1054
+#: src/transport/plugin_transport_bluetooth.c:1944
+msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
+#: src/transport/plugin_transport_bluetooth.c:1307
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# HELLO messages received via Bluetooth"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_bluetooth.c:1331
+msgid "# fragments received via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
+#: src/transport/plugin_transport_bluetooth.c:1341
+#, fuzzy
+#| msgid "# ACKs received"
+msgid "# ACKs received via Bluetooth"
+msgstr "# ACK ricevuti"
+
+#: src/transport/plugin_transport_bluetooth.c:1401
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:631
-msgid "number of messages to send"
+#: src/transport/plugin_transport_bluetooth.c:1512
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# DATA messages received via Bluetooth"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_bluetooth.c:1547
+#, fuzzy
+#| msgid "# PONG messages received"
+msgid "# Bluetooth DATA messages processed"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_bluetooth.c:1610
+msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:636
-msgid "message size to use"
+#: src/transport/plugin_transport_bluetooth.c:1723
+msgid "Bluetooth address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2312
-#: src/transport/plugin_transport_http_server.c:3530
-#: src/transport/plugin_transport_tcp.c:3901
-#: src/transport/plugin_transport_tcp.c:3908
-msgid "TCP_STEALTH not supported on this platform.\n"
+#: src/transport/plugin_transport_bluetooth.c:1923
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:1622
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3245
+#: src/transport/plugin_transport_http_client.c:1697
+#: src/transport/plugin_transport_http_server.c:3007
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3315
+#: src/transport/plugin_transport_http_client.c:1722
+#: src/transport/plugin_transport_http_server.c:3063
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:1750
+#: src/transport/plugin_transport_http_server.c:2907
 #, c-format
-msgid "Maximum number of requests is %u\n"
+msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1756
+#: src/transport/plugin_transport_http_server.c:1402
 #, c-format
-msgid ""
-"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
-"size %u\n"
+msgid "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2028
+#: src/transport/plugin_transport_http_server.c:1663
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2036
+#: src/transport/plugin_transport_http_server.c:1671
 #, c-format
-msgid ""
-"Server reached maximum number connections (%u), rejecting new connection\n"
+msgid "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2186
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/transport/plugin_transport_http_server.c:1958
+msgid "Could not create a new TLS certificate, program `gnunet-transport-certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2209
+#: src/transport/plugin_transport_http_server.c:1982
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2338
-msgid "Could not load or create server certificate! Loading plugin failed!\n"
+#: src/transport/plugin_transport_http_server.c:2405
+msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2654
-msgid "Require valid port number for service in configuration!\n"
+#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2565
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2905
-#: src/transport/plugin_transport_udp.c:3627
+#: src/transport/plugin_transport_http_server.c:2637
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3011
+#: src/transport/plugin_transport_http_server.c:2730
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3026
+#: src/transport/plugin_transport_http_server.c:2744
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3032
+#: src/transport/plugin_transport_http_server.c:2751
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3043
+#: src/transport/plugin_transport_http_server.c:2762
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3049
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3068
+#: src/transport/plugin_transport_http_server.c:2784
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3103
+#: src/transport/plugin_transport_http_server.c:2794
 #, c-format
-msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3178
+#: src/transport/plugin_transport_http_server.c:2815
 #, c-format
-msgid "Using external hostname `%s'\n"
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3199
+#: src/transport/plugin_transport_http_server.c:2825
 #, c-format
-msgid "Notifying transport only about hostname `%s'\n"
+msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3216
+#: src/transport/plugin_transport_http_server.c:2877
 #, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3542
-msgid "Unable to compile URL regex\n"
+#: src/transport/plugin_transport_http_server.c:2893
+#, c-format
+msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
 #: src/transport/plugin_transport_smtp.c:223
@@ -7346,592 +7170,479 @@ msgstr "# byte inviati via SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1557
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:555
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1740
-#: src/transport/plugin_transport_tcp.c:1964
-#: src/transport/plugin_transport_tcp.c:3147
-#: src/transport/plugin_transport_tcp.c:4024
+#: src/transport/plugin_transport_tcp.c:762
+#: src/transport/plugin_transport_tcp.c:928
+#: src/transport/plugin_transport_tcp.c:2005
+#: src/transport/plugin_transport_tcp.c:2558
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1782
-#: src/transport/plugin_transport_tcp.c:1946
-#: src/transport/plugin_transport_tcp.c:2070
-#: src/transport/plugin_transport_tcp.c:2143
-#: src/transport/plugin_transport_tcp.c:2243
-#: src/transport/plugin_transport_tcp.c:2268
+#: src/transport/plugin_transport_tcp.c:795
+#: src/transport/plugin_transport_tcp.c:921
+#: src/transport/plugin_transport_tcp.c:1009
+#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1237
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1785
+#: src/transport/plugin_transport_tcp.c:798
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2073
+#: src/transport/plugin_transport_tcp.c:1012
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2147
+#: src/transport/plugin_transport_tcp.c:1059
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2545
+#: src/transport/plugin_transport_tcp.c:1193
+#, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1462
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2721
+#: src/transport/plugin_transport_tcp.c:1567
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3213
+#: src/transport/plugin_transport_tcp.c:2055
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3419
+#: src/transport/plugin_transport_tcp.c:2215
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3470
-#: src/transport/plugin_transport_tcp.c:3528
-#, fuzzy
-msgid "# TCP server connections active"
-msgstr "# connessioni attive"
-
-#: src/transport/plugin_transport_tcp.c:3474
-msgid "# TCP server connect events"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:3480
-msgid "TCP connection limit reached, suspending server\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:3482
-msgid "# TCP service suspended"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:3522
-msgid "# TCP service resumed"
+#: src/transport/plugin_transport_tcp.c:2279
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3532
-msgid "# network-level TCP disconnect events"
+#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/util/service.c:588
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3851
+#: src/transport/plugin_transport_tcp.c:2451
 msgid "Failed to start service.\n"
-msgstr ""
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/transport/plugin_transport_tcp.c:4012
+#: src/transport/plugin_transport_tcp.c:2547
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4016
+#: src/transport/plugin_transport_tcp.c:2551
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4020
+#: src/transport/plugin_transport_tcp.c:2554
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-msgid "# Multicast HELLO beacons received via UDP"
+#: src/transport/plugin_transport_udp_broadcasting.c:167
+msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+#: src/transport/plugin_transport_udp_broadcasting.c:210
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+#: src/transport/plugin_transport_udp_broadcasting.c:603
+msgid "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp_broadcasting.c:626
 #, c-format
-msgid ""
-"UDP could not transmit message to `%s': Network seems down, please check "
-"your network configuration\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3385
-msgid ""
-"UDP could not transmit IPv6 message! Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+#: src/transport/plugin_transport_udp.c:1513
+#, c-format
+msgid "Trying to create session for address of unexpected length %u (should be %u or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3703
-#: src/transport/plugin_transport_udp.c:3802
+#: src/transport/plugin_transport_udp.c:2602
 #, c-format
-msgid "Failed to bind UDP socket to %s: %s\n"
+msgid "UDP could not transmit message to `%s': Network seems down, please check your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3721
-msgid "Disabling IPv4 since it is not supported on this system!\n"
+#: src/transport/plugin_transport_udp.c:2616
+msgid "UDP could not transmit IPv6 message! Please check your network configuration and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3812
+#: src/transport/plugin_transport_udp.c:2961
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3883
-#: src/transport/plugin_transport_udp.c:3897
-msgid "must be in [0,65535]"
+#: src/transport/plugin_transport_udp.c:3056
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3929
-#, fuzzy
-msgid "must be valid IPv4 address"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+#: src/transport/plugin_transport_udp.c:3097
+#, fuzzy, c-format
+#| msgid "must be valid IPv6 address"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "deve essere un indirizzo IPv6 valido"
 
-#: src/transport/plugin_transport_udp.c:3956
+#: src/transport/plugin_transport_udp.c:3168
 #, fuzzy
-msgid "must be valid IPv6 address"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to create network sockets, plugin failed\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/transport/plugin_transport_udp.c:4020
-msgid "Failed to create UDP network sockets\n"
+#: src/transport/plugin_transport_unix.c:1321
+#, c-format
+msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1416
-#, fuzzy, c-format
-msgid "Cannot bind to `%s'\n"
-msgstr "Connessione stabilita con `%s'\n"
+#: src/transport/plugin_transport_unix.c:1652
+msgid "No UNIXPATH given in configuration!\n"
+msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1816
+#: src/transport/plugin_transport_unix.c:1688
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:768
-msgid "# ACKs sent"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:620
+#, fuzzy
+#| msgid "# PONG messages decrypted"
+msgid "# WLAN ACKs sent"
+msgstr "# messaggi PONG decrittati"
 
-#: src/transport/plugin_transport_wlan.c:788
+#: src/transport/plugin_transport_wlan.c:639
 #, fuzzy
-msgid "# Messages defragmented"
+#| msgid "# PONG messages decrypted"
+msgid "# WLAN messages defragmented"
 msgstr "# messaggi PONG decrittati"
 
-#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:914
-msgid "# Sessions allocated"
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:772
+#: src/transport/plugin_transport_wlan.c:1948
+msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1035
-msgid "# message fragments sent"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:876
+#, fuzzy
+#| msgid "# SYN messages sent"
+msgid "# WLAN message fragments sent"
+msgstr "# messaggi SYN inviati"
 
-#: src/transport/plugin_transport_wlan.c:1064
-msgid "# messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:900
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2305
-msgid "# MAC endpoints allocated"
+#: src/transport/plugin_transport_wlan.c:1008
+#: src/transport/plugin_transport_wlan.c:1098
+#: src/transport/plugin_transport_wlan.c:1950
+msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1567
+#: src/transport/plugin_transport_wlan.c:1302
 #, fuzzy
-msgid "# ACKs received"
+#| msgid "# PONG messages received"
+msgid "# HELLO messages received via WLAN"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/plugin_transport_wlan.c:1636
-msgid "# DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1326
+msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1740
-msgid "# HELLO beacons sent"
+#: src/transport/plugin_transport_wlan.c:1336
+#, fuzzy
+#| msgid "# ACKs received"
+msgid "# ACKs received via WLAN"
+msgstr "# ACK ricevuti"
+
+#: src/transport/plugin_transport_wlan.c:1396
+msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1856
+#: src/transport/plugin_transport_wlan.c:1518
 #, fuzzy
-msgid "# DATA messages received"
+#| msgid "# PONG messages received"
+msgid "# DATA messages received via WLAN"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/plugin_transport_wlan.c:1890
+#: src/transport/plugin_transport_wlan.c:1553
 #, fuzzy
-msgid "# DATA messages processed"
+#| msgid "# PONG messages received"
+msgid "# WLAN DATA messages processed"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/plugin_transport_wlan.c:2280
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2302
-msgid "# sessions allocated"
-msgstr ""
-
-#: src/transport/tcp_connection_legacy.c:452
-#, c-format
-msgid "Access denied to `%s'\n"
-msgstr ""
-
-#: src/transport/tcp_connection_legacy.c:469
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
-
-#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1624
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr ""
-
-#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1634
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-
-#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1640
-#, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr ""
-
-#: src/transport/tcp_server_legacy.c:890
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:864
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:346
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1616
+#, fuzzy
+#| msgid "# bytes sent via SMTP"
+msgid "# HELLO beacons sent via WLAN"
+msgstr "# byte inviati via SMTP"
 
-#: src/transport/tcp_service_legacy.c:402 src/util/service.c:988
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/transport/plugin_transport_wlan.c:1729
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:440 src/util/service.c:1031
+#: src/transport/plugin_transport_wlan.c:1929
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1555
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:953
-#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1708
+#: src/transport/transport_api.c:739
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1741
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/transport/transport-testing.c:584
+msgid "Failed to initialize testing library!\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1161
+#: src/tun/regex.c:129
 #, c-format
-msgid "Failed to start `%s' at `%s'\n"
+msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1202
+#: src/util/bio.c:170 src/util/bio.c:178
 #, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:2015
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:2019
-msgid "Service process could not initialize server function\n"
+msgid "Error reading `%s': %s"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:2023
-msgid "Service process failed to report status\n"
-msgstr ""
+#: src/util/bio.c:180
+msgid "End of file"
+msgstr "Fine del file"
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1535
-#: src/util/service.c:1893
+#: src/util/bio.c:237
 #, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1895
-msgid "No such user"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1914
+#: src/util/bio.c:247
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:2276
-msgid "do daemonize (detach from terminal)"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/service.c:2340
-#: src/util/service.c:2355
+#: src/util/bio.c:293
 #, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr ""
-
-#: src/transport/tcp_service_legacy.c:1458 src/util/service.c:2367
-msgid "Malformed configuration, exit ...\n"
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1463
+#: src/util/bio.c:307
 #, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr ""
-
-#: src/transport/transport_api2_communication.c:764
-msgid "Dropped backchanel message: handler not provided by communicator\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/bio.c:181 src/util/bio.c:189
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
 #, c-format
-msgid "Error reading `%s': %s"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/bio.c:191
-msgid "End of file"
-msgstr "Fine del file"
-
-#: src/util/bio.c:248
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/client.c:360
 #, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+msgid "Could not determine valid hostname and port for service `%s' from configuration.\n"
 msgstr ""
 
-#: src/util/bio.c:306
+#: src/util/client.c:368
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:328
+#: src/util/client.c:1008
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr ""
 
-#: src/util/client.c:749
-msgid "not a valid filename"
-msgstr ""
+#: src/util/client.c:1020
+#, fuzzy, c-format
+#| msgid "Failed to start service `%s'\n"
+msgid "Failure to transmit request to service `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/client.c:941
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/util/client.c:1303
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1162
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1160
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
-msgstr ""
-
-#: src/util/common_logging.c:263 src/util/common_logging.c:1158
-msgid "MESSAGE"
-msgstr ""
+msgstr "INFO"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1156
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr ""
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1154
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1164
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr "NESSUNA"
 
-#: src/util/common_logging.c:633 src/util/common_logging.c:663
+#: src/util/common_logging.c:391
 #, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:898
+#: src/util/common_logging.c:817
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1165
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1458
+#: src/util/common_logging.c:1157
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1196
 msgid "invalid address"
-msgstr ""
+msgstr "indirizzo non valido"
 
-#: src/util/common_logging.c:1518
+#: src/util/common_logging.c:1214
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1539
+#: src/util/common_logging.c:1235
 #, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgid "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:331
+#: src/util/configuration.c:288
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:398
+#: src/util/configuration.c:996
 #, c-format
-msgid "Error while reading file `%s'\n"
-msgstr ""
-
-#: src/util/configuration.c:1016
-msgid "Not a valid relative time specification"
+msgid "Configuration value '%s' for '%s' in section '%s' is not in set of legal choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1105
+#: src/util/configuration.c:1066
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1224
+#: src/util/configuration.c:1098
 #, c-format
-msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1257
+#: src/util/configuration.c:1172
 #, c-format
-msgid "Missing closing `%s' in option `%s'\n"
+msgid "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined as an environmental variable\n"
 msgstr ""
 
-#: src/util/configuration.c:1325
+#: src/util/connection.c:423
 #, c-format
-msgid ""
-"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
-"as an environmental variable\n"
+msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:532
+#: src/util/connection.c:438
 #, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:887
+#: src/util/connection.c:553
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:946
+#: src/util/connection.c:751 src/util/connection.c:919
 #, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1025
+#: src/util/connection.c:910
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1086
+#: src/util/container_bloomfilter.c:531
 #, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, have %llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:123 src/util/crypto_ecc_setup.c:162
-#: src/util/crypto_ecc_setup.c:305 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
+#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:129 src/util/crypto_ecc_setup.c:311
+#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:166 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:196 src/util/crypto_ecc_setup.c:398
+#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
 #, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
+msgid "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:201 src/util/crypto_ecc_setup.c:402
+#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:468
+#: src/util/crypto_ecc.c:1016
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:306
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:850
-#, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:1189
+#: src/util/crypto_ecc.c:1120
 #, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/disk.c:1265
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:264
+#: src/util/crypto_ecc.c:1170
 #, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:954
+#: src/util/crypto_ecc.c:1244
 #, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:231
+#: src/util/crypto_ecc.c:1301
 #, c-format
-msgid "Could not bind to any port: %s\n"
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/dnsstub.c:362
+#: src/util/crypto_random.c:284
 #, c-format
-msgid "Received DNS response that is too small (%u bytes)"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/dnsstub.c:509
+#: src/util/disk.c:1184
 #, c-format
-msgid "Failed to send DNS request to %s: %s\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsstub.c:515
+#: src/util/disk.c:1546 src/util/service.c:1318
 #, c-format
-msgid "Sent DNS request to %s\n"
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
 #: src/util/getopt.c:568
@@ -7989,148 +7700,74 @@ msgstr ""
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:947
+#: src/util/getopt.c:933
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt.c:962
+#: src/util/getopt_helpers.c:84
 #, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:70
-msgid "print the version number"
-msgstr ""
-
-#: src/util/getopt_helpers.c:116
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:204
-msgid "print this help"
+msgid "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:282 src/util/gnunet-qr.c:300
-msgid "be verbose"
-msgstr ""
-
-#: src/util/getopt_helpers.c:423
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:503
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:525
-msgid "use configuration file FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:564 src/util/getopt_helpers.c:770
-#: src/util/getopt_helpers.c:839
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:629
+#: src/util/getopt_helpers.c:298
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:695
-#, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:760
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number \n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:846
-#, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:932
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:161
-#, c-format
-msgid "failed to load configuration defaults"
-msgstr ""
-
-#: src/util/gnunet-config.c:174
-#, c-format
-msgid "%s or %s argument is required\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:182
+#: src/util/gnunet-config.c:90
 #, c-format
-msgid "The following sections are available:\n"
+msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:133
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:288
-msgid "interpret option value as a filename (with $-expansion)"
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:293
+#: src/util/gnunet-config.c:163
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:298
+#: src/util/gnunet-config.c:166
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:303
+#: src/util/gnunet-config.c:169
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:307
-msgid "print available configuration sections"
-msgstr ""
-
-#: src/util/gnunet-config.c:311
-msgid "write configuration file that only contains delta to defaults"
-msgstr ""
-
-#: src/util/gnunet-config.c:324
+#: src/util/gnunet-config.c:178
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:94
+#: src/util/gnunet-ecc.c:75
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:130
-#, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:143
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:97
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:194
+#: src/util/gnunet-ecc.c:107
 #, c-format
 msgid ""
 "\n"
@@ -8139,509 +7776,562 @@ msgstr ""
 "\n"
 "Completato!\n"
 
-#: src/util/gnunet-ecc.c:197
+#: src/util/gnunet-ecc.c:110
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:290
+#: src/util/gnunet-ecc.c:199
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:305
+#: src/util/gnunet-ecc.c:210
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:334
+#: src/util/gnunet-ecc.c:232
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:391
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:456
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:461
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:466
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:470
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:478
-msgid "print the public key in HEX format"
+#: src/util/gnunet-ecc.c:361
+msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:482
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:498
+#: src/util/gnunet-ecc.c:375
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-qr.c:108 src/util/gnunet-uri.c:91
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:116 src/util/gnunet-uri.c:98
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+#: src/util/gnunet-resolver.c:149
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-qr.c:127 src/util/gnunet-uri.c:108
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
+#: src/util/gnunet-resolver.c:160
+msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-qr.c:297
-msgid "use video-device DEVICE (default: /dev/video0"
+#: src/util/gnunet-scrypt.c:279
+msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-qr.c:303
-msgid "do not show preview windows"
+#: src/util/gnunet-scrypt.c:282
+msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-qr.c:311
-msgid "Scan a QR code using a video device and import the uri read"
+#: src/util/gnunet-scrypt.c:285
+msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:168
-msgid "perform a reverse lookup"
+#: src/util/gnunet-scrypt.c:288
+msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
-msgid "Use build-in GNUnet stub resolver"
+#: src/util/gnunet-scrypt.c:299
+msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:242
+#: src/util/gnunet-service-resolver.c:299
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:317
-msgid "number of bits to require for the proof of work"
+msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:322
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:327
-msgid "file with proof of work, otherwise default is used"
+#: src/util/gnunet-service-resolver.c:371
+#: src/util/gnunet-service-resolver.c:412
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:332
-msgid "time to wait between calculations"
+#: src/util/gnunet-uri.c:84
+#, c-format
+msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:345
-msgid "Manipulate GNUnet proof of work files"
+#: src/util/gnunet-uri.c:89
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1424
-msgid "No DNS server available. DNS resolution will not be possible.\n"
+#: src/util/gnunet-uri.c:96
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:85
+#: src/util/gnunet-uri.c:106
 #, c-format
-msgid "No URI specified on command line\n"
+msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:170
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:335
+#: src/util/helper.c:338
 #, c-format
 msgid "Error reading from `%s': %s\n"
-msgstr ""
+msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/helper.c:386
+#: src/util/helper.c:383
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:606
+#: src/util/helper.c:609
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:176
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1835 src/util/network.c:2019
+#: src/util/network.c:1355 src/util/network.c:1480
 #, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgid "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:509
+#: src/util/os_installation.c:421
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Could not determine installation path for %s.  Set `%s' environment variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:881
+#: src/util/os_installation.c:766
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:922
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/os_installation.c:953
+#: src/util/os_installation.c:826
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:963
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:86
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:151
+#: src/util/plugin.c:148
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:226
+#: src/util/plugin.c:223
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:385
+#: src/util/plugin.c:382
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:283
+#: src/util/program.c:246 src/util/service.c:1452
 #, c-format
-msgid "Unreadable or malformed configuration file `%s', exit ...\n"
+msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:301
+#: src/util/program.c:258 src/util/service.c:1467
 #, c-format
-msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
+msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:318
-msgid "Unreadable or malformed configuration, exit ...\n"
+#: src/util/program.c:263 src/util/service.c:1462
+msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/util/regex.c:134
+#: src/util/resolver_api.c:198
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:218
+#: src/util/resolver_api.c:216
 #, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:239
+#: src/util/resolver_api.c:348
 #, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:875
+#: src/util/resolver_api.c:352
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:888
+#: src/util/resolver_api.c:908
 #, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1073
-msgid "Resolver not configured correctly.\n"
+#: src/util/scheduler.c:813
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1160 src/util/resolver_api.c:1183
-#: src/util/resolver_api.c:1197
+#: src/util/scheduler.c:948
 #, c-format
-msgid "Could not resolve our FQDN: %s\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/service.c:668
+#: src/util/server.c:484
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
+msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/service.c:1820
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+#: src/util/server.c:493
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/signal.c:89
+#: src/util/server.c:499
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr ""
+
+#: src/util/server.c:892
+#, c-format
+msgid "Processing code for message of type %u did not call `GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+
+#: src/util/service.c:347
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+
+#: src/util/service.c:354
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+
+#: src/util/service.c:409
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/util/service.c:446
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/util/service.c:563
+#, c-format
+msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/util/service.c:653
+#, c-format
+msgid "Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"
+msgstr ""
+
+#: src/util/service.c:669
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/util/service.c:903
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:952 src/util/service.c:970
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/util/service.c:995
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1165
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr ""
+
+#: src/util/service.c:1207
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+
+#: src/util/service.c:1256
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/socks.c:597
+#: src/util/service.c:1260
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/util/service.c:1264
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/util/service.c:1319
+msgid "No such user"
+msgstr ""
+
+#: src/util/service.c:1332
 #, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr ""
+
+#: src/util/service.c:1402
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/socks.c:616
+#: src/util/signal.c:89
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:176
+#: src/util/strings.c:145
 msgid "b"
 msgstr ""
 
-#: src/util/strings.c:475
+#: src/util/strings.c:433
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:602
+#: src/util/strings.c:561
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:706
+#: src/util/strings.c:658
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:710
+#: src/util/strings.c:662
 msgid "forever"
 msgstr "per sempre"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:664
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:670
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:676
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:682
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:736
+#: src/util/strings.c:688
 msgid "h"
 msgstr "o"
 
-#: src/util/strings.c:743
+#: src/util/strings.c:695
 msgid "day"
 msgstr "giorno"
 
-#: src/util/strings.c:745
+#: src/util/strings.c:697
 msgid "days"
 msgstr "giorni"
 
-#: src/util/strings.c:774
+#: src/util/strings.c:726
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1277
+#: src/util/strings.c:1159
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1285
+#: src/util/strings.c:1167
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1173
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1301
+#: src/util/strings.c:1180
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1310
+#: src/util/strings.c:1189
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1586 src/util/strings.c:1602
+#: src/util/strings.c:1395 src/util/strings.c:1411
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1611
+#: src/util/strings.c:1420
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1696 src/util/strings.c:1728 src/util/strings.c:1777
-#: src/util/strings.c:1798
+#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
+#: src/util/strings.c:1603
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1754
+#: src/util/strings.c:1560
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1807
+#: src/util/strings.c:1612
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1860
+#: src/util/strings.c:1664
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1914
+#: src/util/strings.c:1714
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1945
+#: src/util/strings.c:1745
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/time.c:828 src/util/time.c:860
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:866
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
 msgid "# Active channels"
 msgstr "# Canali attivi"
 
-#: src/vpn/gnunet-service-vpn.c:599
-msgid "# Messages dropped in cadet queue (overflow)"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:753
-msgid "# ICMP packets received from cadet"
+#: src/vpn/gnunet-service-vpn.c:642
+msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1096
-msgid "# UDP packets received from cadet"
+#: src/vpn/gnunet-service-vpn.c:680
+msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1255
-msgid "# TCP packets received from cadet"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+#| msgid "# PONG messages decrypted"
+msgid "# Mesh channels created"
+msgstr "# messaggi PONG decrittati"
 
-#: src/vpn/gnunet-service-vpn.c:1467
-msgid "# Cadet channels created"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:784
+#, fuzzy
+#| msgid "Failed to create statistics!\n"
+msgid "Failed to setup mesh channel!\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/vpn/gnunet-service-vpn.c:1687
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1826
-msgid "# Packets dropped (channel not yet online)"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2006
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2027
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2235
+#: src/vpn/gnunet-service-vpn.c:1531
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2314
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2328
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2367
+#: src/vpn/gnunet-service-vpn.c:1706
+msgid "# ICMP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2045
+msgid "# UDP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2200
+msgid "# TCP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2422
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2735
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2998
+#: src/vpn/gnunet-service-vpn.c:2982
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3022
+#: src/vpn/gnunet-service-vpn.c:3006
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3030
+#: src/vpn/gnunet-service-vpn.c:3014
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3043
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3056
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3066
+#: src/vpn/gnunet-service-vpn.c:3050
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8649,95 +8339,137 @@ msgstr ""
 msgid "Error creating tunnel\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:204
+#: src/vpn/gnunet-vpn.c:203
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:216
+#: src/vpn/gnunet-vpn.c:215
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:236
+#: src/vpn/gnunet-vpn.c:235
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:256
+#: src/vpn/gnunet-vpn.c:255
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/vpn/gnunet-vpn.c:292
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:315
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:321
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:326
+#: src/vpn/gnunet-vpn.c:308
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:311
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:344
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:838
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
-msgid "Failed to connect to the namestore!\n"
-msgstr ""
-
-#: src/include/gnunet_common.h:773 src/include/gnunet_common.h:780
-#: src/include/gnunet_common.h:790
-#, c-format
-msgid "Assertion failed at %s:%d. Aborting.\n"
-msgstr ""
-
-#: src/include/gnunet_common.h:798
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:810
+#: src/include/gnunet_common.h:593
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:837 src/include/gnunet_common.h:846
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#~ msgid "Benchmarking done\n"
-#~ msgstr "Benchmark completato\n"
+#, fuzzy
+#~| msgid "# items stored"
+#~ msgid "is stopped"
+#~ msgstr "# elementi memorizzati"
+
+#~ msgid "inactive "
+#~ msgstr "non attivo"
+
+#, fuzzy
+#~| msgid "# friends connected"
+#~ msgid "fresh connection"
+#~ msgstr "# amici connessi"
+
+#~ msgid "connection established"
+#~ msgstr "connessione stabilita"
+
+#~ msgid "unknown state"
+#~ msgstr "stato sconosciuto"
+
+#~ msgid "# PING messages transmitted"
+#~ msgstr "# Messaggi PING trasmessi"
+
+#~ msgid "invalid argument"
+#~ msgstr "argomento non valido"
+
+#, fuzzy
+#~| msgid "URI is `%s'.\n"
+#~ msgid "Namespace URI is `%s'.\n"
+#~ msgstr ""
+#~ "L'URI è `%s'.\n"
+#~ "\n"
+
+#, fuzzy
+#~| msgid "`%s' is not a valid IP address.\n"
+#~ msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+#~ msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#, fuzzy
+#~| msgid "Unknown command `%s'\n"
+#~ msgid "Unknown record type `%s'\n"
+#~ msgstr "Comando `%s' sconosciuto.\n"
+
+#~ msgid "must be valid IPv4 address"
+#~ msgstr "deve essere un indirizzo IPv4 valido"
+
+#, fuzzy
+#~| msgid "Failed to create statistics!\n"
+#~ msgid "Failed to create UDP network sockets\n"
+#~ msgstr "Generazione statistiche fallita\n"
+
+#, fuzzy
+#~| msgid "Connection established to `%s'\n"
+#~ msgid "Cannot bind to `%s'\n"
+#~ msgstr "Connessione stabilita con `%s'\n"
 
-#~ msgid "Peer `%s'\n"
-#~ msgstr "Peer `%s'\n"
+#~ msgid "Error while reading file `%s'\n"
+#~ msgstr "Errore di lettura del file `%s'\n"