gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r37057 - in gnunet: po src/include src/peerstore


From: gnunet
Subject: [GNUnet-SVN] r37057 - in gnunet: po src/include src/peerstore
Date: Tue, 19 Apr 2016 13:50:50 +0200

Author: dold
Date: 2016-04-19 13:50:49 +0200 (Tue, 19 Apr 2016)
New Revision: 37057

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/fr.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/include/gnunet_consensus_service.h
   gnunet/src/include/gnunet_peerstore_service.h
   gnunet/src/include/gnunet_secretsharing_service.h
   gnunet/src/include/gnunet_sensor_service.h
   gnunet/src/include/gnunet_sensordashboard_service.h
   gnunet/src/peerstore/peerstore_common.h
Log:
Do not include platform.h in headers from include/


Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2016-04-19 11:25:51 UTC (rev 37056)
+++ gnunet/po/de.po     2016-04-19 11:50:49 UTC (rev 37057)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-10-11 21:29+0200\n"
+"POT-Creation-Date: 2016-04-18 17:19+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -21,11 +21,11 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/arm/arm_api.c:337
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/arm_monitor_api.c:321
+#: src/arm/arm_monitor_api.c:324
 msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
@@ -40,11 +40,11 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
+#: src/arm/gnunet-arm.c:217
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
@@ -51,130 +51,130 @@
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "ARM API is busy"
 msgstr "ARM-API ist belegt"
 
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:223
 msgid "Request does not fit into a message"
 msgstr "Anfrage passt nicht in eine Meldung"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request timed out"
 msgstr "Zeitüberschreitung der Anfrage"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
 #, c-format
 msgid "%s service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:261
 #, 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
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "ARM-Dienst konnte nicht gestartet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:367
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:377
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:419
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:515
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:523
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Fehler bei der Kommunikation mit ARM. Läuft ARM nicht?\n"
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
 
@@ -236,7 +236,7 @@
 msgstr "Keine Statusmeldungen ausgeben"
 
 #: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:746
@@ -265,64 +265,64 @@
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:542
+#: src/arm/gnunet-service-arm.c:581
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:553
+#: src/arm/gnunet-service-arm.c:592
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:653
+#: src/arm/gnunet-service-arm.c:693
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:677
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:713
+#: src/arm/gnunet-service-arm.c:753
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:853
+#: src/arm/gnunet-service-arm.c:891
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1123
+#: src/arm/gnunet-service-arm.c:1160
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/arm/gnunet-service-arm.c:1281
+#: src/arm/gnunet-service-arm.c:1324
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1286
+#: src/arm/gnunet-service-arm.c:1329
 msgid "signal"
 msgstr "Signal"
 
-#: src/arm/gnunet-service-arm.c:1291
+#: src/arm/gnunet-service-arm.c:1334
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: src/arm/gnunet-service-arm.c:1297
+#: src/arm/gnunet-service-arm.c:1340
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst »%s« benötigte %s zum Beenden\n"
 
-#: src/arm/gnunet-service-arm.c:1319
+#: src/arm/gnunet-service-arm.c:1367
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "Dienst »%s« wurde normal beendet, wird jederzeit neu gestartet\n"
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1384
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -331,7 +331,7 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -338,7 +338,7 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2796
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -345,7 +345,7 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2837
+#: src/ats/gnunet-ats-solver-eval.c:2840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -352,28 +352,28 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3290 src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats-tests/gnunet-solver-eval.c:927
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3302
 msgid "print logging"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3308
 msgid "disable normalization"
 msgstr ""
 
@@ -422,10 +422,10 @@
 #: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
 #: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
 #: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
-#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
-#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
-#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
+#: 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
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -499,11 +499,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/ats-tests/ats-testing-log.c:834
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr "Protokollierung stoppen\n"
 
-#: src/ats-tests/ats-testing-log.c:885
+#: src/ats-tests/ats-testing-log.c:888
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -515,17 +515,17 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:289
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:293
+#: src/ats-tool/gnunet-ats.c:311
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:395
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -532,116 +532,114 @@
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:483
+#: src/ats-tool/gnunet-ats.c:512
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:705
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
-#: src/namestore/plugin_rest_namestore.c:850
-#: src/transport/gnunet-transport.c:1890
-#: src/transport/gnunet-transport-profiler.c:531
-#, c-format
-msgid "Service `%s' is not running\n"
-msgstr "Dienst »%s« läuft nicht\n"
-
-#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/transport/gnunet-transport.c:1797
+#: src/transport/gnunet-transport-profiler.c:523
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/ats-tool/gnunet-ats.c:732
+#: src/ats-tool/gnunet-ats.c:773
 #, 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:754 src/ats-tool/gnunet-ats.c:780
-#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
+#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:862
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:827
+#: src/ats-tool/gnunet-ats.c:869
 msgid "No peer given!\n"
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/ats-tool/gnunet-ats.c:845
+#: src/ats-tool/gnunet-ats.c:887
 msgid "Valid type required\n"
 msgstr "Gültiger Typ ist erforderlich\n"
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:949
 msgid "get list of active addresses currently used"
 msgstr "Liste aller derzeit genutzten aktiven Adressen holen"
 
-#: src/ats-tool/gnunet-ats.c:918
+#: src/ats-tool/gnunet-ats.c:951
 msgid "get list of all active addresses"
 msgstr "Liste aller aktiven Adressen holen"
 
-#: src/ats-tool/gnunet-ats.c:921
+#: src/ats-tool/gnunet-ats.c:954
+#, fuzzy
+msgid "connect to PEER"
+msgstr "Mit einem Knoten verbinden"
+
+#: src/ats-tool/gnunet-ats.c:957
 msgid "do not resolve IP addresses to hostnames"
 msgstr "IP-Adressen nicht zu Rechnernamen auflösen"
 
-#: src/ats-tool/gnunet-ats.c:923
+#: src/ats-tool/gnunet-ats.c:959
 msgid "monitor mode"
 msgstr "Überwachungsmodus"
 
-#: src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:961
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:927
+#: src/ats-tool/gnunet-ats.c:963
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:929
+#: src/ats-tool/gnunet-ats.c:965
 msgid "peer id"
 msgstr "Knoten-ID"
 
-#: src/ats-tool/gnunet-ats.c:932
+#: src/ats-tool/gnunet-ats.c:968
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:934
+#: src/ats-tool/gnunet-ats.c:970
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:937
+#: src/ats-tool/gnunet-ats.c:973
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:944
+#: src/ats-tool/gnunet-ats.c:983
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:460
+#: src/cadet/gnunet-cadet.c:458
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:737
+#: src/cadet/gnunet-cadet.c:736
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
@@ -651,76 +649,81 @@
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:846
+#: src/cadet/gnunet-cadet.c:844
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:941
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:946
+#: src/cadet/gnunet-cadet.c:944
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:949
+#: src/cadet/gnunet-cadet.c:947
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:953
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:956
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:961
+#: src/cadet/gnunet-cadet.c:959
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:964
+#: src/cadet/gnunet-cadet.c:962
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:965
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:543
+#: src/cadet/gnunet-service-cadet_peer.c:561
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:478
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-profiler.c:481
+#: src/consensus/gnunet-consensus-profiler.c:499
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:484
-#: src/set/gnunet-set-profiler.c:356 src/set/gnunet-set-profiler.c:359
-#: src/set/gnunet-set-profiler.c:362
+#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/set/gnunet-set-profiler.c:374 src/set/gnunet-set-profiler.c:377
+#: src/set/gnunet-set-profiler.c:380
 msgid "number of values"
 msgstr "Anzahl der Werte"
 
-#: src/consensus/gnunet-consensus-profiler.c:487
+#: src/consensus/gnunet-consensus-profiler.c:505
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:490
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:493
-#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/set/gnunet-set-profiler.c:386
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/secretsharing/gnunet-secretsharing-profiler.c:623
 msgid "be more verbose (print received values)"
 msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
 
@@ -960,39 +963,39 @@
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1175
+#: src/conversation/gnunet-conversation.c:1171
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1188
+#: src/conversation/gnunet-conversation.c:1184
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1219
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1247
+#: src/conversation/gnunet-conversation.c:1243
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1272
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
+#: src/conversation/gnunet-conversation.c:1298
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, c-format
 msgid ""
 "\n"
@@ -999,7 +1002,7 @@
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:145
 #, c-format
 msgid ""
 "\n"
@@ -1007,7 +1010,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:211
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1014,13 +1017,18 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/sensordashboard/gnunet-sensordashboard.c:70
+#: src/conversation/gnunet-conversation-test.c:244
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "Hilfetext"
 
+#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
+
 #: src/conversation/gnunet-helper-audio-playback.c:318
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
@@ -1084,11 +1092,6 @@
 msgid "Read error from STDIN: %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
-
 #: src/conversation/gnunet-helper-audio-record.c:344
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
@@ -1174,67 +1177,67 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:726
+#: src/core/core_api.c:725
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:92
+#: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
 msgstr "# verbundener Freunde"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:93
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
+#: src/core/gnunet-core.c:96
 #, fuzzy
 msgid "key received"
 msgstr "# empfangene Ergebnisse"
 
-#: src/core/gnunet-core.c:101
+#: src/core/gnunet-core.c:99
 #, fuzzy
 msgid "connection established"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/core/gnunet-core.c:104
+#: src/core/gnunet-core.c:102
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
+#: src/core/gnunet-core.c:105
 #, fuzzy
 msgid "disconnected"
 msgstr "# verbundener Freunde"
 
-#: src/core/gnunet-core.c:114
+#: src/core/gnunet-core.c:112
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/core/gnunet-core.c:117
+#: src/core/gnunet-core.c:115
 #, fuzzy
 msgid "unknown state"
 msgstr "Unbekannter Fehler"
 
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:120
 #, fuzzy, c-format
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 
-#: src/core/gnunet-core.c:157
+#: src/core/gnunet-core.c:155
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
@@ -1247,16 +1250,16 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:379
+#: src/core/gnunet-service-core_clients.c:380
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:497
+#: src/core/gnunet-service-core_clients.c:498
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:562
+#: src/core/gnunet-service-core_clients.c:561
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
@@ -1304,7 +1307,7 @@
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1081
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -1314,98 +1317,91 @@
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#, 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:1093
+#: src/core/gnunet-service-core_kx.c:1091
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1122
+#: src/core/gnunet-service-core_kx.c:1118
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1131
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1206
-#: src/transport/gnunet-service-transport_validation.c:1392
+#: src/core/gnunet-service-core_kx.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1404
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1213
+#: src/core/gnunet-service-core_kx.c:1209
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1218
+#: src/core/gnunet-service-core_kx.c:1214
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1254
+#: src/core/gnunet-service-core_kx.c:1250
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1292
+#: src/core/gnunet-service-core_kx.c:1288
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1310
+#: src/core/gnunet-service-core_kx.c:1306
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1466
+#: src/core/gnunet-service-core_kx.c:1462
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1474
+#: src/core/gnunet-service-core_kx.c:1470
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1473
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1535
-#: src/core/gnunet-service-core_kx.c:1561
+#: src/core/gnunet-service-core_kx.c:1531
+#: src/core/gnunet-service-core_kx.c:1557
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1548
+#: src/core/gnunet-service-core_kx.c:1544
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1586
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1598
+#: src/core/gnunet-service-core_kx.c:1594
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1628
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1414,7 +1410,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:384
+#: src/core/gnunet-service-core_neighbours.c:387
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1422,34 +1418,34 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:470
+#: src/core/gnunet-service-core_neighbours.c:486
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
 #: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:339
-#: src/dht/gnunet-service-dht_neighbours.c:660
-#: src/dht/gnunet-service-dht_neighbours.c:725
-#: src/fs/gnunet-service-fs_cp.c:655 src/fs/gnunet-service-fs_cp.c:1649
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:755
-#: src/transport/gnunet-service-transport_neighbours.c:763
+#: src/core/gnunet-service-core_sessions.c:337
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:867
+#: src/fs/gnunet-service-fs_cp.c:657 src/fs/gnunet-service-fs_cp.c:1718
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/transport/gnunet-service-transport_neighbours.c:720
+#: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:286
+#: src/core/gnunet-service-core_sessions.c:284
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:405
+#: src/core/gnunet-service-core_sessions.c:403
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:414
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
@@ -1465,7 +1461,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:866
+#: src/datastore/gnunet-service-datastore.c:863
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
@@ -1513,9 +1509,9 @@
 #: src/datastore/plugin_datastore_sqlite.c:65 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_postgres.c:53
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
@@ -1523,7 +1519,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:671 src/include/gnunet_common.h:680
+#: src/include/gnunet_common.h:676 src/include/gnunet_common.h:685
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1536,43 +1532,43 @@
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:310
+#: src/datastore/datastore_api.c:308
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:395
+#: src/datastore/datastore_api.c:392
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:450
+#: src/datastore/datastore_api.c:447
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:478
+#: src/datastore/datastore_api.c:475
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/datastore/datastore_api.c:498
+#: src/datastore/datastore_api.c:495
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:536
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:628
+#: src/datastore/datastore_api.c:624
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:652
+#: src/datastore/datastore_api.c:648
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:790
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
@@ -1579,102 +1575,102 @@
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:808
+#: src/datastore/datastore_api.c:804
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:820 src/datastore/datastore_api.c:826
+#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige Fehlermeldung vom Datenspeicherdienst empfangen"
 
-#: src/datastore/datastore_api.c:830
+#: src/datastore/datastore_api.c:826
 msgid "# status messages received"
 msgstr "# empfangene Statusmeldungen"
 
-#: src/datastore/datastore_api.c:909
+#: src/datastore/datastore_api.c:905
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:975
+#: src/datastore/datastore_api.c:971
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1036
+#: src/datastore/datastore_api.c:1032
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1096
+#: src/datastore/datastore_api.c:1092
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1160
+#: src/datastore/datastore_api.c:1156
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1264
+#: src/datastore/datastore_api.c:1260
 msgid "# Results received"
 msgstr "# empfangene Ergebnisse"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1327
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1394
+#: src/datastore/datastore_api.c:1390
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1463
+#: src/datastore/datastore_api.c:1459
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:113
 #, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Objekt konnte nicht gespeichert werden: %s, Abbruch\n"
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:199
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
+#: src/datastore/gnunet-datastore.c:245
 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:255
+#: src/datastore/gnunet-datastore.c:254
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/gnunet-service-datastore.c:372
+#: src/datastore/gnunet-service-datastore.c:370
 msgid "# bytes expired"
 msgstr "# abgelaufene Bytes"
 
-#: src/datastore/gnunet-service-datastore.c:447
+#: src/datastore/gnunet-service-datastore.c:444
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:505
-#: src/gns/gnunet-gns-helper-service-w32.c:223
+#: src/datastore/gnunet-service-datastore.c:502
+#: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:536
-#: src/gns/gnunet-gns-helper-service-w32.c:262
+#: src/datastore/gnunet-service-datastore.c:533
+#: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:652
+#: src/datastore/gnunet-service-datastore.c:649
 msgid "# results found"
 msgstr "# gefundene Ergebnisse"
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:694
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1681,7 +1677,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:705
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1688,134 +1684,134 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:709
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:715
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:779
-#: src/datastore/gnunet-service-datastore.c:1035
-#: src/datastore/gnunet-service-datastore.c:1630
+#: src/datastore/gnunet-service-datastore.c:721
+#: src/datastore/gnunet-service-datastore.c:776
+#: src/datastore/gnunet-service-datastore.c:1037
+#: src/datastore/gnunet-service-datastore.c:1670
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:793
+#: src/datastore/gnunet-service-datastore.c:790
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:877
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1088
+#: src/datastore/gnunet-service-datastore.c:1092
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1101
+#: src/datastore/gnunet-service-datastore.c:1105
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1153
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1170
+#: src/datastore/gnunet-service-datastore.c:1185
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1204
+#: src/datastore/gnunet-service-datastore.c:1221
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1267
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1244
+#: src/datastore/gnunet-service-datastore.c:1277
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1321
+#: src/datastore/gnunet-service-datastore.c:1362
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1326
+#: src/datastore/gnunet-service-datastore.c:1367
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1379
+#: src/datastore/gnunet-service-datastore.c:1420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1390
+#: src/datastore/gnunet-service-datastore.c:1431
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1459
-#: src/datastore/gnunet-service-datastore.c:1522
+#: src/datastore/gnunet-service-datastore.c:1500
+#: src/datastore/gnunet-service-datastore.c:1563
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1509
+#: src/datastore/gnunet-service-datastore.c:1550
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1519
+#: src/datastore/gnunet-service-datastore.c:1560
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1661
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:1701
+#: src/datastore/gnunet-service-datastore.c:1713
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1707
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1679
+#: src/datastore/gnunet-service-datastore.c:1719
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1681
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1696
+#: src/datastore/gnunet-service-datastore.c:1736
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1714
-#: src/datastore/gnunet-service-datastore.c:1730
+#: src/datastore/gnunet-service-datastore.c:1754
+#: src/datastore/gnunet-service-datastore.c:1770
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1800
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
@@ -1847,18 +1843,18 @@
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_postgres.c:331
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:846
+#: src/datastore/plugin_datastore_postgres.c:975
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:882
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/namecache/plugin_namecache_postgres.c:398
+#: src/namestore/plugin_namestore_postgres.c:571
 msgid "Postgres database running\n"
 msgstr "PostgreSQL-Datenbank läuft\n"
 
@@ -1909,7 +1905,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:132
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1916,147 +1912,147 @@
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:158
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:172
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
+#: src/dht/gnunet-dht-put.c:199
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:191
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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:794
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:954
+#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:270
+#: src/dht/gnunet-dht-put.c:214 src/fs/gnunet-auto-share.c:788
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:952
 #: src/fs/gnunet-search.c:306 src/fs/gnunet-unindex.c:167
-#: src/nse/gnunet-nse-profiler.c:873
+#: src/nse/gnunet-nse-profiler.c:872
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:224
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:267
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:292
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1393 src/testbed/gnunet-testbed-profiler.c:267
+#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1418
+#: src/dht/gnunet_dht_profiler.c:1421
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1424
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
+#: src/dht/gnunet_dht_profiler.c:1427 src/nse/gnunet-nse-profiler.c:863
+#: src/testbed/gnunet-testbed-profiler.c:304
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1427
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1442
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1457
+#: src/dht/gnunet_dht_profiler.c:1460
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:119
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:122
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:125
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:154
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:161
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:177
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:193
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:196
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:208
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:237
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2191,64 +2187,60 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:514
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:608
+#: src/dht/gnunet-service-dht_neighbours.c:739
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:762
-#: src/dht/gnunet-service-xdht_neighbours.c:6061
+#: src/dht/gnunet-service-dht_neighbours.c:904
+#: src/dht/gnunet-service-xdht_neighbours.c:6056
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:937
 #: src/dht/gnunet-service-xdht_neighbours.c:986
 #, fuzzy
 msgid "# Messages dropped (CORE timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:822
+#: src/dht/gnunet-service-dht_neighbours.c:967
 #: src/dht/gnunet-service-xdht_neighbours.c:1018
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:868
+#: src/dht/gnunet-service-dht_neighbours.c:1013
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-dht_neighbours.c:1047
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1104
-#: src/dht/gnunet-service-dht_neighbours.c:1141
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1119
-#: src/dht/gnunet-service-dht_neighbours.c:1156
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1304
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1451
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1329
+#: src/dht/gnunet-service-dht_neighbours.c:1480
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1339
-#: src/dht/gnunet-service-dht_neighbours.c:1463
-#: src/dht/gnunet-service-dht_neighbours.c:1568
+#: src/dht/gnunet-service-dht_neighbours.c:1490
+#: src/dht/gnunet-service-dht_neighbours.c:1614
+#: src/dht/gnunet-service-dht_neighbours.c:1721
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2261,61 +2253,61 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1425
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1603
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1728
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1815
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1665
+#: src/dht/gnunet-service-dht_neighbours.c:1818
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1990
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1841
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1936
+#: src/dht/gnunet-service-dht_neighbours.c:2093
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1939
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2004
+#: src/dht/gnunet-service-dht_neighbours.c:2161
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2175
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2103
+#: src/dht/gnunet-service-dht_neighbours.c:2261
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2106
+#: src/dht/gnunet-service-dht_neighbours.c:2264
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2420,22 +2412,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3558
+#: src/dht/gnunet-service-xdht_neighbours.c:3555
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3699
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4241
-#: src/dht/gnunet-service-xdht_neighbours.c:4422
-#: src/dht/gnunet-service-xdht_neighbours.c:4935
-#: src/dht/gnunet-service-xdht_neighbours.c:5328
-#: src/dht/gnunet-service-xdht_neighbours.c:5421
-#: src/dht/gnunet-service-xdht_neighbours.c:5511
-#: src/dht/gnunet-service-xdht_neighbours.c:5615
-#: src/dht/gnunet-service-xdht_neighbours.c:5759
-#: src/dht/gnunet-service-xdht_neighbours.c:5848
+#: src/dht/gnunet-service-xdht_neighbours.c:3696
+#: src/dht/gnunet-service-xdht_neighbours.c:3934
+#: src/dht/gnunet-service-xdht_neighbours.c:4086
+#: src/dht/gnunet-service-xdht_neighbours.c:4238
+#: src/dht/gnunet-service-xdht_neighbours.c:4419
+#: src/dht/gnunet-service-xdht_neighbours.c:4932
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5506
+#: src/dht/gnunet-service-xdht_neighbours.c:5610
+#: src/dht/gnunet-service-xdht_neighbours.c:5754
+#: src/dht/gnunet-service-xdht_neighbours.c:5843
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# Bytes des Typs %d empfangen"
@@ -2497,22 +2489,22 @@
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:297
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:366
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:438
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -2541,57 +2533,57 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:459
+#: src/dns/gnunet-service-dns.c:457
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:606
+#: src/dns/gnunet-service-dns.c:604
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:717
+#: src/dns/gnunet-service-dns.c:715
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:795
+#: src/dns/gnunet-service-dns.c:793
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:910
+#: src/dns/gnunet-service-dns.c:908
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:926
+#: src/dns/gnunet-service-dns.c:924
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:935
+#: src/dns/gnunet-service-dns.c:933
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:943
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1012
+#: src/dns/gnunet-service-dns.c:1010
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1064 src/exit/gnunet-daemon-exit.c:3615
+#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1082
+#: src/dns/gnunet-service-dns.c:1081
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:169
+#: src/dv/gnunet-dv.c:167
 msgid "verbose output"
 msgstr "Ausführliche Ausgabe"
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:176
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -2756,194 +2748,194 @@
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:3271 src/exit/gnunet-daemon-exit.c:3281
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3295 src/exit/gnunet-daemon-exit.c:3303
+#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3334
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3362
+#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373
+#: src/exit/gnunet-daemon-exit.c:3371
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3555
+#: src/exit/gnunet-daemon-exit.c:3549
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3571
+#: src/exit/gnunet-daemon-exit.c:3565
 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:3579
+#: src/exit/gnunet-daemon-exit.c:3573
 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:3586
+#: src/exit/gnunet-daemon-exit.c:3580
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3592
+#: src/exit/gnunet-daemon-exit.c:3586
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3598 src/exit/gnunet-daemon-exit.c:3763
-#: src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3592 src/exit/gnunet-daemon-exit.c:3757
+#: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3710
+#: src/exit/gnunet-daemon-exit.c:3704
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3861
+#: src/exit/gnunet-daemon-exit.c:3855
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:277
+#: src/fragmentation/defragmentation.c:275
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:470
-#: src/transport/plugin_transport_wlan.c:1534
+#: src/fragmentation/defragmentation.c:468
+#: src/transport/plugin_transport_wlan.c:1528
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/defragmentation.c:540
+#: src/fragmentation/defragmentation.c:538
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fragmentation/defragmentation.c:558
+#: src/fragmentation/defragmentation.c:556
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:235
+#: src/fragmentation/fragmentation.c:240
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:245
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:269
+#: src/fragmentation/fragmentation.c:274
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/fragmentation.c:315
+#: src/fragmentation/fragmentation.c:321
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:327
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:444
+#: src/fragmentation/fragmentation.c:451
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:458
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:475
+#: src/fragmentation/fragmentation.c:482
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:495
+#: src/fs/fs_api.c:493
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:504
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/fs_api.c:514
+#: src/fs/fs_api.c:512
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1122
+#: src/fs/fs_api.c:1120
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1642
+#: src/fs/fs_api.c:1640
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1656
+#: src/fs/fs_api.c:1654
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2314
+#: src/fs/fs_api.c:2312
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2324
+#: src/fs/fs_api.c:2322
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2452 src/fs/fs_api.c:2700
+#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2470
+#: src/fs/fs_api.c:2468
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2485 src/fs/fs_api.c:2504 src/fs/fs_api.c:2996
+#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2690
+#: src/fs/fs_api.c:2688
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2939
+#: src/fs/fs_api.c:2937
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3034
+#: src/fs/fs_api.c:3032
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3004,7 +2996,7 @@
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1939
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -3056,7 +3048,7 @@
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:441
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
@@ -3063,49 +3055,49 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:707 src/fs/fs_publish.c:724 src/fs/fs_publish.c:763
-#: src/fs/fs_publish.c:784 src/fs/fs_publish.c:808 src/fs/fs_publish.c:1058
+#: src/fs/fs_publish.c:705 src/fs/fs_publish.c:722 src/fs/fs_publish.c:761
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:806 src/fs/fs_publish.c:1054
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:707
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:721
+#: src/fs/fs_publish.c:719
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:765
+#: src/fs/fs_publish.c:763
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:785
+#: src/fs/fs_publish.c:783
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:810
+#: src/fs/fs_publish.c:808
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:833
+#: src/fs/fs_publish.c:831
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:897 src/fs/fs_publish.c:938
+#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1012
+#: src/fs/fs_publish.c:1008
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:1016
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
@@ -3112,37 +3104,37 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1060
+#: src/fs/fs_publish.c:1056
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1299
+#: src/fs/fs_publish.c:1295
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1390
+#: src/fs/fs_publish.c:1386
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:224
+#: src/fs/fs_publish_ksk.c:220
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish_ublock.c:243
+#: src/fs/fs_publish_ublock.c:241
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
+#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_search.c:941
+#: src/fs/fs_search.c:935
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3189,17 +3181,17 @@
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:667
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:706
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -3308,52 +3300,52 @@
 msgid "Failed to save state to file %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/gnunet-auto-share.c:415
+#: src/fs/gnunet-auto-share.c:413
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:504
+#: src/fs/gnunet-auto-share.c:500
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:514
+#: src/fs/gnunet-auto-share.c:510
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-auto-share.c:725
+#: src/fs/gnunet-auto-share.c:719
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:788 src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:791 src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:815
+#: src/fs/gnunet-auto-share.c:809
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:656
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3419,7 +3411,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:297
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3430,7 +3422,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -3443,7 +3435,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:872
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3492,160 +3484,159 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:191
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:194
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:197
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:206
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:221 src/fs/gnunet-publish.c:233
+#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:241
+#: src/fs/gnunet-publish.c:239
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:248
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:253
+#: src/fs/gnunet-publish.c:251
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:261
+#: src/fs/gnunet-publish.c:259
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:277
+#: src/fs/gnunet-publish.c:275
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:284
+#: src/fs/gnunet-publish.c:282
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:290
+#: src/fs/gnunet-publish.c:288
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:432
+#: src/fs/gnunet-publish.c:430
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:437
+#: src/fs/gnunet-publish.c:435
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-publish.c:589
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/fs/gnunet-publish.c:616
+#: src/fs/gnunet-publish.c:614
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-publish.c:648
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-publish.c:654
+#: src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Binde Konfigurationsdatei `%s' ein\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:658
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:667
+#: src/fs/gnunet-publish.c:665
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:670
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:677
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:688
+#: src/fs/gnunet-publish.c:686
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:716
+#: src/fs/gnunet-publish.c:714
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:749
+#: src/fs/gnunet-publish.c:747
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-publish.c:763
+#: src/fs/gnunet-publish.c:761
 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:817
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine einzige Datei zum Einfügen angeben.\n"
 
-#: src/fs/gnunet-publish.c:832
+#: src/fs/gnunet-publish.c:830
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859
-#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
-#: src/transport/gnunet-transport.c:1989
+#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
+#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3653,7 +3644,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:914
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3661,13 +3652,13 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:918
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3675,7 +3666,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet-Datenbank)"
 
-#: src/fs/gnunet-publish.c:928
+#: src/fs/gnunet-publish.c:926
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3683,19 +3674,19 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht "
 "werden soll. (nur für das Einfügen in Namensräume)"
 
-#: src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-publish.c:934
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namensraum)"
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-publish.c:944
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
@@ -3702,13 +3693,13 @@
 "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namensräume)"
 
-#: src/fs/gnunet-publish.c:950
+#: src/fs/gnunet-publish.c:948
 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:966
+#: src/fs/gnunet-publish.c:964
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3747,153 +3738,151 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:274
+#: src/fs/gnunet-service-fs.c:272
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
+#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:719
+#: src/fs/gnunet-service-fs.c:729
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
-#: src/sensordashboard/gnunet-service-sensordashboard.c:864
-#: src/sensordashboard/gnunet-service-sensordashboard.c:872
-#: src/topology/gnunet-daemon-topology.c:1287
-#: src/topology/gnunet-daemon-topology.c:1294
+#: src/fs/gnunet-service-fs.c:755 src/hostlist/gnunet-daemon-hostlist.c:309
+#: src/topology/gnunet-daemon-topology.c:1250
+#: src/topology/gnunet-daemon-topology.c:1258
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:494
+#: src/fs/gnunet-service-fs_cadet_client.c:490
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:504
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:260
+#: src/fs/gnunet-service-fs_cadet_server.c:258
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:361
+#: src/fs/gnunet-service-fs_cadet_server.c:359
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:441
+#: src/fs/gnunet-service-fs_cadet_server.c:439
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:485
+#: src/fs/gnunet-service-fs_cadet_server.c:483
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:491
-#: src/fs/gnunet-service-fs_cadet_server.c:531
+#: src/fs/gnunet-service-fs_cadet_server.c:489
+#: src/fs/gnunet-service-fs_cadet_server.c:529
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/fs/gnunet-service-fs_cp.c:736
+#: src/fs/gnunet-service-fs_cp.c:738
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:742
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:778
+#: src/fs/gnunet-service-fs_cp.c:780
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:786
+#: src/fs/gnunet-service-fs_cp.c:788
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# gap falsche Antworten"
 
-#: src/fs/gnunet-service-fs_cp.c:812 src/fs/gnunet-service-fs_cp.c:1406
+#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:917
+#: src/fs/gnunet-service-fs_cp.c:921
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:973
+#: src/fs/gnunet-service-fs_cp.c:977
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:981
+#: src/fs/gnunet-service-fs_cp.c:985
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:995
+#: src/fs/gnunet-service-fs_cp.c:999
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:1047
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1111
+#: src/fs/gnunet-service-fs_cp.c:1118
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1136
+#: src/fs/gnunet-service-fs_cp.c:1143
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1146
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1251
+msgid "# requests dropped due to higher-TTL request"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1258
+#: src/fs/gnunet-service-fs_cp.c:1340
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1279
+#: src/fs/gnunet-service-fs_cp.c:1361
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: src/fs/gnunet-service-fs_cp.c:1372
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:1427
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1367
-msgid "# requests dropped due to higher-TTL request"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:1404
+#: src/fs/gnunet-service-fs_cp.c:1471
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1843
+#: src/fs/gnunet-service-fs_cp.c:1916
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3945,172 +3934,172 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:376
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:259
+#: src/fs/gnunet-service-fs_lc.c:261
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:330
+#: src/fs/gnunet-service-fs_lc.c:332
 #, fuzzy
 msgid "# client searches received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:372
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:273
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
+#: src/fs/gnunet-service-fs_pe.c:412
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/fs/gnunet-service-fs_pe.c:447
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:501
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:511
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:593
 #, fuzzy
 msgid "# requests merged"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:603
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:848
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:315
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:820
+#: src/fs/gnunet-service-fs_pr.c:852
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:857
+#: src/fs/gnunet-service-fs_pr.c:889
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:898
 #, fuzzy
 msgid "# irrelevant replies discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/fs/gnunet-service-fs_pr.c:881
+#: src/fs/gnunet-service-fs_pr.c:913
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:930
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1028
+#: src/fs/gnunet-service-fs_pr.c:1060
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1056
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1094
+#: src/fs/gnunet-service-fs_pr.c:1126
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1258
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1279
+#: src/fs/gnunet-service-fs_pr.c:1310
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1301
+#: src/fs/gnunet-service-fs_pr.c:1331
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1353
+#: src/fs/gnunet-service-fs_pr.c:1383
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1368
+#: src/fs/gnunet-service-fs_pr.c:1398
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1407
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1392
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1436
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1419
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1454
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1451 src/fs/gnunet-service-fs_pr.c:1491
-#: src/fs/gnunet-service-fs_pr.c:1660
+#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1690
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1636
+#: src/fs/gnunet-service-fs_pr.c:1666
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1725
+#: src/fs/gnunet-service-fs_pr.c:1755
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:678
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -4145,7 +4134,7 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
+#: src/gns/gns_api.c:392
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4157,103 +4146,103 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
+#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/gns/gnunet-bcd.c:360
+#: src/gns/gnunet-bcd.c:362
 #, c-format
 msgid "Businesscard HTTP server starts on %llu\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:374
+#: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:520
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:532
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:234
+#: src/gns/gnunet-dns2gns.c:232
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:406
+#: src/gns/gnunet-dns2gns.c:402
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:422
+#: src/gns/gnunet-dns2gns.c:418
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:430
+#: src/gns/gnunet-dns2gns.c:426
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:708
+#: src/gns/gnunet-dns2gns.c:704
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:734
+#: src/gns/gnunet-dns2gns.c:730
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:756
+#: src/gns/gnunet-dns2gns.c:752
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:777
+#: src/gns/gnunet-dns2gns.c:773
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:780
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:783
+#: src/gns/gnunet-dns2gns.c:779
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:786
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:789
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:798
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:215 src/gns/plugin_rest_gns.c:334
+#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:231
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:314
+#: src/gns/gnunet-gns.c:312
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
-#: src/gns/plugin_rest_gns.c:459
+#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:460
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4260,47 +4249,47 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:405
+#: src/gns/gnunet-gns.c:403
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:453
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:456
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:459
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:462
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:467
+#: src/gns/gnunet-gns.c:465
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:470
+#: src/gns/gnunet-gns.c:468
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:482
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
+#: src/gns/gnunet-gns-helper-service-w32.c:766
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4308,12 +4297,12 @@
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:838
+#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-import.c:485
+#: src/gns/gnunet-gns-import.c:483
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
@@ -4321,13 +4310,13 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:529
 #: src/hostlist/gnunet-daemon-hostlist_client.c:746
 #: src/hostlist/gnunet-daemon-hostlist_client.c:752
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1036
-#: src/transport/plugin_transport_http_client.c:599
-#: src/transport/plugin_transport_http_client.c:617
+#: src/hostlist/gnunet-daemon-hostlist_client.c:804
+#: src/hostlist/gnunet-daemon-hostlist_client.c:813
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1030
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1035
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
@@ -4372,87 +4361,87 @@
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1634
+#: src/gns/gnunet-gns-proxy.c:1631
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2006
+#: src/gns/gnunet-gns-proxy.c:1997
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2036
+#: src/gns/gnunet-gns-proxy.c:2027
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2210
+#: src/gns/gnunet-gns-proxy.c:2199
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2229 src/rest/gnunet-rest-server.c:548
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551
+#: src/gns/gnunet-gns-proxy.c:2538
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2567
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/gns/gnunet-gns-proxy.c:2627
+#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2678
+#: src/gns/gnunet-gns-proxy.c:2665
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3017
+#: src/gns/gnunet-gns-proxy.c:3003
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057 src/gns/gnunet-service-gns.c:894
+#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3119
+#: src/gns/gnunet-gns-proxy.c:3105
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3160
+#: src/gns/gnunet-gns-proxy.c:3146
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3182
+#: src/gns/gnunet-gns-proxy.c:3168
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:935
+#: src/gns/gnunet-service-gns.c:928
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:943
+#: src/gns/gnunet-service-gns.c:936
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:976
+#: src/gns/gnunet-service-gns.c:969
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4467,46 +4456,46 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:650
+#: src/gns/gnunet-service-gns_resolver.c:648
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:661
+#: src/gns/gnunet-service-gns_resolver.c:659
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:854
+#: src/gns/gnunet-service-gns_resolver.c:851
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:996
+#: src/gns/gnunet-service-gns_resolver.c:993
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1356
+#: src/gns/gnunet-service-gns_resolver.c:1353
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1891
+#: src/gns/gnunet-service-gns_resolver.c:1888
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/gns/gnunet-service-gns_resolver.c:1912
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2197
+#: src/gns/gnunet-service-gns_resolver.c:2194
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2346
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4536,11 +4525,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_rest_gns.c:422
+#: src/gns/plugin_rest_gns.c:423
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:696
+#: src/gns/plugin_rest_gns.c:697
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -4647,9 +4636,9 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/hello/gnunet-hello.c:218
+#: src/hello/gnunet-hello.c:219
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
 #: src/hello/hello.c:1139
@@ -4684,31 +4673,31 @@
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:274
+#: src/hostlist/gnunet-daemon-hostlist.c:272
 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:331
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:334
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:337
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:359
+#: src/hostlist/gnunet-daemon-hostlist.c:357
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4734,7 +4723,7 @@
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4750,117 +4739,117 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:867
+#: src/hostlist/gnunet-daemon-hostlist_client.c:866
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:881
+#: src/hostlist/gnunet-daemon-hostlist_client.c:880
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:901
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:907
+#: src/hostlist/gnunet-daemon-hostlist_client.c:906
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/hostlist/gnunet-daemon-hostlist_client.c:914
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:968
+#: src/hostlist/gnunet-daemon-hostlist_client.c:967
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:976
+#: src/hostlist/gnunet-daemon-hostlist_client.c:975
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1108
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1660
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1117
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1177
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
-#: src/transport/plugin_transport_http_client.c:2287
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
+#: src/transport/plugin_transport_http_client.c:2282
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4877,9 +4866,9 @@
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:243
 #: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:391
-#: src/peerinfo-tool/gnunet-peerinfo.c:540
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/peerinfo-tool/gnunet-peerinfo.c:389
+#: src/peerinfo-tool/gnunet-peerinfo.c:538
+#: src/topology/gnunet-daemon-topology.c:870
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4936,146 +4925,146 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:747
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
-#: src/transport/gnunet-service-transport.c:860
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/peerinfo-tool/gnunet-peerinfo.c:741
+#: src/transport/gnunet-service-transport.c:857
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:771
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:786
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:799
+#: src/hostlist/gnunet-daemon-hostlist_server.c:798
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:812
+#: src/hostlist/gnunet-daemon-hostlist_server.c:811
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:833
+#: src/hostlist/gnunet-daemon-hostlist_server.c:832
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:853
+#: src/hostlist/gnunet-daemon-hostlist_server.c:852
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:893
+#: src/hostlist/gnunet-daemon-hostlist_server.c:892
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:163
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:182
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:325
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:328
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:331
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:334
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:337
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
+#: src/identity/gnunet-identity.c:340
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:349
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:361
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:438
+#: src/identity/gnunet-service-identity.c:669
+#: src/identity/gnunet-service-identity.c:777
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:445
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:515
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:646
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:685
+#: src/identity/gnunet-service-identity.c:794
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:828
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:901
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:913
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:925
+#: src/identity/plugin_rest_identity.c:923
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-token/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:101
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-token/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:104
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-token/plugin_rest_identity_token.c:1067
+#: src/identity-provider/plugin_rest_identity_provider.c:1089
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5090,41 +5079,41 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:107
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:183
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/namecache/gnunet-namecache.c:195
+#: src/namecache/gnunet-namecache.c:193
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:201
 #, fuzzy, c-format
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:235
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
+#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5134,278 +5123,286 @@
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:236
-#: src/namestore/plugin_namestore_flat.c:183
-#: src/namestore/plugin_namestore_flat.c:342
+#: src/namecache/plugin_namecache_flat.c:244
+#: src/namestore/plugin_namestore_flat.c:179
+#: src/namestore/plugin_namestore_flat.c:351
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:194
+#: src/namestore/plugin_namestore_flat.c:190
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:142
-#: src/namestore/plugin_namestore_flat.c:206
+#: src/namecache/plugin_namecache_flat.c:145
+#: src/namestore/plugin_namestore_flat.c:202
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:391
+#: src/namecache/plugin_namecache_flat.c:399
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
+#: src/namecache/plugin_namecache_postgres.c:90
+#: src/namestore/plugin_namestore_postgres.c:97
 #, fuzzy
 msgid "Failed to create indices\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:301
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
-#: src/namestore/plugin_rest_namestore.c:517
+#: src/namestore/gnunet-namestore.c:330
+#: src/namestore/plugin_rest_namestore.c:532
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
-#: src/namestore/plugin_rest_namestore.c:526
+#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/plugin_rest_namestore.c:541
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
-#: src/namestore/gnunet-namestore.c:493
+#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:491
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
+#: src/namestore/gnunet-namestore.c:529
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:628
-#: src/namestore/plugin_rest_namestore.c:550
+#: src/namestore/gnunet-namestore.c:626
+#: src/namestore/plugin_rest_namestore.c:565
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:665
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:945
+#: src/transport/gnunet-transport.c:1786
+#: src/transport/gnunet-transport-profiler.c:504
 #, c-format
+msgid "Service `%s' is not running\n"
+msgstr "Dienst »%s« läuft nicht\n"
+
+#: src/namestore/gnunet-namestore.c:706
+#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:719
-#: src/namestore/gnunet-namestore-fcfsd.c:984
-#: src/namestore/plugin_rest_namestore.c:859
+#: src/namestore/gnunet-namestore.c:717
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/plugin_rest_namestore.c:954
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
-#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
+#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
+#: src/namestore/gnunet-namestore.c:813
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
-#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
+#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
-#: src/namestore/plugin_rest_namestore.c:620
+#: src/namestore/gnunet-namestore.c:743
+#: src/namestore/plugin_rest_namestore.c:635
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:765
-#: src/namestore/plugin_rest_namestore.c:638
-#: src/namestore/plugin_rest_namestore.c:678
+#: src/namestore/gnunet-namestore.c:763
+#: src/namestore/plugin_rest_namestore.c:653
+#: src/namestore/plugin_rest_namestore.c:693
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:801
+#: src/namestore/gnunet-namestore.c:799
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:816
+#: src/namestore/gnunet-namestore.c:814
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:844
+#: src/namestore/gnunet-namestore.c:842
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:868 src/peerinfo-tool/gnunet-peerinfo.c:826
+#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:903
+#: src/namestore/gnunet-namestore.c:901
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:943
-#: src/namestore/plugin_rest_namestore.c:889
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:984
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:970
-#: src/namestore/plugin_rest_namestore.c:916
+#: src/namestore/gnunet-namestore.c:968
+#: src/namestore/plugin_rest_namestore.c:1011
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
-#: src/namestore/plugin_rest_namestore.c:956
+#: src/namestore/gnunet-namestore.c:1004
+#: src/namestore/plugin_rest_namestore.c:1051
 #, c-format
 msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1018
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1092
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1064
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1067
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1070
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1073
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1076
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1081
+#: src/namestore/gnunet-namestore.c:1079
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1085
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1088
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1091
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1094
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1097
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1100
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1103
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:478
+#: src/namestore/gnunet-namestore-fcfsd.c:476
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:505
+#: src/namestore/gnunet-namestore-fcfsd.c:503
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:537
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:548
+#: src/namestore/gnunet-namestore-fcfsd.c:546
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:610
+#: src/namestore/gnunet-namestore-fcfsd.c:608
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:664
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:682
+#: src/namestore/gnunet-namestore-fcfsd.c:680
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:716
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:726
+#: src/namestore/gnunet-namestore-fcfsd.c:724
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:924
+#: src/namestore/gnunet-namestore-fcfsd.c:918
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:950
+#: src/namestore/gnunet-namestore-fcfsd.c:944
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore-fcfsd.c:986
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1025
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:656
+#: src/namestore/gnunet-service-namestore.c:655
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
@@ -5414,12 +5411,12 @@
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:628
+#: src/namestore/plugin_namestore_flat.c:632
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1083
+#: src/namestore/plugin_rest_namestore.c:1176
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5437,92 +5434,92 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:392
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:394
+#: src/nat/nat_auto.c:393
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:415
+#: src/nat/nat_auto.c:412
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
+#: src/nat/nat_auto.c:444
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:579
+#: src/nat/nat_auto.c:576
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:597
+#: src/nat/nat_auto.c:594
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:669 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_auto.c:719
+#: src/nat/nat_auto.c:716
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:720
+#: src/nat/nat_auto.c:717
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:752
+#: src/nat/nat_auto.c:749
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:760 src/nat/nat_auto.c:808
+#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:768 src/nat/nat_auto.c:816
+#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:801
+#: src/nat/nat_auto.c:798
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1026
+#: src/nat/nat.c:1024
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1076
+#: src/nat/nat.c:1074
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1327
+#: src/nat/nat.c:1325
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
+#: src/nat/nat.c:1400
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/nat/nat.c:1546
+#: src/nat/nat.c:1544
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/nat.c:1598
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1739 src/nat/nat.c:1752
+#: src/nat/nat.c:1727 src/nat/nat.c:1740
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5529,154 +5526,154 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1895
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1923
+#: src/nat/nat.c:1911
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2002
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2004
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2006
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2008
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2010
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2012
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2014
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2016
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2018
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2020
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2026
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2028
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2030
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2040
+#: src/nat/nat.c:2032
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2042
+#: src/nat/nat.c:2034
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2044
+#: src/nat/nat.c:2036
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2046
+#: src/nat/nat.c:2038
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:203
+#: src/nat/nat_mini.c:201
 #, fuzzy
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_mini.c:609
+#: src/nat/nat_mini.c:605
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_test.c:462
+#: src/nat/nat_test.c:460
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:495
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/nse/gnunet-nse.c:117
+#: src/nse/gnunet-nse.c:116
 msgid "NSE service is not running\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
+#: src/nse/gnunet-nse.c:121
 msgid "Error while checking if NSE service is running or not\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
+#: src/nse/gnunet-nse.c:167
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
+#: src/nse/gnunet-nse-profiler.c:860
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: src/nse/gnunet-nse-profiler.c:869
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:876
+#: src/nse/gnunet-nse-profiler.c:875
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1541
-#: src/revocation/gnunet-service-revocation.c:848 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1533
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5718,17 +5715,17 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1053
+#: src/peerinfo/gnunet-service-peerinfo.c:1056
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1374
+#: src/peerinfo/gnunet-service-peerinfo.c:1375
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1387
+#: src/peerinfo/gnunet-service-peerinfo.c:1388
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5736,115 +5733,115 @@
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:363
+#: src/peerinfo/peerinfo_api.c:361
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:518
+#: src/peerinfo/peerinfo_api.c:516
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
-#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
-#: src/peerinfo/peerinfo_api.c:630
+#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
+#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
+#: src/peerinfo/peerinfo_api.c:628
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:719
+#: src/peerinfo/peerinfo_api.c:715
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo/peerinfo_api_notify.c:267
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:245
+#: src/peerinfo-tool/gnunet-peerinfo.c:243
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:250
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:305
+#: src/peerinfo-tool/gnunet-peerinfo.c:303
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:472
+#: src/peerinfo-tool/gnunet-peerinfo.c:470
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:486
+#: src/peerinfo-tool/gnunet-peerinfo.c:484
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:505
+#: src/peerinfo-tool/gnunet-peerinfo.c:503
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:575
+#: src/peerinfo-tool/gnunet-peerinfo.c:573
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:704
+#: src/peerinfo-tool/gnunet-peerinfo.c:700
 #, fuzzy, c-format
 msgid "Failed to get my own HELLO from this peer!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:736
+#: src/peerinfo-tool/gnunet-peerinfo.c:732
 #, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:850
+#: src/peerinfo-tool/gnunet-peerinfo.c:844
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Knoten »%s«.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:909
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:912
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:926
+#: src/peerinfo-tool/gnunet-peerinfo.c:920
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -5903,35 +5900,35 @@
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:375
+#: src/peerstore/peerstore_api.c:374
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:678
+#: src/peerstore/peerstore_api.c:677
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:689
+#: src/peerstore/peerstore_api.c:688
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerstore/peerstore_api.c:708
+#: src/peerstore/peerstore_api.c:707
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:820
+#: src/peerstore/peerstore_api.c:819
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:832
+#: src/peerstore/peerstore_api.c:831
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5956,47 +5953,47 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/postgres/postgres.c:59
+#: src/postgres/postgres.c:63
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/postgres/postgres.c:148
+#: src/postgres/postgres.c:166
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:261
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/psycstore/gnunet-service-psycstore.c:285
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:307
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:365
+#: src/psycstore/gnunet-service-psycstore.c:364
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:422
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:453
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:481
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -6079,49 +6076,49 @@
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:824
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/pt/gnunet-daemon-pt.c:888
+#: src/pt/gnunet-daemon-pt.c:886
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:894
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:967
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:983
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
+#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
+#: src/pt/gnunet-daemon-pt.c:1306
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 "Es konnte keine Verbindung mit dem %s-Dienst hergestellt werden. Abbruch\n"
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1343
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/regex/gnunet-regex-simulation-profiler.c:656
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -6130,72 +6127,72 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-profiler.c:1284
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1299
+#: src/regex/gnunet-regex-profiler.c:1295
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1324
+#: src/regex/gnunet-regex-simulation-profiler.c:619
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1330
+#: src/regex/gnunet-regex-simulation-profiler.c:626
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1337
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1346
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1454
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1457
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1460
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1463
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:686
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:689
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:702
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6204,113 +6201,113 @@
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:806
+#: src/rest/gnunet-rest-server.c:792
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:823
+#: src/rest/gnunet-rest-server.c:809
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/revocation/gnunet-revocation.c:124
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Schlüssel »%s« ist gültig\n"
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Schlüssel »%s« wurde widerrufen\n"
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:135
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:161
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:166
 msgid "Revocation failed (!)\n"
 msgstr "Widerruf fehlgeschlagen (!)\n"
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:171
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:176
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:181
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:292
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:322
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:343
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:363
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:373
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:405
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:421
+#: src/revocation/gnunet-revocation.c:419
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:439
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:461
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:486
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:502
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
+#: src/revocation/gnunet-revocation.c:505
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:508
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:511
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6338,30 +6335,30 @@
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:547
-#: src/revocation/gnunet-service-revocation.c:780
+#: src/revocation/gnunet-service-revocation.c:545
+#: src/revocation/gnunet-service-revocation.c:776
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:872
+#: src/revocation/gnunet-service-revocation.c:868
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps.c:67
-msgid "rps"
+#: src/rps/gnunet-rps.c:185
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:221
+#: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
+#: src/scalarproduct/gnunet-scalarproduct.c:227
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:241
+#: src/scalarproduct/gnunet-scalarproduct.c:240
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
@@ -6368,48 +6365,48 @@
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:259
+#: src/scalarproduct/gnunet-scalarproduct.c:258
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:281
+#: src/scalarproduct/gnunet-scalarproduct.c:280
 #, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:299
+#: src/scalarproduct/gnunet-scalarproduct.c:298
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:326
+#: src/scalarproduct/gnunet-scalarproduct.c:325
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:349
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:352
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:355
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:364
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1549
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1193
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1252
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6418,263 +6415,22 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:611
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:617
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
 msgid "also profile decryption"
 msgstr ""
 
-#: src/sensordashboard/gnunet-service-sensordashboard.c:353
-#, fuzzy, c-format
-msgid "Error trying to send a message to peer `%s'.\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/sensor/gnunet-sensor.c:162
-#, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/sensor/gnunet-sensor.c:165
-#, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/sensor/gnunet-sensor.c:168
-msgid "Force an anomaly on a sensor, use only for testing"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:175
-msgid "sensor"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:729
-msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:736
-#, fuzzy
-msgid "Missing or invalid topology file.\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
-
-#: src/sensor/gnunet-sensor-profiler.c:782
-#, fuzzy
-msgid "Number of peers to run"
-msgstr "Anzahl an Durchläufen"
-
-#: src/sensor/gnunet-sensor-profiler.c:784
-msgid "Path to topology file"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:787
-msgid "Change the interval of running sensors to given value"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:790
-msgid "Number of peers to simulate anomalies on"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:797
-#, fuzzy
-msgid "Profiler for sensor service"
-msgstr "Fehler beim Starten des Dienstes.\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:204
-msgid "Received an invalid sensor value."
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_analysis.c:295
-#, fuzzy
-msgid "Analysis model not defined in configuration.\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:304
-#, fuzzy, c-format
-msgid "Could not load analysis model `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:312
-#, fuzzy
-msgid "Could not connect to peerstore service.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:233
-msgid "Unknown value type expected by sensor, this should not happen.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:268
-#, fuzzy, c-format
-msgid "Received an invalid value for sensor `%s': %s\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:347
-#, c-format
-msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:370
-#, c-format
-msgid ""
-"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:418
-#, c-format
-msgid "Sensor `%s' execution task already set, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:828
-msgid "Double creation of proof-of-work, this should not happen.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:834
-#, fuzzy
-msgid "Failed to create pow and signature block.\n"
-msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1046
-#, fuzzy, c-format
-msgid "PEERSTORE error: %s.\n"
-msgstr "Datenstromfehler: %s\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1151
-#: src/sensor/gnunet-service-sensor_reporting.c:1409
-#, fuzzy
-msgid "Failed to connect to CORE service.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1158
-msgid "Peer identity received from CORE init doesn't match ours.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1398
-#, fuzzy
-msgid "Failed to connect to peerstore service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1419
-#: src/sensor/gnunet-service-sensor_update.c:781
-#, fuzzy
-msgid "Failed to connect to CADET service.\n"
-msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1426
-#, fuzzy
-msgid "Failed to load my private key.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/sensor/gnunet-service-sensor_update.c:327
-#, c-format
-msgid "Error trying to send a message to update point `%s'.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_update.c:418
-#, fuzzy, c-format
-msgid "Failed to connect to update point `%s'.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/sensor/plugin_sensor_model_gaussian.c:203
-msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/plugin_sensor_model_gaussian.c:221
-msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/plugin_sensor_model_gaussian.c:229
-msgid "Missing `WEIGHT_INC' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/sensor_api.c:296
-msgid "Iterate request canceled due to disconnection.\n"
-msgstr ""
-
-#: src/sensor/sensor_api.c:307
-msgid "Force anomaly request canceled due to disconnection.\n"
-msgstr ""
-
-#: src/sensor/sensor_api.c:374
-#, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/sensor/sensor_util_lib.c:107
-#, fuzzy
-msgid "Error reading sensor version\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/sensor/sensor_util_lib.c:116
-msgid "Invalid sensor version number, format should be major.minor\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:131
-#, fuzzy
-msgid "Error reading sensor category\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/sensor/sensor_util_lib.c:164
-#, fuzzy
-msgid "Error reading sensor run interval\n"
-msgstr "Fehler beim Anlegen des Tunnels\n"
-
-#: src/sensor/sensor_util_lib.c:191
-#, fuzzy
-msgid "Error reading sensor source\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/sensor/sensor_util_lib.c:206
-msgid "Error reading sensor gnunet-statistics source information\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:218
-#, fuzzy
-msgid "Error reading sensor process name\n"
-msgstr "Fehler beim Lesen von »%s«: %s\n"
-
-#: src/sensor/sensor_util_lib.c:233
-msgid "Error reading sensor expected datatype\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:241
-msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:299
-#, fuzzy, c-format
-msgid "Failed to access sensor file: %s\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/sensor/sensor_util_lib.c:308
-#, fuzzy, c-format
-msgid "Failed to load sensor definition: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/sensor/sensor_util_lib.c:370
-#, c-format
-msgid "Sensor `%s' already exists with same or newer version\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:387
-#, c-format
-msgid "Error adding new sensor `%s' to global hashmap.\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:412
-#, fuzzy, c-format
-msgid "Error loading sensor from file: %s\n"
-msgstr "Fehler beim Lesen von »%s«: %s\n"
-
 #: src/set/gnunet-service-set.c:2015
 #, fuzzy
 msgid "Could not connect to cadet service\n"
@@ -6702,15 +6458,10 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:365
+#: src/set/gnunet-set-profiler.c:383
 msgid "operation to execute"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:368
-#, fuzzy
-msgid "dump statistics to stdout after completion"
-msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
-
 #: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6731,81 +6482,81 @@
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:198
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:204
+#: src/statistics/gnunet-statistics.c:201
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:235
+#: src/statistics/gnunet-statistics.c:232
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:243
+#: src/statistics/gnunet-statistics.c:240
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:266
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:282
+#: src/statistics/gnunet-statistics.c:279
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:290
+#: src/statistics/gnunet-statistics.c:287
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:323
+#: src/statistics/gnunet-statistics.c:320
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:346
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:349
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:352
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:355
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:358
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:361
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:367
+#: src/statistics/gnunet-statistics.c:364
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:379
+#: src/statistics/gnunet-statistics.c:376
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:515
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1088
+#: src/statistics/statistics_api.c:1082
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -6855,7 +6606,7 @@
 msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
 
 #: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/gnunet-testbed-profiler.c:291
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6883,11 +6634,11 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:323
+#: src/testbed/gnunet-daemon-latency-logger.c:322
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
@@ -6899,25 +6650,25 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:476
+#: src/testbed/gnunet-daemon-testbed-underlay.c:475
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:732
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1057
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -6929,16 +6680,16 @@
 "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
 "verbleiben)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:248
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:296
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:299
+#: src/testbed/gnunet-testbed-profiler.c:297
 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 "
@@ -6965,7 +6716,7 @@
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
+#: src/testbed/testbed_api_hosts.c:1590
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
@@ -6974,46 +6725,46 @@
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:987
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1052
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1141
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1145
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1183
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1201
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1261
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1273
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1297
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1347
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
@@ -7020,7 +6771,7 @@
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1363
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
@@ -7027,44 +6778,44 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:960
+#: src/testbed/testbed_api_topology.c:966
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:974
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:982
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1004
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1013
+#: src/testbed/testbed_api_topology.c:1037
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1019
+#: src/testbed/testbed_api_topology.c:1043
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1025
+#: src/testbed/testbed_api_topology.c:1049
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1083
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -7120,12 +6871,12 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:720
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1157
+#: src/testing/testing.c:1163
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7132,40 +6883,40 @@
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1166
+#: src/testing/testing.c:1172
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1176
+#: src/testing/testing.c:1182
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1189
+#: src/testing/testing.c:1195
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1203
+#: src/testing/testing.c:1209
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/testing/testing.c:1215
+#: src/testing/testing.c:1221
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/testing/testing.c:1240
+#: src/testing/testing.c:1246
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1342
+#: src/testing/testing.c:1348
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1710
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
@@ -7180,87 +6931,87 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:265
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:406
+#: src/topology/gnunet-daemon-topology.c:349
 #, fuzzy
-msgid "# connect requests issued to transport"
+msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/topology/gnunet-daemon-topology.c:840
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:734
 msgid "# friends connected"
 msgstr "# verbundener Freunde"
 
-#: src/topology/gnunet-daemon-topology.c:1020
+#: src/topology/gnunet-daemon-topology.c:931
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:964
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:971
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1079
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "# friends in configuration"
 msgstr "# Freunde in Konfiguration"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1003
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1009
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1497
+#: src/topology/gnunet-daemon-topology.c:1043
+#: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1178
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1288
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:136
+#: src/transport/gnunet-service-transport_ats.c:141
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:286
+#: src/transport/gnunet-service-transport_blacklist.c:284
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:293
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:504
-#: src/transport/gnunet-service-transport_blacklist.c:855
+#: src/transport/gnunet-service-transport_blacklist.c:500
+#: src/transport/gnunet-service-transport_blacklist.c:851
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:859
+#: src/transport/gnunet-service-transport_blacklist.c:855
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -7269,250 +7020,231 @@
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:385
+#: src/transport/gnunet-service-transport.c:383
 msgid "# bytes total received"
 msgstr "# Bytes insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:478
 msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
-#: src/transport/gnunet-service-transport.c:826
+#: src/transport/gnunet-service-transport.c:823
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:481
+#: src/transport/gnunet-service-transport_clients.c:523
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:783
+#: src/transport/gnunet-service-transport_clients.c:845
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:827
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/gnunet-service-transport_clients.c:864
-#, fuzzy
-msgid "# REQUEST DISCONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/gnunet-service-transport_hello.c:197
+#: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:840
+#: src/transport/gnunet-service-transport_neighbours.c:805
 #, fuzzy
 msgid "# session creation failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1048
 msgid "# DISCONNECT messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1304
-#: src/transport/gnunet-service-transport_neighbours.c:1761
+#: src/transport/gnunet-service-transport_neighbours.c:1168
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1309
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1375
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1451
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1495
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1505
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1550
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1559
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1567
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1576
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1581
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1658
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1692
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1707
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1827
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1847
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1933
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1998
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2052
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2069
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
-#, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2357
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2726
+#: src/transport/gnunet-service-transport_neighbours.c:2599
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3212
+#: src/transport/gnunet-service-transport_neighbours.c:3081
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3089
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3131
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3274
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3299
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3312
+#: src/transport/gnunet-service-transport_neighbours.c:3181
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3506
+#: src/transport/gnunet-service-transport_neighbours.c:3357
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3393
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3608
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3637
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3685
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3692
+#: src/transport/gnunet-service-transport_neighbours.c:3488
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3733
+#: src/transport/gnunet-service-transport_neighbours.c:3528
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3740
+#: src/transport/gnunet-service-transport_neighbours.c:3535
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3751
+#: src/transport/gnunet-service-transport_neighbours.c:3546
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3885
+#: src/transport/gnunet-service-transport_neighbours.c:3680
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7545,59 +7277,59 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:640
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1540
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:950
+#: src/transport/gnunet-service-transport_validation.c:1552
 #, fuzzy
 msgid "# validations running"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/transport/gnunet-service-transport_validation.c:495
+#: src/transport/gnunet-service-transport_validation.c:493
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# verworfener Adressdatensätze"
 
-#: src/transport/gnunet-service-transport_validation.c:543
+#: src/transport/gnunet-service-transport_validation.c:541
 #, fuzzy
 msgid "# address records discarded (blacklist)"
 msgstr "# verworfener Adressdatensätze"
 
-#: src/transport/gnunet-service-transport_validation.c:631
+#: src/transport/gnunet-service-transport_validation.c:629
 msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:713
+#: src/transport/gnunet-service-transport_validation.c:709
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:750
+#: src/transport/gnunet-service-transport_validation.c:746
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1076
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1127
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1140
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1137
+#: src/transport/gnunet-service-transport_validation.c:1143
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1145
+#: src/transport/gnunet-service-transport_validation.c:1151
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1158
+#: src/transport/gnunet-service-transport_validation.c:1164
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7604,58 +7336,58 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1213
+#: src/transport/gnunet-service-transport_validation.c:1219
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1264
+#: src/transport/gnunet-service-transport_validation.c:1270
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1273
+#: src/transport/gnunet-service-transport_validation.c:1279
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1430
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1448
+#: src/transport/gnunet-service-transport_validation.c:1460
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1503
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:558
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:589
-#: src/transport/gnunet-transport-profiler.c:274
+#: src/transport/gnunet-transport.c:567
+#: src/transport/gnunet-transport-profiler.c:282
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:608
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:636
+#: src/transport/gnunet-transport.c:623
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:648
+#: src/transport/gnunet-transport.c:635
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
+#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
@@ -7662,27 +7394,27 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/transport/gnunet-transport.c:680
+#: src/transport/gnunet-transport.c:667
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/gnunet-transport.c:685
+#: src/transport/gnunet-transport.c:672
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:690
+#: src/transport/gnunet-transport.c:677
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:695
+#: src/transport/gnunet-transport.c:682
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:820
+#: src/transport/gnunet-transport.c:807
 #, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7691,100 +7423,78 @@
 "\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:855
+#: src/transport/gnunet-transport.c:842
 #, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Knoten »%s« %s »%s« \n"
 
-#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
+#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1006
+#: src/transport/gnunet-transport.c:993
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1007
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1045
+#: src/transport/gnunet-transport.c:1032
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:1091
+#: src/transport/gnunet-transport.c:1078
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1114
-#: src/transport/gnunet-transport-profiler.c:406
+#: src/transport/gnunet-transport.c:1107
 #, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Mit »%s« wurde erfolgreich verbunden.\n"
-
-#: src/transport/gnunet-transport.c:1138
-#, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:1144
+#: src/transport/gnunet-transport-profiler.c:439
 #, c-format
-msgid "Successfully disconnected from `%s'\n"
-msgstr "Verbindung zu »%s« wurde erfolgreich getrennt\n"
-
-#: src/transport/gnunet-transport.c:1194
-#: src/transport/gnunet-transport-profiler.c:434
-#, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
+#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport.c:1171
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:1247
+#: src/transport/gnunet-transport.c:1197
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1271
-#: src/transport/gnunet-transport-profiler.c:458
+#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport-profiler.c:464
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:1311
+#: src/transport/gnunet-transport.c:1261
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1273
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1831
-#: src/transport/gnunet-transport-profiler.c:492
-#, fuzzy
-msgid "Failed to send connect request to transport service\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/transport/gnunet-transport.c:1866
-#, fuzzy
-msgid "Failed to send disconnect request to transport service\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/transport/gnunet-transport.c:1910
+#: src/transport/gnunet-transport.c:1809
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7791,112 +7501,111 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1918
+#: src/transport/gnunet-transport.c:1817
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
-#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
-#: src/transport/gnunet-transport.c:2085
-#: src/transport/gnunet-transport-profiler.c:578
+#: src/transport/gnunet-transport.c:1840
+#, fuzzy
+msgid "Failed to connect to transport service for disconnection\n"
+msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
+
+#: src/transport/gnunet-transport.c:1846
+msgid "Blacklisting request in place, stop with CTRL-C\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1865 src/transport/gnunet-transport.c:1884
+#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport-profiler.c:560
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
-#: src/transport/gnunet-transport.c:2011
-msgid "Failed to send request to transport service\n"
-msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
-
-#: src/transport/gnunet-transport.c:2031
+#: src/transport/gnunet-transport.c:1889
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:1990
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:2136
+#: src/transport/gnunet-transport.c:1993
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2139
-msgid "connect to a peer"
-msgstr "Mit einem Knoten verbinden"
-
-#: src/transport/gnunet-transport.c:2142
+#: src/transport/gnunet-transport.c:1996
 msgid "disconnect to a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:2145
+#: src/transport/gnunet-transport.c:1999
 msgid "print information for all pending validations "
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2148
+#: src/transport/gnunet-transport.c:2002
 msgid "print information for all pending validations continuously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2151
+#: src/transport/gnunet-transport.c:2005
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2157
+#: src/transport/gnunet-transport.c:2011
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2160
+#: src/transport/gnunet-transport.c:2014
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:2163
-#: src/transport/gnunet-transport-profiler.c:638
+#: src/transport/gnunet-transport.c:2017
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2166
+#: src/transport/gnunet-transport.c:2020
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2169
+#: src/transport/gnunet-transport.c:2023
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2172
+#: src/transport/gnunet-transport.c:2026
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2183
-#: src/transport/gnunet-transport-profiler.c:649
+#: src/transport/gnunet-transport.c:2037
+#: src/transport/gnunet-transport-profiler.c:637
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
 
-#: src/transport/gnunet-transport-profiler.c:218
+#: src/transport/gnunet-transport-profiler.c:226
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:254
+#: src/transport/gnunet-transport-profiler.c:262
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:263
+#: src/transport/gnunet-transport-profiler.c:271
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:280
+#: src/transport/gnunet-transport-profiler.c:288
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:332
+#: src/transport/gnunet-transport-profiler.c:341
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:352
+#: src/transport/gnunet-transport-profiler.c:361
 #, c-format
 msgid ""
 "\n"
@@ -7903,98 +7612,103 @@
 "Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:400
+#: src/transport/gnunet-transport-profiler.c:411
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport-profiler.c:483
-#, fuzzy, c-format
-msgid "Retrying to connect to `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/transport/gnunet-transport-profiler.c:418
+#, c-format
+msgid "Successfully connected to `%s'\n"
+msgstr "Mit »%s« wurde erfolgreich verbunden.\n"
 
-#: src/transport/gnunet-transport-profiler.c:508
+#: src/transport/gnunet-transport-profiler.c:480
 #, fuzzy, c-format
 msgid "Denying connection to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:510
 msgid "Message size too big!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:543
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/transport/gnunet-transport-profiler.c:558
+#: src/transport/gnunet-transport-profiler.c:531
 #, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:564
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy, c-format
 msgid "Trying to receive messages from peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport-profiler.c:569
+#: src/transport/gnunet-transport-profiler.c:542
 #, fuzzy
 msgid "No operation given\n"
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:549
+#, fuzzy
+msgid "Failed to connect to ATS service\n"
+msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
+
+#: src/transport/gnunet-transport-profiler.c:611
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport-profiler.c:614
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:632
+#: src/transport/gnunet-transport-profiler.c:620
 #, fuzzy
 msgid "number of messages to send"
 msgstr "Anzahl an Durchläufen"
 
-#: src/transport/gnunet-transport-profiler.c:635
+#: src/transport/gnunet-transport-profiler.c:623
 msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1485
-#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3435
-#: src/transport/plugin_transport_tcp.c:2991
-#: src/transport/plugin_transport_tcp.c:2998
+#: src/transport/plugin_transport_http_client.c:1482
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3433
+#: src/transport/plugin_transport_tcp.c:2985
+#: src/transport/plugin_transport_tcp.c:2992
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2128
+#: src/transport/plugin_transport_http_client.c:2123
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2177
-#: src/transport/plugin_transport_http_server.c:3150
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2194
-#: src/transport/plugin_transport_http_server.c:3220
+#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_server.c:3218
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2228
+#: src/transport/plugin_transport_http_client.c:2223
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1735
+#: src/transport/plugin_transport_http_server.c:1733
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8001,116 +7715,116 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1967
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1975
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2125
+#: src/transport/plugin_transport_http_server.c:2123
 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:2148
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2275
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2584
+#: src/transport/plugin_transport_http_server.c:2582
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2618 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2636 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2749
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2827
-#: src/transport/plugin_transport_udp.c:3409
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3604
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2926
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2941
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2947
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 "Weder IPv4 noch IPv6 sind aktiviert! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2956
 msgid "Port is required! Fix in configuration\n"
 msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2962
 #, c-format
 msgid "Using port %u\n"
 msgstr "Port %u wird verwendet\n"
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2988
+#: src/transport/plugin_transport_http_server.c:2986
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3010
+#: src/transport/plugin_transport_http_server.c:3008
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3020
+#: src/transport/plugin_transport_http_server.c:3018
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3083
+#: src/transport/plugin_transport_http_server.c:3081
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3104
+#: src/transport/plugin_transport_http_server.c:3102
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3121
+#: src/transport/plugin_transport_http_server.c:3119
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/plugin_transport_http_server.c:3447
+#: src/transport/plugin_transport_http_server.c:3445
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -8161,24 +7875,24 @@
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
 #: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1989
+#: src/transport/plugin_transport_tcp.c:1983
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1081
-#: src/transport/plugin_transport_tcp.c:2259
-#: src/transport/plugin_transport_tcp.c:3112
+#: src/transport/plugin_transport_tcp.c:1079
+#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:3106
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
 #: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1063
-#: src/transport/plugin_transport_tcp.c:1187
-#: src/transport/plugin_transport_tcp.c:1260
-#: src/transport/plugin_transport_tcp.c:1360
-#: src/transport/plugin_transport_tcp.c:1385
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1185
+#: src/transport/plugin_transport_tcp.c:1258
+#: src/transport/plugin_transport_tcp.c:1358
+#: src/transport/plugin_transport_tcp.c:1383
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
 
@@ -8186,78 +7900,78 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
 
-#: src/transport/plugin_transport_tcp.c:1190
+#: src/transport/plugin_transport_tcp.c:1188
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 
-#: src/transport/plugin_transport_tcp.c:1264
+#: src/transport/plugin_transport_tcp.c:1262
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1659
+#: src/transport/plugin_transport_tcp.c:1653
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1827
+#: src/transport/plugin_transport_tcp.c:1821
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2318
+#: src/transport/plugin_transport_tcp.c:2312
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2509
+#: src/transport/plugin_transport_tcp.c:2503
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2560
-#: src/transport/plugin_transport_tcp.c:2618
+#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2612
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2558
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:2570
+#: src/transport/plugin_transport_tcp.c:2564
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2572
+#: src/transport/plugin_transport_tcp.c:2566
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2606
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2622
+#: src/transport/plugin_transport_tcp.c:2616
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2925 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:2935
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:3100
+#: src/transport/plugin_transport_tcp.c:3094
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3104
+#: src/transport/plugin_transport_tcp.c:3098
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3108
+#: src/transport/plugin_transport_tcp.c:3102
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8267,17 +7981,17 @@
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:548
+#: src/transport/plugin_transport_udp_broadcasting.c:546
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:569
+#: src/transport/plugin_transport_udp_broadcasting.c:567
 #, fuzzy, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_udp.c:3152
+#: src/transport/plugin_transport_udp.c:3344
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8284,57 +7998,57 @@
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3166
+#: src/transport/plugin_transport_udp.c:3358
 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:3485
-#: src/transport/plugin_transport_udp.c:3584
+#: src/transport/plugin_transport_udp.c:3680
+#: src/transport/plugin_transport_udp.c:3779
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3503
+#: src/transport/plugin_transport_udp.c:3698
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3594
+#: src/transport/plugin_transport_udp.c:3789
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3666
-#: src/transport/plugin_transport_udp.c:3680
+#: src/transport/plugin_transport_udp.c:3861
+#: src/transport/plugin_transport_udp.c:3875
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3712
+#: src/transport/plugin_transport_udp.c:3907
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3739
+#: src/transport/plugin_transport_udp.c:3934
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3805
+#: src/transport/plugin_transport_udp.c:4000
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_unix.c:1409
+#: src/transport/plugin_transport_unix.c:1407
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/plugin_transport_unix.c:1422
+#: src/transport/plugin_transport_unix.c:1420
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/plugin_transport_unix.c:1824
+#: src/transport/plugin_transport_unix.c:1820
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -8349,68 +8063,68 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:890
+#: src/transport/plugin_transport_wlan.c:888
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:1011
+#: src/transport/plugin_transport_wlan.c:1009
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1040
+#: src/transport/plugin_transport_wlan.c:1038
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1171
-#: src/transport/plugin_transport_wlan.c:1264
-#: src/transport/plugin_transport_wlan.c:2287
+#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:2279
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:1547
+#: src/transport/plugin_transport_wlan.c:1541
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1616
+#: src/transport/plugin_transport_wlan.c:1610
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:1714
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1839
+#: src/transport/plugin_transport_wlan.c:1831
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:1865
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/plugin_transport_wlan.c:2262
+#: src/transport/plugin_transport_wlan.c:2254
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2276
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/transport_api.c:892
+#: src/transport/transport_api.c:816
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/transport-testing.c:603
+#: src/transport/transport-testing.c:680
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -8449,12 +8163,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:894 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:268 src/util/client.c:899 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:895 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -8471,54 +8185,54 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1044
+#: src/util/client.c:1040
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:1056
+#: src/util/client.c:1052
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/common_logging.c:255 src/util/common_logging.c:1035
+#: src/util/common_logging.c:255 src/util/common_logging.c:1062
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1033
+#: src/util/common_logging.c:257 src/util/common_logging.c:1060
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1031
+#: src/util/common_logging.c:259 src/util/common_logging.c:1058
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1029
+#: src/util/common_logging.c:261 src/util/common_logging.c:1056
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1037
+#: src/util/common_logging.c:263 src/util/common_logging.c:1064
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:813
+#: src/util/common_logging.c:840
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1038
+#: src/util/common_logging.c:1065
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1154
+#: src/util/common_logging.c:1181
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1223
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1241
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
@@ -8525,7 +8239,7 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1262
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8635,17 +8349,17 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:999
+#: src/util/crypto_rsa.c:1146
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:1226
+#: src/util/disk.c:1228
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1449 src/util/service.c:1328
+#: src/util/disk.c:1451 src/util/service.c:1327
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -8710,7 +8424,7 @@
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/getopt_helpers.c:90
+#: src/util/getopt_helpers.c:91
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8718,12 +8432,12 @@
 "Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:274 src/util/getopt_helpers.c:332
+#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:304
+#: src/util/getopt_helpers.c:308
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
@@ -8859,28 +8573,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:233
+#: src/util/gnunet-scrypt.c:234
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/util/gnunet-scrypt.c:294
+#: src/util/gnunet-scrypt.c:295
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:298
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:300
+#: src/util/gnunet-scrypt.c:301
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:304
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:315
+#: src/util/gnunet-scrypt.c:316
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8895,41 +8609,41 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts »%s« konnte nicht ermittelt werden: %s\n"
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-uri.c:88
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "URL beginnt nicht mit »%s«\n"
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-uri.c:105
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:168
+#: src/util/gnunet-uri.c:167
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:342
+#: src/util/helper.c:340
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/util/helper.c:388
+#: src/util/helper.c:386
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/helper.c:620
+#: src/util/helper.c:616
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8945,7 +8659,7 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:421
+#: src/util/os_installation.c:500
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8952,17 +8666,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:768
+#: src/util/os_installation.c:860
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:828
+#: src/util/os_installation.c:920
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:838
+#: src/util/os_installation.c:930
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8988,46 +8702,53 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:246 src/util/service.c:1462
+#: src/util/program.c:248 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:258 src/util/service.c:1477
+#: src/util/program.c:260 src/util/service.c:1476
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/program.c:263 src/util/service.c:1472
+#: src/util/program.c:265 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/resolver_api.c:201
-#, fuzzy, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+#: src/util/resolver_api.c:204
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
 
-#: src/util/resolver_api.c:220
+#: src/util/resolver_api.c:223
 #, fuzzy, c-format
 msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:354
+#: src/util/resolver_api.c:357
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:361
+#: src/util/resolver_api.c:364
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:1027 src/util/resolver_api.c:1048
-#: src/util/resolver_api.c:1062
+#: src/util/resolver_api.c:952
+#, fuzzy
+msgid "Resolver not configured correctly.\n"
+msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
+
+#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
+#: src/util/resolver_api.c:1063
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -9047,7 +8768,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/util/server.c:904
+#: src/util/server.c:902
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9106,38 +8827,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1175
+#: src/util/service.c:1174
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1217
+#: src/util/service.c:1216
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/util/service.c:1266
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1270
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1274
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1329
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1342
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
 
-#: src/util/service.c:1412
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9146,12 +8867,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/socks.c:592
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:605
+#: src/util/socks.c:610
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9364,27 +9085,27 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3019
+#: src/vpn/gnunet-service-vpn.c:3017
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3043
+#: src/vpn/gnunet-service-vpn.c:3041
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3051
+#: src/vpn/gnunet-service-vpn.c:3049
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3064
+#: src/vpn/gnunet-service-vpn.c:3062
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3077
+#: src/vpn/gnunet-service-vpn.c:3075
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3085
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -9453,23 +9174,159 @@
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/include/gnunet_common.h:635 src/include/gnunet_common.h:642
-#: src/include/gnunet_common.h:650
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
+#: src/include/gnunet_common.h:655
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:662
+#: src/include/gnunet_common.h:667
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:698
+#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Error trying to send a message to peer `%s'.\n"
+#~ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Retrieve information about all defined sensors"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "Retrieve information about a single sensor"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "Missing or invalid topology file.\n"
+#~ msgstr "Ungültige Antwort auf `%s'.\n"
+
+#, fuzzy
+#~ msgid "Number of peers to run"
+#~ msgstr "Anzahl an Durchläufen"
+
+#, fuzzy
+#~ msgid "Profiler for sensor service"
+#~ msgstr "Fehler beim Starten des Dienstes.\n"
+
+#, fuzzy
+#~ msgid "Analysis model not defined in configuration.\n"
+#~ msgstr " gconfig\tGTK Konfiguration\n"
+
+#, fuzzy
+#~ msgid "Could not load analysis model `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "Could not connect to peerstore service.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Received an invalid value for sensor `%s': %s\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pow and signature block.\n"
+#~ msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
+
+#, fuzzy
+#~ msgid "PEERSTORE error: %s.\n"
+#~ msgstr "Datenstromfehler: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to CORE service.\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to peerstore service.\n"
+#~ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to load my private key.\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to update point `%s'.\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `SENSOR' service."
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Error reading sensor version\n"
+#~ msgstr "Fehler beim Anlegen des Benutzers"
+
+#, fuzzy
+#~ msgid "Error reading sensor category\n"
+#~ msgstr "Fehler beim Anlegen des Benutzers"
+
+#, fuzzy
+#~ msgid "Error reading sensor run interval\n"
+#~ msgstr "Fehler beim Anlegen des Tunnels\n"
+
+#, fuzzy
+#~ msgid "Error reading sensor source\n"
+#~ msgstr "Fehler beim Anlegen des Benutzers"
+
+#, fuzzy
+#~ msgid "Error reading sensor process name\n"
+#~ msgstr "Fehler beim Lesen von »%s«: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to access sensor file: %s\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to load sensor definition: %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Error loading sensor from file: %s\n"
+#~ msgstr "Fehler beim Lesen von »%s«: %s\n"
+
+#, fuzzy
+#~ msgid "dump statistics to stdout after completion"
+#~ msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
+
+#, fuzzy
+#~ msgid "# REQUEST CONNECT messages received"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# REQUEST DISCONNECT messages received"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#~ msgid "Successfully disconnected from `%s'\n"
+#~ msgstr "Verbindung zu »%s« wurde erfolgreich getrennt\n"
+
+#, fuzzy
+#~ msgid "Failed to send connect request to transport service\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Failed to send disconnect request to transport service\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#~ msgid "Failed to send request to transport service\n"
+#~ msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
+
+#, fuzzy
+#~ msgid "Retrying to connect to `%s'\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Must specify `%s' for `%s' in configuration!\n"
+#~ msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+
+#, fuzzy
 #~ msgid "Unknown operator: %c\n"
 #~ msgstr "Unbekannte Operation `%s'\n"
 
@@ -9489,9 +9346,6 @@
 #~ msgid "Starting default services `%s'\n"
 #~ msgstr "Collection `%s' begonnen.\n"
 
-#~ msgid "Default service `%s' not configured correctly!\n"
-#~ msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
-
 #, fuzzy
 #~| msgid "received invalid `%s' message\n"
 #~ msgid "Received %s message\n"

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2016-04-19 11:25:51 UTC (rev 37056)
+++ gnunet/po/es.po     2016-04-19 11:50:49 UTC (rev 37057)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-10-11 21:29+0200\n"
+"POT-Creation-Date: 2016-04-18 17:19+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -17,13 +17,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:337
+#: src/arm/arm_api.c:336
 #, fuzzy
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/arm/arm_monitor_api.c:321
+#: src/arm/arm_monitor_api.c:324
 #, fuzzy
 msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
@@ -40,26 +40,26 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:218
+#: src/arm/gnunet-arm.c:217
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:223
 #, fuzzy
 msgid "Request does not fit into a message"
 msgstr "no imprime mensajes de estado"
@@ -66,47 +66,47 @@
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,76 +114,76 @@
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:261
 #, fuzzy, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:367
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:377
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:419
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:515
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:523
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Error al comunicar con el ARM. ¿Está el ARM ejecutándose?\n"
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
@@ -245,8 +245,8 @@
 msgstr "no imprime mensajes de estado"
 
 #: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
-msgstr "plazo en milisegundos (MSECS) para completar la operación actual"
+msgid "exit with error status if operation does not finish after DELAY"
+msgstr ""
 
 #: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
@@ -278,23 +278,23 @@
 msgid "Could not send list result to client\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/arm/gnunet-service-arm.c:542
+#: src/arm/gnunet-service-arm.c:581
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:553
+#: src/arm/gnunet-service-arm.c:592
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:653
+#: src/arm/gnunet-service-arm.c:693
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
 
-#: src/arm/gnunet-service-arm.c:677
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -305,44 +305,44 @@
 # no es exactamente lo mismo que el texto en inglés, pero
 # es fiel a la realidad puesto que el ARM reinicia
 # las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:713
+#: src/arm/gnunet-service-arm.c:753
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:853
+#: src/arm/gnunet-service-arm.c:891
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1123
+#: src/arm/gnunet-service-arm.c:1160
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1281
+#: src/arm/gnunet-service-arm.c:1324
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1286
+#: src/arm/gnunet-service-arm.c:1329
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1291
+#: src/arm/gnunet-service-arm.c:1334
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1297
+#: src/arm/gnunet-service-arm.c:1340
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1319
+#: src/arm/gnunet-service-arm.c:1367
 #, fuzzy, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1384
 #, fuzzy, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
@@ -351,7 +351,7 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -360,7 +360,7 @@
 "No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2796
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -369,7 +369,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2837
+#: src/ats/gnunet-ats-solver-eval.c:2840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -378,30 +378,30 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3290 src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats-tests/gnunet-solver-eval.c:927
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3302
 #, fuzzy
 msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3308
 msgid "disable normalization"
 msgstr ""
 
@@ -455,10 +455,10 @@
 #: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
 #: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
 #: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
-#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
-#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
-#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
+#: 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
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -538,11 +538,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:834
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:885
+#: src/ats-tests/ats-testing-log.c:888
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Iniciando descarga «%s».\n"
@@ -558,12 +558,12 @@
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
 # en castellano sin la palabra resolver. :-)
-#: src/ats-tool/gnunet-ats.c:289
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr "%u resoluciones de dirección pasaron de plazo\n"
 
-#: src/ats-tool/gnunet-ats.c:293
+#: src/ats-tool/gnunet-ats.c:311
 #, fuzzy, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
@@ -570,7 +570,7 @@
 
 # Miguel: "Plugin" está traducido como módulo en todo el texto
 # puesto que no hay módulos fijos en contraposición a cargables.
-#: src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:395
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -579,125 +579,123 @@
 "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u "
 "Bytes/s, %s\n"
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:483
+#: src/ats-tool/gnunet-ats.c:512
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:705
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
-#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
-#: src/namestore/plugin_rest_namestore.c:850
-#: src/transport/gnunet-transport.c:1890
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/transport/gnunet-transport.c:1797
+#: src/transport/gnunet-transport-profiler.c:523
 #, c-format
-msgid "Service `%s' is not running\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
-
-#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
-#: src/transport/gnunet-transport-profiler.c:549
-#, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:732
-#, c-format
-msgid "Please select one operation : %s or %s or %s or %s or %s\n"
+#: src/ats-tool/gnunet-ats.c:773
+#, fuzzy, c-format
+msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
 
-#: src/ats-tool/gnunet-ats.c:754 src/ats-tool/gnunet-ats.c:780
-#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
+#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:862
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:827
+#: src/ats-tool/gnunet-ats.c:869
 #, fuzzy
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:845
+#: src/ats-tool/gnunet-ats.c:887
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:949
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:918
+#: src/ats-tool/gnunet-ats.c:951
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:921
+#: src/ats-tool/gnunet-ats.c:954
+#, fuzzy
+msgid "connect to PEER"
+msgstr "conectar a un par"
+
+#: src/ats-tool/gnunet-ats.c:957
 msgid "do not resolve IP addresses to hostnames"
 msgstr "no resuelve direcciones IP a nombres de máquina"
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/ats-tool/gnunet-ats.c:923
+#: src/ats-tool/gnunet-ats.c:959
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:961
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:927
+#: src/ats-tool/gnunet-ats.c:963
 msgid "print all configured quotas"
 msgstr "imprime todas las cuotas configuradas"
 
 # Miguel: He preferido extender id a identificación por claridad.
-#: src/ats-tool/gnunet-ats.c:929
+#: src/ats-tool/gnunet-ats.c:965
 msgid "peer id"
 msgstr "identificación del par"
 
 # Miguel: No me he encontrado esta opción todavía,
 # pero creo que son palabras clave.
-#: src/ats-tool/gnunet-ats.c:932
+#: src/ats-tool/gnunet-ats.c:968
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
 "banda)"
 
-#: src/ats-tool/gnunet-ats.c:934
+#: src/ats-tool/gnunet-ats.c:970
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:937
+#: src/ats-tool/gnunet-ats.c:973
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:944
+#: src/ats-tool/gnunet-ats.c:983
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/cadet/gnunet-cadet.c:460
+#: src/cadet/gnunet-cadet.c:458
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:737
+#: src/cadet/gnunet-cadet.c:736
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -707,79 +705,85 @@
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:846
+#: src/cadet/gnunet-cadet.c:844
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:946
+#: src/cadet/gnunet-cadet.c:944
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:949
+#: src/cadet/gnunet-cadet.c:947
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:953
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:956
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:961
+#: src/cadet/gnunet-cadet.c:959
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:964
+#: src/cadet/gnunet-cadet.c:962
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:965
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-service-cadet_peer.c:543
+#: src/cadet/gnunet-service-cadet_peer.c:561
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/consensus/gnunet-consensus-profiler.c:478
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:481
+#: src/consensus/gnunet-consensus-profiler.c:499
 #, fuzzy
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus-profiler.c:484
-#: src/set/gnunet-set-profiler.c:356 src/set/gnunet-set-profiler.c:359
-#: src/set/gnunet-set-profiler.c:362
+#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/set/gnunet-set-profiler.c:374 src/set/gnunet-set-profiler.c:377
+#: src/set/gnunet-set-profiler.c:380
 msgid "number of values"
 msgstr "número de valores"
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus-profiler.c:487
+#: src/consensus/gnunet-consensus-profiler.c:505
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
-#: src/consensus/gnunet-consensus-profiler.c:490
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:493
-#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/set/gnunet-set-profiler.c:386
+#, fuzzy
+msgid "write statistics to file"
+msgstr "imprime el valor de las estadísticas"
+
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/secretsharing/gnunet-secretsharing-profiler.c:623
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -1022,39 +1026,39 @@
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1175
+#: src/conversation/gnunet-conversation.c:1171
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1188
+#: src/conversation/gnunet-conversation.c:1184
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1219
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1247
+#: src/conversation/gnunet-conversation.c:1243
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1272
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
+#: src/conversation/gnunet-conversation.c:1298
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, c-format
 msgid ""
 "\n"
@@ -1061,7 +1065,7 @@
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:145
 #, c-format
 msgid ""
 "\n"
@@ -1069,7 +1073,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:211
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1076,13 +1080,18 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/sensordashboard/gnunet-sensordashboard.c:70
+#: src/conversation/gnunet-conversation-test.c:244
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
 
+#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
 #: src/conversation/gnunet-helper-audio-playback.c:318
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
@@ -1150,11 +1159,6 @@
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
 #: src/conversation/gnunet-helper-audio-record.c:344
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
@@ -1245,72 +1249,72 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:726
+#: src/core/core_api.c:725
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:92
+#: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
 msgstr "# amigos conectados"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:93
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
+#: src/core/gnunet-core.c:96
 #, fuzzy
 msgid "key received"
 msgstr "# claves de sesión recibidas"
 
-#: src/core/gnunet-core.c:101
+#: src/core/gnunet-core.c:99
 #, fuzzy
 msgid "connection established"
 msgstr "Colección detenida.\n"
 
-#: src/core/gnunet-core.c:104
+#: src/core/gnunet-core.c:102
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
+#: src/core/gnunet-core.c:105
 #, fuzzy
 msgid "disconnected"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:114
+#: src/core/gnunet-core.c:112
 #, fuzzy
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:117
+#: src/core/gnunet-core.c:115
 #, fuzzy
 msgid "unknown state"
 msgstr "<tiempo desconocido>"
 
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:120
 #, fuzzy, c-format
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
-#: src/core/gnunet-core.c:157
+#: src/core/gnunet-core.c:155
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -1325,15 +1329,15 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_clients.c:379
+#: src/core/gnunet-service-core_clients.c:380
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core_clients.c:497
+#: src/core/gnunet-service-core_clients.c:498
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core_clients.c:562
+#: src/core/gnunet-service-core_clients.c:561
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
@@ -1381,7 +1385,7 @@
 msgstr "# mensajes «SET_KEY» descifrados"
 
 #: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1081
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
@@ -1390,93 +1394,84 @@
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
-msgstr ""
-"Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
-"del PONG: «%s»\n"
-
-#: src/core/gnunet-service-core_kx.c:1093
+#: src/core/gnunet-service-core_kx.c:1091
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1122
+#: src/core/gnunet-service-core_kx.c:1118
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1131
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1206
-#: src/transport/gnunet-service-transport_validation.c:1392
+#: src/core/gnunet-service-core_kx.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1404
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1213
+#: src/core/gnunet-service-core_kx.c:1209
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1218
+#: src/core/gnunet-service-core_kx.c:1214
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1254
+#: src/core/gnunet-service-core_kx.c:1250
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1292
+#: src/core/gnunet-service-core_kx.c:1288
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1310
+#: src/core/gnunet-service-core_kx.c:1306
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1466
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1474
+#: src/core/gnunet-service-core_kx.c:1470
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1535
-#: src/core/gnunet-service-core_kx.c:1561
+#: src/core/gnunet-service-core_kx.c:1531
+#: src/core/gnunet-service-core_kx.c:1557
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1548
+#: src/core/gnunet-service-core_kx.c:1544
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1586
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1598
+#: src/core/gnunet-service-core_kx.c:1594
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1486,7 +1481,7 @@
 msgstr "# sesiones terminadas por desconexión de transporte"
 
 #: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:384
+#: src/core/gnunet-service-core_neighbours.c:387
 msgid "# neighbour entries allocated"
 msgstr "# entradas de vecinos alojadas"
 
@@ -1494,33 +1489,33 @@
 msgid "# encrypted bytes given to transport"
 msgstr "# bytes cifrados dados al transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:470
+#: src/core/gnunet-service-core_neighbours.c:486
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
 #: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:339
-#: src/dht/gnunet-service-dht_neighbours.c:660
-#: src/dht/gnunet-service-dht_neighbours.c:725
-#: src/fs/gnunet-service-fs_cp.c:655 src/fs/gnunet-service-fs_cp.c:1649
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:755
-#: src/transport/gnunet-service-transport_neighbours.c:763
+#: src/core/gnunet-service-core_sessions.c:337
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:867
+#: src/fs/gnunet-service-fs_cp.c:657 src/fs/gnunet-service-fs_cp.c:1718
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/transport/gnunet-service-transport_neighbours.c:720
+#: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:286
+#: src/core/gnunet-service-core_sessions.c:284
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:405
+#: src/core/gnunet-service-core_sessions.c:403
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:414
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
@@ -1535,7 +1530,7 @@
 msgstr "# actualizaciones de mi mapa de tipos"
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:866
+#: src/datastore/gnunet-service-datastore.c:863
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
@@ -1584,9 +1579,9 @@
 #: src/datastore/plugin_datastore_sqlite.c:65 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_postgres.c:53
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
@@ -1594,7 +1589,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:671 src/include/gnunet_common.h:680
+#: src/include/gnunet_common.h:676 src/include/gnunet_common.h:685
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1610,138 +1605,138 @@
 
 # Miguel: "Drop" en bases de datos es eliminar una tabla
 # del modelo.
-#: src/datastore/datastore_api.c:310
+#: src/datastore/datastore_api.c:308
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 "Se produjo un fallo al transmitir la petición de eliminación a la base de "
 "datos.\n"
 
-#: src/datastore/datastore_api.c:395
+#: src/datastore/datastore_api.c:392
 msgid "# queue entry timeouts"
 msgstr "# expiraciones de plazo en la cola de entradas"
 
-#: src/datastore/datastore_api.c:450
+#: src/datastore/datastore_api.c:447
 msgid "# queue overflows"
 msgstr "# desbordamientos de la cola"
 
-#: src/datastore/datastore_api.c:478
+#: src/datastore/datastore_api.c:475
 msgid "# queue entries created"
 msgstr "# entradas creadas en la cola"
 
-#: src/datastore/datastore_api.c:498
+#: src/datastore/datastore_api.c:495
 msgid "# Requests dropped from datastore queue"
 msgstr "# Peticiones omitidas de la cola del almacén de datos"
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:536
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:628
+#: src/datastore/datastore_api.c:624
 msgid "# transmission request failures"
 msgstr "# fallos en peticiones de transmisión"
 
-#: src/datastore/datastore_api.c:652
+#: src/datastore/datastore_api.c:648
 msgid "# bytes sent to datastore"
 msgstr "# bytes mandados al almacén de datos"
 
-#: src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:790
 msgid "Failed to receive status response from database."
 msgstr ""
 "Se produjo un fallo al recibir el estado de respuesta de la base de datos."
 
-#: src/datastore/datastore_api.c:808
+#: src/datastore/datastore_api.c:804
 msgid "Error reading response from datastore service"
 msgstr "Error leyendo respuesta del servicio de almacenamiento de datos"
 
-#: src/datastore/datastore_api.c:820 src/datastore/datastore_api.c:826
+#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
 msgid "Invalid error message received from datastore service"
 msgstr ""
 "Mensaje de error no válido recibido del servicio de almacenamiento de datos"
 
-#: src/datastore/datastore_api.c:830
+#: src/datastore/datastore_api.c:826
 msgid "# status messages received"
 msgstr "# mensajes de estado recibidos"
 
-#: src/datastore/datastore_api.c:909
+#: src/datastore/datastore_api.c:905
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:975
+#: src/datastore/datastore_api.c:971
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1036
+#: src/datastore/datastore_api.c:1032
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1096
+#: src/datastore/datastore_api.c:1092
 msgid "# UPDATE requests executed"
 msgstr "# peticiones «UPDATE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1160
+#: src/datastore/datastore_api.c:1156
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1264
+#: src/datastore/datastore_api.c:1260
 msgid "# Results received"
 msgstr "# Resultados recibidos"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1327
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1394
+#: src/datastore/datastore_api.c:1390
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1463
+#: src/datastore/datastore_api.c:1459
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:113
 #, fuzzy, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:199
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
+#: src/datastore/gnunet-datastore.c:245
 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:255
+#: src/datastore/gnunet-datastore.c:254
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/datastore/gnunet-service-datastore.c:372
+#: src/datastore/gnunet-service-datastore.c:370
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:447
+#: src/datastore/gnunet-service-datastore.c:444
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:505
-#: src/gns/gnunet-gns-helper-service-w32.c:223
+#: src/datastore/gnunet-service-datastore.c:502
+#: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr "¡La transmisión con el cliente ha fallado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:536
-#: src/gns/gnunet-gns-helper-service-w32.c:262
+#: src/datastore/gnunet-service-datastore.c:533
+#: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
-#: src/datastore/gnunet-service-datastore.c:652
+#: src/datastore/gnunet-service-datastore.c:649
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:694
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1750,7 +1745,7 @@
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:705
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1759,7 +1754,7 @@
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:709
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1767,61 +1762,61 @@
 "Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
 "mayor que el tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:715
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:779
-#: src/datastore/gnunet-service-datastore.c:1035
-#: src/datastore/gnunet-service-datastore.c:1630
+#: src/datastore/gnunet-service-datastore.c:721
+#: src/datastore/gnunet-service-datastore.c:776
+#: src/datastore/gnunet-service-datastore.c:1037
+#: src/datastore/gnunet-service-datastore.c:1670
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:793
+#: src/datastore/gnunet-service-datastore.c:790
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:877
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:1088
+#: src/datastore/gnunet-service-datastore.c:1092
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1101
+#: src/datastore/gnunet-service-datastore.c:1105
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1153
 msgid "# UPDATE requests received"
 msgstr "# peticiones «UPDATE» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1170
+#: src/datastore/gnunet-service-datastore.c:1185
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1204
+#: src/datastore/gnunet-service-datastore.c:1221
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1267
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1244
+#: src/datastore/gnunet-service-datastore.c:1277
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1309
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1321
+#: src/datastore/gnunet-service-datastore.c:1362
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1829,62 +1824,62 @@
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1326
+#: src/datastore/gnunet-service-datastore.c:1367
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1379
+#: src/datastore/gnunet-service-datastore.c:1420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1390
+#: src/datastore/gnunet-service-datastore.c:1431
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1459
-#: src/datastore/gnunet-service-datastore.c:1522
+#: src/datastore/gnunet-service-datastore.c:1500
+#: src/datastore/gnunet-service-datastore.c:1563
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1509
+#: src/datastore/gnunet-service-datastore.c:1550
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1519
+#: src/datastore/gnunet-service-datastore.c:1560
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1661
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:1701
+#: src/datastore/gnunet-service-datastore.c:1713
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡No se ha especificado ningún «%s» para «%s» en la configuración!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1679
+#: src/datastore/gnunet-service-datastore.c:1719
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1681
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1696
+#: src/datastore/gnunet-service-datastore.c:1736
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1714
-#: src/datastore/gnunet-service-datastore.c:1730
+#: src/datastore/gnunet-service-datastore.c:1754
+#: src/datastore/gnunet-service-datastore.c:1770
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
@@ -1891,7 +1886,7 @@
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1800
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -1923,17 +1918,17 @@
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:331
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:846
+#: src/datastore/plugin_datastore_postgres.c:975
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:882
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/namecache/plugin_namecache_postgres.c:398
+#: src/namestore/plugin_namestore_postgres.c:571
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -1989,7 +1984,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:132
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1998,150 +1993,150 @@
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:158
 msgid "Must provide key for DHT GET!\n"
 msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
 msgid "Failed to connect to DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:172
 msgid "Issueing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
+#: src/dht/gnunet-dht-put.c:199
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:191
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
 msgid "how long to execute this query before giving up?"
 msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: 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:794
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:954
+#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:270
+#: src/dht/gnunet-dht-put.c:214 src/fs/gnunet-auto-share.c:788
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:952
 #: src/fs/gnunet-search.c:306 src/fs/gnunet-unindex.c:167
-#: src/nse/gnunet-nse-profiler.c:873
+#: src/nse/gnunet-nse-profiler.c:872
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:224
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:267
 msgid "how long should the monitor command run"
 msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:292
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:1393 src/testbed/gnunet-testbed-profiler.c:267
+#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/dht/gnunet_dht_profiler.c:1418
+#: src/dht/gnunet_dht_profiler.c:1421
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1424
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
+#: src/dht/gnunet_dht_profiler.c:1427 src/nse/gnunet-nse-profiler.c:863
+#: src/testbed/gnunet-testbed-profiler.c:304
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/dht/gnunet_dht_profiler.c:1427
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1442
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1457
+#: src/dht/gnunet_dht_profiler.c:1460
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:119
 msgid "PUT request sent with key"
 msgstr "Petición «PUT» enviada con clave"
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:122
 msgid "Timeout sending PUT request!\n"
 msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:125
 msgid "PUT request not confirmed!\n"
 msgstr "¡Petición «PUT» no confirmada!\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:154
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:161
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:177
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:193
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:196
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:208
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:237
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
@@ -2278,60 +2273,56 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:514
-msgid "# Preference updates given to core"
-msgstr "# Actualizaciones de preferencias dadas al servicio principal"
-
-#: src/dht/gnunet-service-dht_neighbours.c:608
+#: src/dht/gnunet-service-dht_neighbours.c:739
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:762
-#: src/dht/gnunet-service-xdht_neighbours.c:6061
+#: src/dht/gnunet-service-dht_neighbours.c:904
+#: src/dht/gnunet-service-xdht_neighbours.c:6056
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:937
 #: src/dht/gnunet-service-xdht_neighbours.c:986
 #, fuzzy
 msgid "# Messages dropped (CORE timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:822
+#: src/dht/gnunet-service-dht_neighbours.c:967
 #: src/dht/gnunet-service-xdht_neighbours.c:1018
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:868
+#: src/dht/gnunet-service-dht_neighbours.c:1013
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-dht_neighbours.c:1047
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1104
-#: src/dht/gnunet-service-dht_neighbours.c:1141
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1119
-#: src/dht/gnunet-service-dht_neighbours.c:1156
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1304
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1451
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1329
+#: src/dht/gnunet-service-dht_neighbours.c:1480
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1339
-#: src/dht/gnunet-service-dht_neighbours.c:1463
-#: src/dht/gnunet-service-dht_neighbours.c:1568
+#: src/dht/gnunet-service-dht_neighbours.c:1490
+#: src/dht/gnunet-service-dht_neighbours.c:1614
+#: src/dht/gnunet-service-dht_neighbours.c:1721
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2344,57 +2335,57 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1425
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1603
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1728
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1815
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1665
+#: src/dht/gnunet-service-dht_neighbours.c:1818
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1990
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1841
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1936
+#: src/dht/gnunet-service-dht_neighbours.c:2093
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1939
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2004
+#: src/dht/gnunet-service-dht_neighbours.c:2161
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2175
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2103
+#: src/dht/gnunet-service-dht_neighbours.c:2261
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2106
+#: src/dht/gnunet-service-dht_neighbours.c:2264
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2503,22 +2494,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3558
+#: src/dht/gnunet-service-xdht_neighbours.c:3555
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3699
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4241
-#: src/dht/gnunet-service-xdht_neighbours.c:4422
-#: src/dht/gnunet-service-xdht_neighbours.c:4935
-#: src/dht/gnunet-service-xdht_neighbours.c:5328
-#: src/dht/gnunet-service-xdht_neighbours.c:5421
-#: src/dht/gnunet-service-xdht_neighbours.c:5511
-#: src/dht/gnunet-service-xdht_neighbours.c:5615
-#: src/dht/gnunet-service-xdht_neighbours.c:5759
-#: src/dht/gnunet-service-xdht_neighbours.c:5848
+#: src/dht/gnunet-service-xdht_neighbours.c:3696
+#: src/dht/gnunet-service-xdht_neighbours.c:3934
+#: src/dht/gnunet-service-xdht_neighbours.c:4086
+#: src/dht/gnunet-service-xdht_neighbours.c:4238
+#: src/dht/gnunet-service-xdht_neighbours.c:4419
+#: src/dht/gnunet-service-xdht_neighbours.c:4932
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5506
+#: src/dht/gnunet-service-xdht_neighbours.c:5610
+#: src/dht/gnunet-service-xdht_neighbours.c:5754
+#: src/dht/gnunet-service-xdht_neighbours.c:5843
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# respuestas recibidas de otros pares"
@@ -2584,22 +2575,22 @@
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:297
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:366
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:438
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
@@ -2628,57 +2619,57 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
 
-#: src/dns/gnunet-service-dns.c:459
+#: src/dns/gnunet-service-dns.c:457
 msgid "# DNS requests answered via TUN interface"
 msgstr "# Peticiones DNS contestadas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:606
+#: src/dns/gnunet-service-dns.c:604
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)"
 
-#: src/dns/gnunet-service-dns.c:717
+#: src/dns/gnunet-service-dns.c:715
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:795
+#: src/dns/gnunet-service-dns.c:793
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:910
+#: src/dns/gnunet-service-dns.c:908
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:926
+#: src/dns/gnunet-service-dns.c:924
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:935
+#: src/dns/gnunet-service-dns.c:933
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n"
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:943
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1012
+#: src/dns/gnunet-service-dns.c:1010
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1064 src/exit/gnunet-daemon-exit.c:3615
+#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dns/gnunet-service-dns.c:1082
+#: src/dns/gnunet-service-dns.c:1081
 #, fuzzy, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/dv/gnunet-dv.c:169
+#: src/dv/gnunet-dv.c:167
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:176
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
@@ -2837,17 +2828,17 @@
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3271 src/exit/gnunet-daemon-exit.c:3281
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3295 src/exit/gnunet-daemon-exit.c:3303
+#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3334
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2854,12 +2845,12 @@
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3362
+#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3373
+#: src/exit/gnunet-daemon-exit.c:3371
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2866,12 +2857,12 @@
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3555
+#: src/exit/gnunet-daemon-exit.c:3549
 #, fuzzy, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:3571
+#: src/exit/gnunet-daemon-exit.c:3565
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2879,7 +2870,7 @@
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3579
+#: src/exit/gnunet-daemon-exit.c:3573
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2887,7 +2878,7 @@
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3586
+#: src/exit/gnunet-daemon-exit.c:3580
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2895,7 +2886,7 @@
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3592
+#: src/exit/gnunet-daemon-exit.c:3586
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2903,100 +2894,100 @@
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3598 src/exit/gnunet-daemon-exit.c:3763
-#: src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3592 src/exit/gnunet-daemon-exit.c:3757
+#: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3710
+#: src/exit/gnunet-daemon-exit.c:3704
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3861
+#: src/exit/gnunet-daemon-exit.c:3855
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
-#: src/fragmentation/defragmentation.c:277
+#: src/fragmentation/defragmentation.c:275
 msgid "# acknowledgements sent for fragment"
 msgstr "# reconocimientos enviados por framentos"
 
-#: src/fragmentation/defragmentation.c:470
-#: src/transport/plugin_transport_wlan.c:1534
+#: src/fragmentation/defragmentation.c:468
+#: src/transport/plugin_transport_wlan.c:1528
 msgid "# fragments received"
 msgstr "# fragmentos recibidos"
 
-#: src/fragmentation/defragmentation.c:540
+#: src/fragmentation/defragmentation.c:538
 msgid "# duplicate fragments received"
 msgstr "# fragmentos duplicados recibidos"
 
-#: src/fragmentation/defragmentation.c:558
+#: src/fragmentation/defragmentation.c:556
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:235
+#: src/fragmentation/fragmentation.c:240
 msgid "# fragments transmitted"
 msgstr "# fragmentos transmitidos"
 
-#: src/fragmentation/fragmentation.c:240
+#: src/fragmentation/fragmentation.c:245
 msgid "# fragments retransmitted"
 msgstr "# fragmentos retransmitidos"
 
-#: src/fragmentation/fragmentation.c:269
+#: src/fragmentation/fragmentation.c:274
 msgid "# fragments wrap arounds"
 msgstr "# encajes de fragmentos"
 
-#: src/fragmentation/fragmentation.c:315
+#: src/fragmentation/fragmentation.c:321
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:321
+#: src/fragmentation/fragmentation.c:327
 msgid "# total size of fragmented messages"
 msgstr "# tamaño total de los mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:444
+#: src/fragmentation/fragmentation.c:451
 msgid "# fragment acknowledgements received"
 msgstr "# reconocimientos de fragmentos recibidos"
 
-#: src/fragmentation/fragmentation.c:451
+#: src/fragmentation/fragmentation.c:458
 msgid "# bits removed from fragmentation ACKs"
 msgstr "# bits eliminados de reconocimientos de fragmentos"
 
-#: src/fragmentation/fragmentation.c:475
+#: src/fragmentation/fragmentation.c:482
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:495
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:504
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:514
+#: src/fs/fs_api.c:512
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1122
+#: src/fs/fs_api.c:1120
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1642
+#: src/fs/fs_api.c:1640
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1656
+#: src/fs/fs_api.c:1654
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2314
+#: src/fs/fs_api.c:2312
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
@@ -3003,28 +2994,28 @@
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2324
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2452 src/fs/fs_api.c:2700
+#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2470
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2485 src/fs/fs_api.c:2504 src/fs/fs_api.c:2996
+#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2690
+#: src/fs/fs_api.c:2688
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
@@ -3031,13 +3022,13 @@
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2939
+#: src/fs/fs_api.c:2937
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:3034
+#: src/fs/fs_api.c:3032
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3108,7 +3099,7 @@
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1939
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -3167,87 +3158,87 @@
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:441
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:707 src/fs/fs_publish.c:724 src/fs/fs_publish.c:763
-#: src/fs/fs_publish.c:784 src/fs/fs_publish.c:808 src/fs/fs_publish.c:1058
+#: src/fs/fs_publish.c:705 src/fs/fs_publish.c:722 src/fs/fs_publish.c:761
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:806 src/fs/fs_publish.c:1054
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:707
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:721
+#: src/fs/fs_publish.c:719
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:765
+#: src/fs/fs_publish.c:763
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:785
+#: src/fs/fs_publish.c:783
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:810
+#: src/fs/fs_publish.c:808
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:833
+#: src/fs/fs_publish.c:831
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:897 src/fs/fs_publish.c:938
+#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1012
+#: src/fs/fs_publish.c:1008
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:1016
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1060
+#: src/fs/fs_publish.c:1056
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1299
+#: src/fs/fs_publish.c:1295
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1390
+#: src/fs/fs_publish.c:1386
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:224
+#: src/fs/fs_publish_ksk.c:220
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_publish_ublock.c:243
+#: src/fs/fs_publish_ublock.c:241
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:812 src/fs/fs_search.c:882
+#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:941
+#: src/fs/fs_search.c:935
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3292,17 +3283,17 @@
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
 
-#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:656
+#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
 
-#: src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:667
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:708
+#: src/fs/fs_unindex.c:706
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
@@ -3423,22 +3414,22 @@
 msgid "Failed to save state to file %s\n"
 msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n"
 
-#: src/fs/gnunet-auto-share.c:415
+#: src/fs/gnunet-auto-share.c:413
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publicación de «%s» finalizada\n"
 
-#: src/fs/gnunet-auto-share.c:504
+#: src/fs/gnunet-auto-share.c:500
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publicando «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:514
+#: src/fs/gnunet-auto-share.c:510
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:725
+#: src/fs/gnunet-auto-share.c:719
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
@@ -3446,32 +3437,32 @@
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:901
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:908
+#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:788 src/fs/gnunet-publish.c:932
+#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:791 src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/fs/gnunet-auto-share.c:815
+#: src/fs/gnunet-auto-share.c:809
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:656
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
@@ -3536,7 +3527,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:297
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3546,7 +3537,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
@@ -3559,7 +3550,7 @@
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:872
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3609,127 +3600,127 @@
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:191
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:194
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 "especifica el nombre de un fichero con las máquinas (HOSTS) que la batería "
 "de pruebas debería usar"
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:197
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:206
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-publish.c:221 src/fs/gnunet-publish.c:233
+#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
 
-#: src/fs/gnunet-publish.c:241
+#: src/fs/gnunet-publish.c:239
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error publicando: %s.\n"
 
-#: src/fs/gnunet-publish.c:248
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publicación «%s» finalizada.\n"
 
-#: src/fs/gnunet-publish.c:253
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:261
+#: src/fs/gnunet-publish.c:259
 #, fuzzy, c-format
 msgid "Namespace URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:277
+#: src/fs/gnunet-publish.c:275
 #, fuzzy
 msgid "Starting cleanup after abort\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:284
+#: src/fs/gnunet-publish.c:282
 #, fuzzy
 msgid "Cleanup after abort completed.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:290
+#: src/fs/gnunet-publish.c:288
 #, fuzzy
 msgid "Cleanup after abort failed.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:432
+#: src/fs/gnunet-publish.c:430
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Metadatos para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:437
+#: src/fs/gnunet-publish.c:435
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-publish.c:589
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:616
+#: src/fs/gnunet-publish.c:614
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-publish.c:648
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:654
+#: src/fs/gnunet-publish.c:652
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:660
+#: src/fs/gnunet-publish.c:658
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:667
+#: src/fs/gnunet-publish.c:665
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:670
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:677
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:688
+#: src/fs/gnunet-publish.c:686
 msgid "Internal error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:716
+#: src/fs/gnunet-publish.c:714
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Espacio de nombres «%s» desconocido.\n"
 
-#: src/fs/gnunet-publish.c:749
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:763
+#: src/fs/gnunet-publish.c:761
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -3737,34 +3728,33 @@
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:817
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:832
+#: src/fs/gnunet-publish.c:830
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:840 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:851 src/fs/gnunet-publish.c:859
-#: src/transport/gnunet-transport.c:1928 src/transport/gnunet-transport.c:1958
-#: src/transport/gnunet-transport.c:1989
+#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
+#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:912
+#: src/fs/gnunet-publish.c:910
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3772,7 +3762,7 @@
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:914
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3780,11 +3770,11 @@
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:918
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:921
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3792,7 +3782,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:928
+#: src/fs/gnunet-publish.c:926
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3800,13 +3790,13 @@
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-publish.c:934
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:940
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3814,7 +3804,7 @@
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:946
+#: src/fs/gnunet-publish.c:944
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
@@ -3821,7 +3811,7 @@
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:950
+#: src/fs/gnunet-publish.c:948
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3829,7 +3819,7 @@
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:966
+#: src/fs/gnunet-publish.c:964
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3869,15 +3859,15 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
-#: src/fs/gnunet-service-fs.c:274
+#: src/fs/gnunet-service-fs.c:272
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:595
+#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:719
+#: src/fs/gnunet-service-fs.c:729
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
@@ -3884,134 +3874,132 @@
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:745 src/hostlist/gnunet-daemon-hostlist.c:311
-#: src/sensordashboard/gnunet-service-sensordashboard.c:864
-#: src/sensordashboard/gnunet-service-sensordashboard.c:872
-#: src/topology/gnunet-daemon-topology.c:1287
-#: src/topology/gnunet-daemon-topology.c:1294
+#: src/fs/gnunet-service-fs.c:755 src/hostlist/gnunet-daemon-hostlist.c:309
+#: src/topology/gnunet-daemon-topology.c:1250
+#: src/topology/gnunet-daemon-topology.c:1258
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:494
+#: src/fs/gnunet-service-fs_cadet_client.c:490
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:508
+#: src/fs/gnunet-service-fs_cadet_client.c:504
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:260
+#: src/fs/gnunet-service-fs_cadet_server.c:258
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# Bloques transferidos vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:361
+#: src/fs/gnunet-service-fs_cadet_server.c:359
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:441
+#: src/fs/gnunet-service-fs_cadet_server.c:439
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:485
+#: src/fs/gnunet-service-fs_cadet_server.c:483
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:491
-#: src/fs/gnunet-service-fs_cadet_server.c:531
+#: src/fs/gnunet-service-fs_cadet_server.c:489
+#: src/fs/gnunet-service-fs_cadet_server.c:529
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:736
+#: src/fs/gnunet-service-fs_cp.c:738
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:740
+#: src/fs/gnunet-service-fs_cp.c:742
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:778
+#: src/fs/gnunet-service-fs_cp.c:780
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:786
+#: src/fs/gnunet-service-fs_cp.c:788
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:812 src/fs/gnunet-service-fs_cp.c:1406
+#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:917
+#: src/fs/gnunet-service-fs_cp.c:921
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:973
+#: src/fs/gnunet-service-fs_cp.c:977
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:981
+#: src/fs/gnunet-service-fs_cp.c:985
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:995
+#: src/fs/gnunet-service-fs_cp.c:999
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:1047
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1111
+#: src/fs/gnunet-service-fs_cp.c:1118
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1136
+#: src/fs/gnunet-service-fs_cp.c:1143
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1146
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1251
+msgid "# requests dropped due to higher-TTL request"
+msgstr "# peticiones omitidas debido a una petición de mayor TTL"
+
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1258
+#: src/fs/gnunet-service-fs_cp.c:1340
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1279
+#: src/fs/gnunet-service-fs_cp.c:1361
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: src/fs/gnunet-service-fs_cp.c:1372
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:1427
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1367
-msgid "# requests dropped due to higher-TTL request"
-msgstr "# peticiones omitidas debido a una petición de mayor TTL"
-
-#: src/fs/gnunet-service-fs_cp.c:1404
+#: src/fs/gnunet-service-fs_cp.c:1471
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1843
+#: src/fs/gnunet-service-fs_cp.c:1916
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -4066,165 +4054,165 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_lc.c:201 src/fs/gnunet-service-fs_lc.c:376
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
-#: src/fs/gnunet-service-fs_lc.c:259
+#: src/fs/gnunet-service-fs_lc.c:261
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs_lc.c:330
+#: src/fs/gnunet-service-fs_lc.c:332
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs_lc.c:370
+#: src/fs/gnunet-service-fs_lc.c:372
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:273
 msgid "# average retransmission delay (ms)"
 msgstr "# retardo de retransmisión medio (ms)"
 
-#: src/fs/gnunet-service-fs_pe.c:400
+#: src/fs/gnunet-service-fs_pe.c:412
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "# transmisión fallida (el servicio principal no tiene ancho de banda)"
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/fs/gnunet-service-fs_pe.c:447
 msgid "# query messages sent to other peers"
 msgstr "# mensajes de búsqueda enviados a otros pares"
 
 # ???
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:501
 #, fuzzy
 msgid "# delay heap timeout (ms)"
 msgstr "# plazo del retraso del montículo"
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:511
 msgid "# query plans executed"
 msgstr "# planes de búsqueda ejecutados"
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:593
 msgid "# requests merged"
 msgstr "# peticiones unidas"
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:603
 msgid "# requests refreshed"
 msgstr "# peticiones refrescadas"
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:848
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:315
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:820
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:857
+#: src/fs/gnunet-service-fs_pr.c:889
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:866
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:881
+#: src/fs/gnunet-service-fs_pr.c:913
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:898
+#: src/fs/gnunet-service-fs_pr.c:930
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1028
+#: src/fs/gnunet-service-fs_pr.c:1060
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1056
+#: src/fs/gnunet-service-fs_pr.c:1088
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1094
+#: src/fs/gnunet-service-fs_pr.c:1126
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1258
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1279
+#: src/fs/gnunet-service-fs_pr.c:1310
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1301
+#: src/fs/gnunet-service-fs_pr.c:1331
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1353
+#: src/fs/gnunet-service-fs_pr.c:1383
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1368
+#: src/fs/gnunet-service-fs_pr.c:1398
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1407
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1392
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1436
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1419
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1454
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1451 src/fs/gnunet-service-fs_pr.c:1491
-#: src/fs/gnunet-service-fs_pr.c:1660
+#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1690
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1636
+#: src/fs/gnunet-service-fs_pr.c:1666
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1725
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:678
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
@@ -4255,7 +4243,7 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/gns/gns_api.c:393
+#: src/gns/gns_api.c:392
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4267,78 +4255,78 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:759
+#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/gns/gnunet-bcd.c:360
+#: src/gns/gnunet-bcd.c:362
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/gns/gnunet-bcd.c:374
+#: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:520
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:532
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:234
+#: src/gns/gnunet-dns2gns.c:232
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:406
+#: src/gns/gnunet-dns2gns.c:402
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:422
+#: src/gns/gnunet-dns2gns.c:418
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:430
+#: src/gns/gnunet-dns2gns.c:426
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:708
+#: src/gns/gnunet-dns2gns.c:704
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:734
+#: src/gns/gnunet-dns2gns.c:730
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:756
+#: src/gns/gnunet-dns2gns.c:752
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:777
+#: src/gns/gnunet-dns2gns.c:773
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:780
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:783
+#: src/gns/gnunet-dns2gns.c:779
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:786
+#: src/gns/gnunet-dns2gns.c:782
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
@@ -4345,31 +4333,31 @@
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:789
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:798
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:215 src/gns/plugin_rest_gns.c:334
+#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:231
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:314
+#: src/gns/gnunet-gns.c:312
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
-#: src/gns/plugin_rest_gns.c:459
+#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:460
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4376,49 +4364,49 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:405
+#: src/gns/gnunet-gns.c:403
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:453
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:456
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:459
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:462
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:467
+#: src/gns/gnunet-gns.c:465
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:470
+#: src/gns/gnunet-gns.c:468
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:482
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
+#: src/gns/gnunet-gns-helper-service-w32.c:766
 #, c-format
 msgid ""
 "Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
@@ -4426,12 +4414,12 @@
 "sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:838
+#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:485
+#: src/gns/gnunet-gns-import.c:483
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
@@ -4439,13 +4427,13 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:529
 #: src/hostlist/gnunet-daemon-hostlist_client.c:746
 #: src/hostlist/gnunet-daemon-hostlist_client.c:752
-#: src/hostlist/gnunet-daemon-hostlist_client.c:805
-#: src/hostlist/gnunet-daemon-hostlist_client.c:814
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1036
-#: src/transport/plugin_transport_http_client.c:599
-#: src/transport/plugin_transport_http_client.c:617
+#: src/hostlist/gnunet-daemon-hostlist_client.c:804
+#: src/hostlist/gnunet-daemon-hostlist_client.c:813
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1030
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1035
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -4490,87 +4478,87 @@
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1634
+#: src/gns/gnunet-gns-proxy.c:1631
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2006
+#: src/gns/gnunet-gns-proxy.c:1997
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2036
+#: src/gns/gnunet-gns-proxy.c:2027
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2210
+#: src/gns/gnunet-gns-proxy.c:2199
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2229 src/rest/gnunet-rest-server.c:548
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551
+#: src/gns/gnunet-gns-proxy.c:2538
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2567
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/gns/gnunet-gns-proxy.c:2627
+#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2678
+#: src/gns/gnunet-gns-proxy.c:2665
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3017
+#: src/gns/gnunet-gns-proxy.c:3003
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3057 src/gns/gnunet-service-gns.c:894
+#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
 #, fuzzy, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/gns/gnunet-gns-proxy.c:3119
+#: src/gns/gnunet-gns-proxy.c:3105
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3160
+#: src/gns/gnunet-gns-proxy.c:3146
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3163
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3182
+#: src/gns/gnunet-gns-proxy.c:3168
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:935
+#: src/gns/gnunet-service-gns.c:928
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:943
+#: src/gns/gnunet-service-gns.c:936
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:976
+#: src/gns/gnunet-service-gns.c:969
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4584,46 +4572,46 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:650
+#: src/gns/gnunet-service-gns_resolver.c:648
 #, fuzzy, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:661
+#: src/gns/gnunet-service-gns_resolver.c:659
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:854
+#: src/gns/gnunet-service-gns_resolver.c:851
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:996
+#: src/gns/gnunet-service-gns_resolver.c:993
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1356
+#: src/gns/gnunet-service-gns_resolver.c:1353
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1891
+#: src/gns/gnunet-service-gns_resolver.c:1888
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/gns/gnunet-service-gns_resolver.c:1912
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2197
+#: src/gns/gnunet-service-gns_resolver.c:2194
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2346
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4655,11 +4643,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_rest_gns.c:422
+#: src/gns/plugin_rest_gns.c:423
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:696
+#: src/gns/plugin_rest_gns.c:697
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -4776,9 +4764,9 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:218
+#: src/hello/gnunet-hello.c:219
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
 #: src/hello/hello.c:1139
@@ -4819,7 +4807,7 @@
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:274
+#: src/hostlist/gnunet-daemon-hostlist.c:272
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4827,11 +4815,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:331
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:336
+#: src/hostlist/gnunet-daemon-hostlist.c:334
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4839,16 +4827,16 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:337
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:343
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:359
+#: src/hostlist/gnunet-daemon-hostlist.c:357
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -4872,7 +4860,7 @@
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -4890,68 +4878,68 @@
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:867
+#: src/hostlist/gnunet-daemon-hostlist_client.c:866
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:881
+#: src/hostlist/gnunet-daemon-hostlist_client.c:880
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:901
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:907
+#: src/hostlist/gnunet-daemon-hostlist_client.c:906
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/hostlist/gnunet-daemon-hostlist_client.c:914
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:968
+#: src/hostlist/gnunet-daemon-hostlist_client.c:967
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:976
+#: src/hostlist/gnunet-daemon-hostlist_client.c:975
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1108
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1660
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1117
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1177
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
@@ -4958,16 +4946,16 @@
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
@@ -4974,36 +4962,36 @@
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
-#: src/transport/plugin_transport_http_client.c:2287
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
+#: src/transport/plugin_transport_http_client.c:2282
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -5021,9 +5009,9 @@
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:243
 #: src/hostlist/gnunet-daemon-hostlist_server.c:590
-#: src/peerinfo-tool/gnunet-peerinfo.c:391
-#: src/peerinfo-tool/gnunet-peerinfo.c:540
-#: src/topology/gnunet-daemon-topology.c:952
+#: src/peerinfo-tool/gnunet-peerinfo.c:389
+#: src/peerinfo-tool/gnunet-peerinfo.c:538
+#: src/topology/gnunet-daemon-topology.c:870
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -5083,75 +5071,75 @@
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:747
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
-#: src/transport/gnunet-service-transport.c:860
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/peerinfo-tool/gnunet-peerinfo.c:741
+#: src/transport/gnunet-service-transport.c:857
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:771
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:786
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:799
+#: src/hostlist/gnunet-daemon-hostlist_server.c:798
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:812
+#: src/hostlist/gnunet-daemon-hostlist_server.c:811
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:833
+#: src/hostlist/gnunet-daemon-hostlist_server.c:832
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:853
+#: src/hostlist/gnunet-daemon-hostlist_server.c:852
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:893
+#: src/hostlist/gnunet-daemon-hostlist_server.c:892
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:163
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:182
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:325
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:328
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:331
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:334
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
@@ -5158,83 +5146,83 @@
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:337
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
 
-#: src/identity/gnunet-identity.c:342
+#: src/identity/gnunet-identity.c:340
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:349
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:361
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:438
+#: src/identity/gnunet-service-identity.c:669
+#: src/identity/gnunet-service-identity.c:777
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:445
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:515
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:646
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:685
+#: src/identity/gnunet-service-identity.c:794
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:828
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:901
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:913
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/identity/plugin_rest_identity.c:925
+#: src/identity/plugin_rest_identity.c:923
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/identity-token/gnunet-identity-token.c:101
+#: src/identity-provider/gnunet-identity-token.c:101
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-token/gnunet-identity-token.c:104
+#: src/identity-provider/gnunet-identity-token.c:104
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-token/plugin_rest_identity_token.c:1067
+#: src/identity-provider/plugin_rest_identity_provider.c:1089
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5249,41 +5237,41 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:107
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:183
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "Se debe especificar un apodo\n"
 
-#: src/namecache/gnunet-namecache.c:195
+#: src/namecache/gnunet-namecache.c:193
 #, fuzzy, c-format
 msgid "Invalid public key for zone `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:201
 #, fuzzy, c-format
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:235
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
+#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5293,173 +5281,181 @@
 msgstr "El almacén de nombres no pudo añadir el registro"
 
 #: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:236
-#: src/namestore/plugin_namestore_flat.c:183
-#: src/namestore/plugin_namestore_flat.c:342
+#: src/namecache/plugin_namecache_flat.c:244
+#: src/namestore/plugin_namestore_flat.c:179
+#: src/namestore/plugin_namestore_flat.c:351
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
 #: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:194
+#: src/namestore/plugin_namestore_flat.c:190
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:142
-#: src/namestore/plugin_namestore_flat.c:206
+#: src/namecache/plugin_namecache_flat.c:145
+#: src/namestore/plugin_namestore_flat.c:202
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:391
+#: src/namecache/plugin_namecache_flat.c:399
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
+#: src/namecache/plugin_namecache_postgres.c:90
+#: src/namestore/plugin_namestore_postgres.c:97
 msgid "Failed to create indices\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:301
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:332
-#: src/namestore/plugin_rest_namestore.c:517
+#: src/namestore/gnunet-namestore.c:330
+#: src/namestore/plugin_rest_namestore.c:532
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:339
-#: src/namestore/plugin_rest_namestore.c:526
+#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/plugin_rest_namestore.c:541
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
-#: src/namestore/gnunet-namestore.c:493
+#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:491
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
+#: src/namestore/gnunet-namestore.c:529
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:628
-#: src/namestore/plugin_rest_namestore.c:550
+#: src/namestore/gnunet-namestore.c:626
+#: src/namestore/plugin_rest_namestore.c:565
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:667
+#: src/namestore/gnunet-namestore.c:665
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:945
+#: src/transport/gnunet-transport.c:1786
+#: src/transport/gnunet-transport-profiler.c:504
 #, c-format
+msgid "Service `%s' is not running\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/namestore/gnunet-namestore.c:706
+#, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:719
-#: src/namestore/gnunet-namestore-fcfsd.c:984
-#: src/namestore/plugin_rest_namestore.c:859
+#: src/namestore/gnunet-namestore.c:717
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/plugin_rest_namestore.c:954
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
-#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
-#: src/namestore/gnunet-namestore.c:815
+#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
+#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
+#: src/namestore/gnunet-namestore.c:813
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
-#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
+#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:745
-#: src/namestore/plugin_rest_namestore.c:620
+#: src/namestore/gnunet-namestore.c:743
+#: src/namestore/plugin_rest_namestore.c:635
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:765
-#: src/namestore/plugin_rest_namestore.c:638
-#: src/namestore/plugin_rest_namestore.c:678
+#: src/namestore/gnunet-namestore.c:763
+#: src/namestore/plugin_rest_namestore.c:653
+#: src/namestore/plugin_rest_namestore.c:693
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:801
+#: src/namestore/gnunet-namestore.c:799
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:816
+#: src/namestore/gnunet-namestore.c:814
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:844
+#: src/namestore/gnunet-namestore.c:842
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:868 src/peerinfo-tool/gnunet-peerinfo.c:826
+#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:903
+#: src/namestore/gnunet-namestore.c:901
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:943
-#: src/namestore/plugin_rest_namestore.c:889
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:984
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:970
-#: src/namestore/plugin_rest_namestore.c:916
+#: src/namestore/gnunet-namestore.c:968
+#: src/namestore/plugin_rest_namestore.c:1011
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1006
-#: src/namestore/plugin_rest_namestore.c:956
+#: src/namestore/gnunet-namestore.c:1004
+#: src/namestore/plugin_rest_namestore.c:1051
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore.c:1018
-#: src/namestore/plugin_rest_namestore.c:999
+#: src/namestore/gnunet-namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1092
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1066
+#: src/namestore/gnunet-namestore.c:1064
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1067
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1072
+#: src/namestore/gnunet-namestore.c:1070
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1075
+#: src/namestore/gnunet-namestore.c:1073
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
@@ -5466,110 +5462,110 @@
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1078
+#: src/namestore/gnunet-namestore.c:1076
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1081
+#: src/namestore/gnunet-namestore.c:1079
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:1087
+#: src/namestore/gnunet-namestore.c:1085
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1090
+#: src/namestore/gnunet-namestore.c:1088
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1093
+#: src/namestore/gnunet-namestore.c:1091
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1096
+#: src/namestore/gnunet-namestore.c:1094
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1099
+#: src/namestore/gnunet-namestore.c:1097
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1102
+#: src/namestore/gnunet-namestore.c:1100
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1103
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
 # form??
-#: src/namestore/gnunet-namestore-fcfsd.c:478
+#: src/namestore/gnunet-namestore-fcfsd.c:476
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:505
+#: src/namestore/gnunet-namestore-fcfsd.c:503
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:539
+#: src/namestore/gnunet-namestore-fcfsd.c:537
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:548
+#: src/namestore/gnunet-namestore-fcfsd.c:546
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:610
+#: src/namestore/gnunet-namestore-fcfsd.c:608
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:666
+#: src/namestore/gnunet-namestore-fcfsd.c:664
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:682
+#: src/namestore/gnunet-namestore-fcfsd.c:680
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-namestore-fcfsd.c:716
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:726
+#: src/namestore/gnunet-namestore-fcfsd.c:724
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:924
+#: src/namestore/gnunet-namestore-fcfsd.c:918
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:950
+#: src/namestore/gnunet-namestore-fcfsd.c:944
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore-fcfsd.c:986
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1025
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
 #, fuzzy
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-service-namestore.c:656
+#: src/namestore/gnunet-service-namestore.c:655
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
@@ -5579,12 +5575,12 @@
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/plugin_namestore_flat.c:628
+#: src/namestore/plugin_namestore_flat.c:632
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:1083
+#: src/namestore/plugin_rest_namestore.c:1176
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5605,92 +5601,92 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:392
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:394
+#: src/nat/nat_auto.c:393
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:415
+#: src/nat/nat_auto.c:412
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:447
+#: src/nat/nat_auto.c:444
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:579
+#: src/nat/nat_auto.c:576
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
-#: src/nat/nat_auto.c:597
+#: src/nat/nat_auto.c:594
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:669 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
-#: src/nat/nat_auto.c:719
+#: src/nat/nat_auto.c:716
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:720
+#: src/nat/nat_auto.c:717
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:752
+#: src/nat/nat_auto.c:749
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:760 src/nat/nat_auto.c:808
+#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:768 src/nat/nat_auto.c:816
+#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat_auto.c:801
+#: src/nat/nat_auto.c:798
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1026
+#: src/nat/nat.c:1024
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
 
-#: src/nat/nat.c:1076
+#: src/nat/nat.c:1074
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1327
+#: src/nat/nat.c:1325
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
+#: src/nat/nat.c:1400
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/nat/nat.c:1546
+#: src/nat/nat.c:1544
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1600
+#: src/nat/nat.c:1598
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP \n"
 msgstr ""
 
-#: src/nat/nat.c:1739 src/nat/nat.c:1752
+#: src/nat/nat.c:1727 src/nat/nat.c:1740
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5699,111 +5695,111 @@
 "La configuración requiere «%s», pero el binario no está instalado de forma "
 "correcta (SUID bit no activado).  Opción deshabilitada.\n"
 
-#: src/nat/nat.c:1907
+#: src/nat/nat.c:1895
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 "Direcciones internas IP no conocidas, no se puede usar el método del "
 "recorrido NAT ICMP\n"
 
-#: src/nat/nat.c:1923
+#: src/nat/nat.c:1911
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2002
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2004
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2006
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2008
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2010
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2012
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2014
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2016
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2018
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2022
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2026
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2028
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2030
 #, fuzzy
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat.c:2040
+#: src/nat/nat.c:2032
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2042
+#: src/nat/nat.c:2034
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2044
+#: src/nat/nat.c:2036
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2046
+#: src/nat/nat.c:2038
 #, fuzzy
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat_mini.c:203
+#: src/nat/nat_mini.c:201
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat_mini.c:609
+#: src/nat/nat_mini.c:605
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:462
+#: src/nat/nat_test.c:460
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
@@ -5810,52 +5806,52 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/nat_test.c:497
+#: src/nat/nat_test.c:495
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/nse/gnunet-nse.c:117
+#: src/nse/gnunet-nse.c:116
 #, fuzzy
 msgid "NSE service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/nse/gnunet-nse.c:122
+#: src/nse/gnunet-nse.c:121
 msgid "Error while checking if NSE service is running or not\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
+#: src/nse/gnunet-nse.c:167
 #, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:861
+#: src/nse/gnunet-nse-profiler.c:860
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: src/nse/gnunet-nse-profiler.c:869
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/nse/gnunet-nse-profiler.c:876
+#: src/nse/gnunet-nse-profiler.c:875
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1541
-#: src/revocation/gnunet-service-revocation.c:848 src/util/gnunet-scrypt.c:260
+#: src/nse/gnunet-service-nse.c:1533
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5897,17 +5893,17 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Aún no se han encontrado pares en «%s»!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1053
+#: src/peerinfo/gnunet-service-peerinfo.c:1056
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1374
+#: src/peerinfo/gnunet-service-peerinfo.c:1375
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1387
+#: src/peerinfo/gnunet-service-peerinfo.c:1388
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5915,7 +5911,7 @@
 msgid "aborted due to explicit disconnect request"
 msgstr "abortado debido a petición de desconexión explícita"
 
-#: src/peerinfo/peerinfo_api.c:363
+#: src/peerinfo/peerinfo_api.c:361
 msgid "failed to transmit request (service down?)"
 msgstr ""
 "se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
@@ -5922,112 +5918,112 @@
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:518
+#: src/peerinfo/peerinfo_api.c:516
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:562 src/peerinfo/peerinfo_api.c:585
-#: src/peerinfo/peerinfo_api.c:602 src/peerinfo/peerinfo_api.c:615
-#: src/peerinfo/peerinfo_api.c:630
+#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
+#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
+#: src/peerinfo/peerinfo_api.c:628
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:719
+#: src/peerinfo/peerinfo_api.c:715
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 "Petición de transmisión de iteración de expiración al servicio de "
 "información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo/peerinfo_api_notify.c:267
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:245
+#: src/peerinfo-tool/gnunet-peerinfo.c:243
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:250
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:305
+#: src/peerinfo-tool/gnunet-peerinfo.c:303
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:472
+#: src/peerinfo-tool/gnunet-peerinfo.c:470
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:486
+#: src/peerinfo-tool/gnunet-peerinfo.c:484
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:505
+#: src/peerinfo-tool/gnunet-peerinfo.c:503
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:575
+#: src/peerinfo-tool/gnunet-peerinfo.c:573
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:704
+#: src/peerinfo-tool/gnunet-peerinfo.c:700
 #, fuzzy, c-format
 msgid "Failed to get my own HELLO from this peer!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:736
+#: src/peerinfo-tool/gnunet-peerinfo.c:732
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:850
+#: src/peerinfo-tool/gnunet-peerinfo.c:844
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:909
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:912
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:926
+#: src/peerinfo-tool/gnunet-peerinfo.c:920
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -6093,37 +6089,37 @@
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/peerstore/peerstore_api.c:329 src/sensor/sensor_api.c:179
+#: src/peerstore/peerstore_api.c:329
 #, c-format
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:375
+#: src/peerstore/peerstore_api.c:374
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:678
+#: src/peerstore/peerstore_api.c:677
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
 # Miguel: ¿Conectar y conexión?
-#: src/peerstore/peerstore_api.c:689
+#: src/peerstore/peerstore_api.c:688
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/peerstore/peerstore_api.c:708
+#: src/peerstore/peerstore_api.c:707
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:820
+#: src/peerstore/peerstore_api.c:819
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:832
+#: src/peerstore/peerstore_api.c:831
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6148,47 +6144,47 @@
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/postgres/postgres.c:59
+#: src/postgres/postgres.c:63
 #, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "«%s:%s» falló en %s:%d con error: %s"
 
-#: src/postgres/postgres.c:148
+#: src/postgres/postgres.c:166
 #, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "No se pudo inicializar Postgres: %s"
 
-#: src/psycstore/gnunet-service-psycstore.c:261
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:285
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:307
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:365
+#: src/psycstore/gnunet-service-psycstore.c:364
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:423
+#: src/psycstore/gnunet-service-psycstore.c:422
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:454
+#: src/psycstore/gnunet-service-psycstore.c:453
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:482
+#: src/psycstore/gnunet-service-psycstore.c:481
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
@@ -6269,45 +6265,45 @@
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:824
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:888
+#: src/pt/gnunet-daemon-pt.c:886
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:894
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:967
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:983
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
+#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
+#: src/pt/gnunet-daemon-pt.c:1306
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1343
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/regex/gnunet-regex-simulation-profiler.c:656
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -6319,17 +6315,17 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-profiler.c:1284
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1299
+#: src/regex/gnunet-regex-profiler.c:1295
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1324
+#: src/regex/gnunet-regex-simulation-profiler.c:619
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
@@ -6336,30 +6332,30 @@
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1330
+#: src/regex/gnunet-regex-simulation-profiler.c:626
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1337
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1346
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
@@ -6366,34 +6362,34 @@
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1457
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1460
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1463
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:686
 msgid "name of the table to write DFAs"
 msgstr "nombre de la tabla para escribir los DFA"
 
 # WTF???
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:689
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:702
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
@@ -6402,17 +6398,17 @@
 msgid "Regex `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:806
+#: src/rest/gnunet-rest-server.c:792
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/rest/gnunet-rest-server.c:823
+#: src/rest/gnunet-rest-server.c:809
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/revocation/gnunet-revocation.c:124
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
@@ -6419,102 +6415,102 @@
 
 # Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
 # Esto también es aplicable a las siguientes traducciones.
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "El servicio «%s» se ha parado.\n"
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:135
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Error interno."
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:161
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:166
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:171
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:176
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:181
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:292
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:322
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:343
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:363
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:373
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:405
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/revocation/gnunet-revocation.c:421
+#: src/revocation/gnunet-revocation.c:419
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:439
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:461
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:486
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:502
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
+#: src/revocation/gnunet-revocation.c:505
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:508
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:511
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6543,30 +6539,30 @@
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/revocation/gnunet-service-revocation.c:547
-#: src/revocation/gnunet-service-revocation.c:780
+#: src/revocation/gnunet-service-revocation.c:545
+#: src/revocation/gnunet-service-revocation.c:776
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:872
+#: src/revocation/gnunet-service-revocation.c:868
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps.c:67
-msgid "rps"
+#: src/rps/gnunet-rps.c:185
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:221
+#: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
+#: src/scalarproduct/gnunet-scalarproduct.c:227
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:241
+#: src/scalarproduct/gnunet-scalarproduct.c:240
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
@@ -6573,48 +6569,48 @@
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:259
+#: src/scalarproduct/gnunet-scalarproduct.c:258
 msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:281
+#: src/scalarproduct/gnunet-scalarproduct.c:280
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:299
+#: src/scalarproduct/gnunet-scalarproduct.c:298
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:326
+#: src/scalarproduct/gnunet-scalarproduct.c:325
 #, c-format
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:350
+#: src/scalarproduct/gnunet-scalarproduct.c:349
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:353
+#: src/scalarproduct/gnunet-scalarproduct.c:352
 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:356
+#: src/scalarproduct/gnunet-scalarproduct.c:355
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:365
+#: src/scalarproduct/gnunet-scalarproduct.c:364
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1419
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1549
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1193
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1252
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6623,276 +6619,22 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:611
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:617
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
 msgid "also profile decryption"
 msgstr ""
 
-#: src/sensordashboard/gnunet-service-sensordashboard.c:353
-#, fuzzy, c-format
-msgid "Error trying to send a message to peer `%s'.\n"
-msgstr ""
-"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
-"«%s»\n"
-
-#: src/sensor/gnunet-sensor.c:162
-#, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/sensor/gnunet-sensor.c:165
-#, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/sensor/gnunet-sensor.c:168
-msgid "Force an anomaly on a sensor, use only for testing"
-msgstr ""
-
-#: src/sensor/gnunet-sensor.c:175
-msgid "sensor"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:729
-msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:736
-#, fuzzy
-msgid "Missing or invalid topology file.\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/sensor/gnunet-sensor-profiler.c:782
-#, fuzzy
-msgid "Number of peers to run"
-msgstr "número de pares para empezar"
-
-#: src/sensor/gnunet-sensor-profiler.c:784
-msgid "Path to topology file"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:787
-msgid "Change the interval of running sensors to given value"
-msgstr ""
-
-#: src/sensor/gnunet-sensor-profiler.c:790
-#, fuzzy
-msgid "Number of peers to simulate anomalies on"
-msgstr "número de pares para empezar"
-
-#: src/sensor/gnunet-sensor-profiler.c:797
-#, fuzzy
-msgid "Profiler for sensor service"
-msgstr "Perfilador para expresiones regulares."
-
-#: src/sensor/gnunet-service-sensor_analysis.c:204
-#, fuzzy
-msgid "Received an invalid sensor value."
-msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:295
-#, fuzzy
-msgid "Analysis model not defined in configuration.\n"
-msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:304
-#, fuzzy, c-format
-msgid "Could not load analysis model `%s'.\n"
-msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
-
-#: src/sensor/gnunet-service-sensor_analysis.c:312
-#, fuzzy
-msgid "Could not connect to peerstore service.\n"
-msgstr "No se pudo conectar al servicio %s.\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:233
-#, fuzzy
-msgid "Unknown value type expected by sensor, this should not happen.\n"
-msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:268
-#, fuzzy, c-format
-msgid "Received an invalid value for sensor `%s': %s\n"
-msgstr ""
-"La configuración especifica un valor no válido en la opción «%s» de la "
-"sección «%s»: %s\n"
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:347
-#, c-format
-msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:370
-#, c-format
-msgid ""
-"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_monitoring.c:418
-#, c-format
-msgid "Sensor `%s' execution task already set, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:828
-#, fuzzy
-msgid "Double creation of proof-of-work, this should not happen.\n"
-msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:834
-#, fuzzy
-msgid "Failed to create pow and signature block.\n"
-msgstr "Se produjo un fallo al crear una nueva firma"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1046
-#, c-format
-msgid "PEERSTORE error: %s.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1151
-#: src/sensor/gnunet-service-sensor_reporting.c:1409
-#, fuzzy
-msgid "Failed to connect to CORE service.\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1158
-msgid "Peer identity received from CORE init doesn't match ours.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1398
-#, fuzzy
-msgid "Failed to connect to peerstore service.\n"
-msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1419
-#: src/sensor/gnunet-service-sensor_update.c:781
-#, fuzzy
-msgid "Failed to connect to CADET service.\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
-#: src/sensor/gnunet-service-sensor_reporting.c:1426
-#, fuzzy
-msgid "Failed to load my private key.\n"
-msgstr "Se produjo un fallo al cargar el estado: %s\n"
-
-#: src/sensor/gnunet-service-sensor_update.c:327
-#, c-format
-msgid "Error trying to send a message to update point `%s'.\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor_update.c:418
-#, fuzzy, c-format
-msgid "Failed to connect to update point `%s'.\n"
-msgstr "Se produjo un fallo al conectar con «%s»\n"
-
-#: src/sensor/plugin_sensor_model_gaussian.c:203
-msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/plugin_sensor_model_gaussian.c:221
-msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/plugin_sensor_model_gaussian.c:229
-msgid "Missing `WEIGHT_INC' value in configuration.\n"
-msgstr ""
-
-#: src/sensor/sensor_api.c:296
-#, fuzzy
-msgid "Iterate request canceled due to disconnection.\n"
-msgstr "# pares desconectados debido a desconexión global"
-
-#: src/sensor/sensor_api.c:307
-msgid "Force anomaly request canceled due to disconnection.\n"
-msgstr ""
-
-#: src/sensor/sensor_api.c:374
-#, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr ""
-"Petición de transmisión de iteración de expiración al servicio de "
-"información de pares (PEERINFO)."
-
-#: src/sensor/sensor_util_lib.c:107
-#, fuzzy
-msgid "Error reading sensor version\n"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/sensor/sensor_util_lib.c:116
-msgid "Invalid sensor version number, format should be major.minor\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:131
-#, fuzzy
-msgid "Error reading sensor category\n"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/sensor/sensor_util_lib.c:164
-#, fuzzy
-msgid "Error reading sensor run interval\n"
-msgstr "Error creando el túnel\n"
-
-#: src/sensor/sensor_util_lib.c:191
-#, fuzzy
-msgid "Error reading sensor source\n"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/sensor/sensor_util_lib.c:206
-msgid "Error reading sensor gnunet-statistics source information\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:218
-#, fuzzy
-msgid "Error reading sensor process name\n"
-msgstr "Error leyendo de «%s»: %s\n"
-
-#: src/sensor/sensor_util_lib.c:233
-msgid "Error reading sensor expected datatype\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:241
-msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:299
-#, fuzzy, c-format
-msgid "Failed to access sensor file: %s\n"
-msgstr "Se produjo un fallo al acceder «%s»: %s\n"
-
-#: src/sensor/sensor_util_lib.c:308
-#, fuzzy, c-format
-msgid "Failed to load sensor definition: %s\n"
-msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
-
-#: src/sensor/sensor_util_lib.c:370
-#, c-format
-msgid "Sensor `%s' already exists with same or newer version\n"
-msgstr ""
-
-#: src/sensor/sensor_util_lib.c:387
-#, fuzzy, c-format
-msgid "Error adding new sensor `%s' to global hashmap.\n"
-msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
-
-#: src/sensor/sensor_util_lib.c:412
-#, fuzzy, c-format
-msgid "Error loading sensor from file: %s\n"
-msgstr ""
-"\n"
-"Error subiendo el fichero %s\n"
-
 #: src/set/gnunet-service-set.c:2015
 #, fuzzy
 msgid "Could not connect to cadet service\n"
@@ -6921,15 +6663,10 @@
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/set/gnunet-set-profiler.c:365
+#: src/set/gnunet-set-profiler.c:383
 msgid "operation to execute"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:368
-#, fuzzy
-msgid "dump statistics to stdout after completion"
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
-
 #: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6950,25 +6687,25 @@
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:198
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:204
+#: src/statistics/gnunet-statistics.c:201
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:235
+#: src/statistics/gnunet-statistics.c:232
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:243
+#: src/statistics/gnunet-statistics.c:240
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:266
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
@@ -6975,58 +6712,58 @@
 "Intentando conectar con máquina remota, pero el servicio «%s» no se está "
 "ejecutando\n"
 
-#: src/statistics/gnunet-statistics.c:282
+#: src/statistics/gnunet-statistics.c:279
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:290
+#: src/statistics/gnunet-statistics.c:287
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:323
+#: src/statistics/gnunet-statistics.c:320
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:346
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:349
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:355
+#: src/statistics/gnunet-statistics.c:352
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:358
+#: src/statistics/gnunet-statistics.c:355
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:358
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:361
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:367
+#: src/statistics/gnunet-statistics.c:364
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:379
+#: src/statistics/gnunet-statistics.c:376
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:515
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/statistics/statistics_api.c:1088
+#: src/statistics/statistics_api.c:1082
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -7079,7 +6816,7 @@
 msgstr "Argumento no válido para '%s' en %s:%d.\n"
 
 #: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/gnunet-testbed-profiler.c:291
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
@@ -7107,11 +6844,11 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:323
+#: src/testbed/gnunet-daemon-latency-logger.c:322
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
@@ -7123,28 +6860,28 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:476
+#: src/testbed/gnunet-daemon-testbed-underlay.c:475
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:732
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/testbed/gnunet-service-testbed_peers.c:1019
 #, fuzzy
 msgid "Request doesn't fit into a message"
 msgstr "no imprime mensajes de estado"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
@@ -7154,16 +6891,16 @@
 msgid "Waiting for child to exit.\n"
 msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:248
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:296
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
 
-#: src/testbed/gnunet-testbed-profiler.c:299
+#: src/testbed/gnunet-testbed-profiler.c:297
 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 "
@@ -7190,7 +6927,7 @@
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
+#: src/testbed/testbed_api_hosts.c:1590
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "No se pudo añadir la máquina %u por el error: %s\n"
@@ -7199,47 +6936,47 @@
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:987
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1052
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1141
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1145
 msgid "Testbed cannot be started on localhost\n"
 msgstr "La batería de pruebas no se puede iniciar en localhost\n"
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1183
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1201
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1261
 #, fuzzy
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1273
 msgid "No hosts loaded. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1297
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 "La topología especificada debe estar soportada por la batería de pruebas"
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1347
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
@@ -7246,7 +6983,7 @@
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1363
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
@@ -7253,46 +6990,46 @@
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:960
+#: src/testbed/testbed_api_topology.c:966
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:974
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:982
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1004
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1013
+#: src/testbed/testbed_api_topology.c:1037
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1019
+#: src/testbed/testbed_api_topology.c:1043
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1025
+#: src/testbed/testbed_api_topology.c:1049
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1083
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
@@ -7354,7 +7091,7 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:720
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
@@ -7361,7 +7098,7 @@
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1157
+#: src/testing/testing.c:1163
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7370,35 +7107,35 @@
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:1166
+#: src/testing/testing.c:1172
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:1176
+#: src/testing/testing.c:1182
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
 
-#: src/testing/testing.c:1189
+#: src/testing/testing.c:1195
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
 "suficientes puertos libres?)\n"
 
-#: src/testing/testing.c:1203
+#: src/testing/testing.c:1209
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
 
-#: src/testing/testing.c:1215
+#: src/testing/testing.c:1221
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1240
+#: src/testing/testing.c:1246
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
@@ -7405,12 +7142,12 @@
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1342
+#: src/testing/testing.c:1348
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1710
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -7427,44 +7164,45 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
-#: src/topology/gnunet-daemon-topology.c:265
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:406
-msgid "# connect requests issued to transport"
+#: src/topology/gnunet-daemon-topology.c:349
+#, fuzzy
+msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/topology/gnunet-daemon-topology.c:840
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:734
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:1020
+#: src/topology/gnunet-daemon-topology.c:931
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:964
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:971
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1079
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1084
+#: src/topology/gnunet-daemon-topology.c:1003
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7472,7 +7210,7 @@
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1009
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
@@ -7479,43 +7217,40 @@
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
-#: src/transport/plugin_transport_wlan.c:1497
+#: src/topology/gnunet-daemon-topology.c:1043
+#: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1178
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1323
-#, fuzzy
-msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1288
+msgid "GNUnet topology control"
 msgstr ""
-"Control de topología de GNUnet (manteniendo las restricciones del mesh de "
-"P2P y de F2F)"
 
-#: src/transport/gnunet-service-transport_ats.c:136
+#: src/transport/gnunet-service-transport_ats.c:141
 msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:286
+#: src/transport/gnunet-service-transport_blacklist.c:284
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:293
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:504
-#: src/transport/gnunet-service-transport_blacklist.c:855
+#: src/transport/gnunet-service-transport_blacklist.c:500
+#: src/transport/gnunet-service-transport_blacklist.c:851
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport_blacklist.c:859
+#: src/transport/gnunet-service-transport_blacklist.c:855
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
@@ -7525,15 +7260,15 @@
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:385
+#: src/transport/gnunet-service-transport.c:383
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:480
+#: src/transport/gnunet-service-transport.c:478
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:826
+#: src/transport/gnunet-service-transport.c:823
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7540,113 +7275,108 @@
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:481
+#: src/transport/gnunet-service-transport_clients.c:523
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:783
+#: src/transport/gnunet-service-transport_clients.c:845
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport_clients.c:827
-msgid "# REQUEST CONNECT messages received"
-msgstr "# mensajes «REQUEST CONNECT» recibidos"
-
-#: src/transport/gnunet-service-transport_clients.c:864
-#, fuzzy
-msgid "# REQUEST DISCONNECT messages received"
-msgstr "# mensajes «REQUEST CONNECT» recibidos"
-
-#: src/transport/gnunet-service-transport_hello.c:197
+#: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:840
+#: src/transport/gnunet-service-transport_neighbours.c:805
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1048
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1304
-#: src/transport/gnunet-service-transport_neighbours.c:1761
+#: src/transport/gnunet-service-transport_neighbours.c:1168
+msgid "# disconnects due to quota of 0"
+msgstr "# desconexiones debido a una cuota de 0"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1309
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1375
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1451
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1495
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1505
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1550
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1559
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1567
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1576
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1581
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1658
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1692
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1707
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1827
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
@@ -7653,133 +7383,120 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1847
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1886
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1933
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1998
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2052
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2069
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
-#, fuzzy, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
-msgstr "Se produjo un fallo al conectar con «%s»\n"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2352
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2357
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2726
+#: src/transport/gnunet-service-transport_neighbours.c:2599
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3212
+#: src/transport/gnunet-service-transport_neighbours.c:3081
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3220
+#: src/transport/gnunet-service-transport_neighbours.c:3089
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3238
-#: src/transport/gnunet-service-transport_neighbours.c:3262
+#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3131
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3274
+#: src/transport/gnunet-service-transport_neighbours.c:3143
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3299
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3312
+#: src/transport/gnunet-service-transport_neighbours.c:3181
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3506
+#: src/transport/gnunet-service-transport_neighbours.c:3357
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3542
+#: src/transport/gnunet-service-transport_neighbours.c:3393
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3608
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
-
-#: src/transport/gnunet-service-transport_neighbours.c:3637
-msgid "# disconnects due to quota of 0"
-msgstr "# desconexiones debido a una cuota de 0"
-
-#: src/transport/gnunet-service-transport_neighbours.c:3685
+#: src/transport/gnunet-service-transport_neighbours.c:3481
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3692
+#: src/transport/gnunet-service-transport_neighbours.c:3488
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3733
+#: src/transport/gnunet-service-transport_neighbours.c:3528
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3740
+#: src/transport/gnunet-service-transport_neighbours.c:3535
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3751
+#: src/transport/gnunet-service-transport_neighbours.c:3546
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3885
+#: src/transport/gnunet-service-transport_neighbours.c:3680
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7813,41 +7530,41 @@
 msgstr "# revalidaciones de direcciones iniciadas"
 
 #: src/transport/gnunet-service-transport_validation.c:452
-#: src/transport/gnunet-service-transport_validation.c:640
-#: src/transport/gnunet-service-transport_validation.c:949
-#: src/transport/gnunet-service-transport_validation.c:1540
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:950
+#: src/transport/gnunet-service-transport_validation.c:1552
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/transport/gnunet-service-transport_validation.c:495
+#: src/transport/gnunet-service-transport_validation.c:493
 #, fuzzy
 msgid "# address records discarded (timeout)"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:543
+#: src/transport/gnunet-service-transport_validation.c:541
 #, fuzzy
 msgid "# address records discarded (blacklist)"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:631
+#: src/transport/gnunet-service-transport_validation.c:629
 #, fuzzy
 msgid "# PINGs for address validation sent"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:713
+#: src/transport/gnunet-service-transport_validation.c:709
 msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:750
+#: src/transport/gnunet-service-transport_validation.c:746
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1076
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:1121
+#: src/transport/gnunet-service-transport_validation.c:1127
 #, fuzzy, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
@@ -7854,20 +7571,20 @@
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1140
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1137
+#: src/transport/gnunet-service-transport_validation.c:1143
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1145
+#: src/transport/gnunet-service-transport_validation.c:1151
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1158
+#: src/transport/gnunet-service-transport_validation.c:1164
 #, fuzzy, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7876,49 +7593,49 @@
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1213
+#: src/transport/gnunet-service-transport_validation.c:1219
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1264
+#: src/transport/gnunet-service-transport_validation.c:1270
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1273
+#: src/transport/gnunet-service-transport_validation.c:1279
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1430
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1448
+#: src/transport/gnunet-service-transport_validation.c:1460
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1503
+#: src/transport/gnunet-service-transport_validation.c:1515
 #, fuzzy
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-transport.c:580
+#: src/transport/gnunet-transport.c:558
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:589
-#: src/transport/gnunet-transport-profiler.c:274
+#: src/transport/gnunet-transport.c:567
+#: src/transport/gnunet-transport-profiler.c:282
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:608
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:636
+#: src/transport/gnunet-transport.c:623
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
@@ -7925,36 +7642,36 @@
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:648
+#: src/transport/gnunet-transport.c:635
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:675 src/transport/gnunet-transport.c:700
+#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:680
+#: src/transport/gnunet-transport.c:667
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:685
+#: src/transport/gnunet-transport.c:672
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/transport/gnunet-transport.c:690
+#: src/transport/gnunet-transport.c:677
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/transport/gnunet-transport.c:695
+#: src/transport/gnunet-transport.c:682
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:820
+#: src/transport/gnunet-transport.c:807
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7963,46 +7680,40 @@
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:855
+#: src/transport/gnunet-transport.c:842
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:949 src/transport/gnunet-transport.c:1744
+#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/transport/gnunet-transport.c:1006
+#: src/transport/gnunet-transport.c:993
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1007
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:1045
+#: src/transport/gnunet-transport.c:1032
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:1091
+#: src/transport/gnunet-transport.c:1078
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:1114
-#: src/transport/gnunet-transport-profiler.c:406
+#: src/transport/gnunet-transport.c:1107
 #, c-format
-msgid "Successfully connected to `%s'\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
-
-#: src/transport/gnunet-transport.c:1138
-#, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
@@ -8010,61 +7721,42 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:1171
-#, fuzzy, c-format
-msgid "Successfully disconnected from `%s'\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
-
-#: src/transport/gnunet-transport.c:1194
-#: src/transport/gnunet-transport-profiler.c:434
+#: src/transport/gnunet-transport.c:1144
+#: src/transport/gnunet-transport-profiler.c:439
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:1219 src/transport/gnunet-transport.c:1245
+#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport.c:1171
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1247
+#: src/transport/gnunet-transport.c:1197
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1271
-#: src/transport/gnunet-transport-profiler.c:458
+#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport-profiler.c:464
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1311
+#: src/transport/gnunet-transport.c:1261
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1273
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1831
-#: src/transport/gnunet-transport-profiler.c:492
-msgid "Failed to send connect request to transport service\n"
-msgstr ""
-"Se produjo un fallo al enviar una petición de conexión al servicio de "
-"transporte\n"
-
-#: src/transport/gnunet-transport.c:1866
-#, fuzzy
-msgid "Failed to send disconnect request to transport service\n"
-msgstr ""
-"Se produjo un fallo al enviar una petición de conexión al servicio de "
-"transporte\n"
-
-#: src/transport/gnunet-transport.c:1910
+#: src/transport/gnunet-transport.c:1809
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -8073,7 +7765,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1918
+#: src/transport/gnunet-transport.c:1817
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -8081,57 +7773,56 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1937 src/transport/gnunet-transport.c:1967
-#: src/transport/gnunet-transport.c:2000 src/transport/gnunet-transport.c:2026
-#: src/transport/gnunet-transport.c:2085
-#: src/transport/gnunet-transport-profiler.c:578
+#: src/transport/gnunet-transport.c:1840
+#, fuzzy
+msgid "Failed to connect to transport service for disconnection\n"
+msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
+
+#: src/transport/gnunet-transport.c:1846
+msgid "Blacklisting request in place, stop with CTRL-C\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1865 src/transport/gnunet-transport.c:1884
+#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport-profiler.c:560
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1946 src/transport/gnunet-transport.c:1977
-#: src/transport/gnunet-transport.c:2011
-msgid "Failed to send request to transport service\n"
-msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
-
-#: src/transport/gnunet-transport.c:2031
+#: src/transport/gnunet-transport.c:1889
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:2133
+#: src/transport/gnunet-transport.c:1990
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:2136
+#: src/transport/gnunet-transport.c:1993
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:2139
-msgid "connect to a peer"
-msgstr "conectar a un par"
-
-#: src/transport/gnunet-transport.c:2142
+#: src/transport/gnunet-transport.c:1996
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:2145
+#: src/transport/gnunet-transport.c:1999
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Imprime información de los pares de GNUnet."
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/transport/gnunet-transport.c:2148
+#: src/transport/gnunet-transport.c:2002
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/transport/gnunet-transport.c:2151
+#: src/transport/gnunet-transport.c:2005
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:2157
+#: src/transport/gnunet-transport.c:2011
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
@@ -8138,57 +7829,57 @@
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:2160
+#: src/transport/gnunet-transport.c:2014
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:2163
-#: src/transport/gnunet-transport-profiler.c:638
+#: src/transport/gnunet-transport.c:2017
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:2166
+#: src/transport/gnunet-transport.c:2020
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:2169
+#: src/transport/gnunet-transport.c:2023
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:2172
+#: src/transport/gnunet-transport.c:2026
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:2183
-#: src/transport/gnunet-transport-profiler.c:649
+#: src/transport/gnunet-transport.c:2037
+#: src/transport/gnunet-transport-profiler.c:637
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/gnunet-transport-profiler.c:218
+#: src/transport/gnunet-transport-profiler.c:226
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:254
+#: src/transport/gnunet-transport-profiler.c:262
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:263
+#: src/transport/gnunet-transport-profiler.c:271
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:280
+#: src/transport/gnunet-transport-profiler.c:288
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:332
+#: src/transport/gnunet-transport-profiler.c:341
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:352
+#: src/transport/gnunet-transport-profiler.c:361
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8197,37 +7888,37 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport-profiler.c:400
+#: src/transport/gnunet-transport-profiler.c:411
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "Conectado a %s.\n"
 
-#: src/transport/gnunet-transport-profiler.c:483
-#, fuzzy, c-format
-msgid "Retrying to connect to `%s'\n"
-msgstr "Intentando conectar a «%s» (%p)\n"
+#: src/transport/gnunet-transport-profiler.c:418
+#, c-format
+msgid "Successfully connected to `%s'\n"
+msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport-profiler.c:508
+#: src/transport/gnunet-transport-profiler.c:480
 #, fuzzy, c-format
 msgid "Denying connection to `%s'\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:510
 #, fuzzy
 msgid "Message size too big!\n"
 msgstr "tamaño del mensaje"
 
-#: src/transport/gnunet-transport-profiler.c:543
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/gnunet-transport-profiler.c:558
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
 
-#: src/transport/gnunet-transport-profiler.c:564
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy, c-format
 msgid "Trying to receive messages from peer `%s'\n"
 msgstr ""
@@ -8234,44 +7925,49 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-transport-profiler.c:569
+#: src/transport/gnunet-transport-profiler.c:542
 #, fuzzy
 msgid "No operation given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:549
+#, fuzzy
+msgid "Failed to connect to ATS service\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#: src/transport/gnunet-transport-profiler.c:611
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport-profiler.c:614
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/transport/gnunet-transport-profiler.c:629
+#: src/transport/gnunet-transport-profiler.c:617
 #, fuzzy
 msgid "iterations"
 msgstr "Otras configuraciones"
 
-#: src/transport/gnunet-transport-profiler.c:632
+#: src/transport/gnunet-transport-profiler.c:620
 #, fuzzy
 msgid "number of messages to send"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/transport/gnunet-transport-profiler.c:635
+#: src/transport/gnunet-transport-profiler.c:623
 #, fuzzy
 msgid "message size to use"
 msgstr "tamaño del mensaje"
 
-#: src/transport/plugin_transport_http_client.c:1485
-#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3435
-#: src/transport/plugin_transport_tcp.c:2991
-#: src/transport/plugin_transport_tcp.c:2998
+#: src/transport/plugin_transport_http_client.c:1482
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3433
+#: src/transport/plugin_transport_tcp.c:2985
+#: src/transport/plugin_transport_tcp.c:2992
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2128
+#: src/transport/plugin_transport_http_client.c:2123
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -8278,24 +7974,24 @@
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:2177
-#: src/transport/plugin_transport_http_server.c:3150
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2194
-#: src/transport/plugin_transport_http_server.c:3220
+#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_server.c:3218
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:2228
+#: src/transport/plugin_transport_http_client.c:2223
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1735
+#: src/transport/plugin_transport_http_server.c:1733
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8304,12 +8000,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1967
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr "Aceptando conexión (%u de %u) desde «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:1975
+#: src/transport/plugin_transport_http_server.c:1973
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -8317,7 +8013,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:2125
+#: src/transport/plugin_transport_http_server.c:2123
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -8325,7 +8021,7 @@
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:2148
+#: src/transport/plugin_transport_http_server.c:2146
 #, fuzzy, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
@@ -8332,58 +8028,58 @@
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2275
+#: src/transport/plugin_transport_http_server.c:2273
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2584
+#: src/transport/plugin_transport_http_server.c:2582
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
 
-#: src/transport/plugin_transport_http_server.c:2618 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2636 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
-#: src/transport/plugin_transport_http_server.c:2749
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
-#: src/transport/plugin_transport_http_server.c:2827
-#: src/transport/plugin_transport_udp.c:3409
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3604
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_http_server.c:2926
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2941
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2947
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2956
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2962
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2978
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8390,12 +8086,12 @@
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2988
+#: src/transport/plugin_transport_http_server.c:2986
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Asociando a la dirección IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3010
+#: src/transport/plugin_transport_http_server.c:3008
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8402,27 +8098,27 @@
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:3020
+#: src/transport/plugin_transport_http_server.c:3018
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Asociando a la dirección IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3083
+#: src/transport/plugin_transport_http_server.c:3081
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3104
+#: src/transport/plugin_transport_http_server.c:3102
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3121
+#: src/transport/plugin_transport_http_server.c:3119
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:3447
+#: src/transport/plugin_transport_http_server.c:3445
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8473,24 +8169,24 @@
 msgstr "# bytes omitidos por SMTP (salientes)"
 
 #: src/transport/plugin_transport_tcp.c:672
-#: src/transport/plugin_transport_tcp.c:1989
+#: src/transport/plugin_transport_tcp.c:1983
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
 #: src/transport/plugin_transport_tcp.c:855
-#: src/transport/plugin_transport_tcp.c:1081
-#: src/transport/plugin_transport_tcp.c:2259
-#: src/transport/plugin_transport_tcp.c:3112
+#: src/transport/plugin_transport_tcp.c:1079
+#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:3106
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
 #: src/transport/plugin_transport_tcp.c:897
-#: src/transport/plugin_transport_tcp.c:1063
-#: src/transport/plugin_transport_tcp.c:1187
-#: src/transport/plugin_transport_tcp.c:1260
-#: src/transport/plugin_transport_tcp.c:1360
-#: src/transport/plugin_transport_tcp.c:1385
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1185
+#: src/transport/plugin_transport_tcp.c:1258
+#: src/transport/plugin_transport_tcp.c:1358
+#: src/transport/plugin_transport_tcp.c:1383
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
@@ -8498,58 +8194,58 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1190
+#: src/transport/plugin_transport_tcp.c:1188
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1264
+#: src/transport/plugin_transport_tcp.c:1262
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1659
+#: src/transport/plugin_transport_tcp.c:1653
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1827
+#: src/transport/plugin_transport_tcp.c:1821
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2318
+#: src/transport/plugin_transport_tcp.c:2312
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2509
+#: src/transport/plugin_transport_tcp.c:2503
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2560
-#: src/transport/plugin_transport_tcp.c:2618
+#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2612
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:2564
+#: src/transport/plugin_transport_tcp.c:2558
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:2570
+#: src/transport/plugin_transport_tcp.c:2564
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2572
+#: src/transport/plugin_transport_tcp.c:2566
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2612
+#: src/transport/plugin_transport_tcp.c:2606
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2622
+#: src/transport/plugin_transport_tcp.c:2616
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2925 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
 #: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -8557,20 +8253,20 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2941
+#: src/transport/plugin_transport_tcp.c:2935
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:3100
+#: src/transport/plugin_transport_tcp.c:3094
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3104
+#: src/transport/plugin_transport_tcp.c:3098
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:3108
+#: src/transport/plugin_transport_tcp.c:3102
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
@@ -8580,12 +8276,12 @@
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:548
+#: src/transport/plugin_transport_udp_broadcasting.c:546
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:569
+#: src/transport/plugin_transport_udp_broadcasting.c:567
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
@@ -8592,7 +8288,7 @@
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:3152
+#: src/transport/plugin_transport_udp.c:3344
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8601,7 +8297,7 @@
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:3166
+#: src/transport/plugin_transport_udp.c:3358
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8611,52 +8307,52 @@
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:3485
-#: src/transport/plugin_transport_udp.c:3584
+#: src/transport/plugin_transport_udp.c:3680
+#: src/transport/plugin_transport_udp.c:3779
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3503
+#: src/transport/plugin_transport_udp.c:3698
 #, fuzzy
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_udp.c:3594
+#: src/transport/plugin_transport_udp.c:3789
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3666
-#: src/transport/plugin_transport_udp.c:3680
+#: src/transport/plugin_transport_udp.c:3861
+#: src/transport/plugin_transport_udp.c:3875
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3712
+#: src/transport/plugin_transport_udp.c:3907
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3739
+#: src/transport/plugin_transport_udp.c:3934
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3805
+#: src/transport/plugin_transport_udp.c:4000
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1409
+#: src/transport/plugin_transport_unix.c:1407
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/plugin_transport_unix.c:1422
+#: src/transport/plugin_transport_unix.c:1420
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/transport/plugin_transport_unix.c:1824
+#: src/transport/plugin_transport_unix.c:1820
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -8672,54 +8368,54 @@
 msgstr "# mensajes defragmentados"
 
 #: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:890
+#: src/transport/plugin_transport_wlan.c:888
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1011
+#: src/transport/plugin_transport_wlan.c:1009
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:1040
+#: src/transport/plugin_transport_wlan.c:1038
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:1171
-#: src/transport/plugin_transport_wlan.c:1264
-#: src/transport/plugin_transport_wlan.c:2287
+#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:2279
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1547
+#: src/transport/plugin_transport_wlan.c:1541
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1616
+#: src/transport/plugin_transport_wlan.c:1610
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:1714
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1839
+#: src/transport/plugin_transport_wlan.c:1831
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1873
+#: src/transport/plugin_transport_wlan.c:1865
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:2262
+#: src/transport/plugin_transport_wlan.c:2254
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -8726,17 +8422,17 @@
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2276
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/transport_api.c:892
+#: src/transport/transport_api.c:816
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
 
-#: src/transport/transport-testing.c:603
+#: src/transport/transport-testing.c:680
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
@@ -8774,13 +8470,13 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:264 src/util/client.c:894 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/util/client.c:268 src/util/client.c:899 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:895 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -8799,59 +8495,59 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/client.c:1044
+#: src/util/client.c:1040
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
 
-#: src/util/client.c:1056
+#: src/util/client.c:1052
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
 
-#: src/util/common_logging.c:255 src/util/common_logging.c:1035
+#: src/util/common_logging.c:255 src/util/common_logging.c:1062
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1033
+#: src/util/common_logging.c:257 src/util/common_logging.c:1060
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1031
+#: src/util/common_logging.c:259 src/util/common_logging.c:1058
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1029
+#: src/util/common_logging.c:261 src/util/common_logging.c:1056
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1037
+#: src/util/common_logging.c:263 src/util/common_logging.c:1064
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:813
+#: src/util/common_logging.c:840
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1038
+#: src/util/common_logging.c:1065
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1154
+#: src/util/common_logging.c:1181
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1223
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1241
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1262
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8969,17 +8665,17 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:999
+#: src/util/crypto_rsa.c:1146
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/disk.c:1226
+#: src/util/disk.c:1228
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1449 src/util/service.c:1328
+#: src/util/disk.c:1451 src/util/service.c:1327
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -9044,7 +8740,7 @@
 msgid "Use %s to get a list of options.\n"
 msgstr "Use %s para obtener una lista de opciones.\n"
 
-#: src/util/getopt_helpers.c:90
+#: src/util/getopt_helpers.c:91
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -9052,12 +8748,12 @@
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:274 src/util/getopt_helpers.c:332
+#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:304
+#: src/util/getopt_helpers.c:308
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
@@ -9192,28 +8888,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:233
+#: src/util/gnunet-scrypt.c:234
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/util/gnunet-scrypt.c:294
+#: src/util/gnunet-scrypt.c:295
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:298
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:300
+#: src/util/gnunet-scrypt.c:301
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:304
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:315
+#: src/util/gnunet-scrypt.c:316
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -9229,36 +8925,36 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-uri.c:88
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "URI no válida: no comienza con «%s»\n"
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr "URI no válida: falla al especificar el subsistema\n"
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-uri.c:105
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 
-#: src/util/gnunet-uri.c:168
+#: src/util/gnunet-uri.c:167
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:342
+#: src/util/helper.c:340
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:388
+#: src/util/helper.c:386
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
@@ -9265,7 +8961,7 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:620
+#: src/util/helper.c:616
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -9283,7 +8979,7 @@
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:421
+#: src/util/os_installation.c:500
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -9292,17 +8988,17 @@
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:768
+#: src/util/os_installation.c:860
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:828
+#: src/util/os_installation.c:920
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/os_installation.c:838
+#: src/util/os_installation.c:930
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -9326,46 +9022,56 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:246 src/util/service.c:1462
+#: src/util/program.c:248 src/util/service.c:1461
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:258 src/util/service.c:1477
+#: src/util/program.c:260 src/util/service.c:1476
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/util/program.c:263 src/util/service.c:1472
+#: src/util/program.c:265 src/util/service.c:1471
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/resolver_api.c:201
+#: src/util/resolver_api.c:204
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
-msgstr "¡Se debe especificar «%s» para «%s» en la configuración!\n"
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
 
-#: src/util/resolver_api.c:220
-#, c-format
+#: src/util/resolver_api.c:223
+#, fuzzy, c-format
 msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
 "la configuración!\n"
 
-#: src/util/resolver_api.c:354
+#: src/util/resolver_api.c:357
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 
-#: src/util/resolver_api.c:361
+#: src/util/resolver_api.c:364
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:1027 src/util/resolver_api.c:1048
-#: src/util/resolver_api.c:1062
+# Miguel: He traducido "default" por "predeterminado", la locución
+# "por defecto" no tiene sentido en sitios como este y he tratado
+# de ser consistente.
+#: src/util/resolver_api.c:952
+#, fuzzy
+msgid "Resolver not configured correctly.\n"
+msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
+
+#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
+#: src/util/resolver_api.c:1063
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
@@ -9386,7 +9092,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:904
+#: src/util/server.c:902
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9457,39 +9163,39 @@
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1175
+#: src/util/service.c:1174
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1217
+#: src/util/service.c:1216
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1266
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1270
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1274
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1329
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1342
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/util/service.c:1412
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -9498,12 +9204,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "señal (%d, %p) devolvió %d.\n"
 
-#: src/util/socks.c:592
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:605
+#: src/util/socks.c:610
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9721,30 +9427,30 @@
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:3019
+#: src/vpn/gnunet-service-vpn.c:3017
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3043
+#: src/vpn/gnunet-service-vpn.c:3041
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3051
+#: src/vpn/gnunet-service-vpn.c:3049
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3064
+#: src/vpn/gnunet-service-vpn.c:3062
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3077
+#: src/vpn/gnunet-service-vpn.c:3075
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3087
+#: src/vpn/gnunet-service-vpn.c:3085
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
@@ -9814,22 +9520,215 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:635 src/include/gnunet_common.h:642
-#: src/include/gnunet_common.h:650
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
+#: src/include/gnunet_common.h:655
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:662
+#: src/include/gnunet_common.h:667
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:698
+#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "timeout in MSECS milliseconds for completing current operation"
+#~ msgstr "plazo en milisegundos (MSECS) para completar la operación actual"
+
+#~ msgid ""
+#~ "Received PING from `%s' for different identity: I am `%s', PONG identity: "
+#~ "`%s'\n"
+#~ msgstr ""
+#~ "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», "
+#~ "identidad del PONG: «%s»\n"
+
+#~ msgid "# Preference updates given to core"
+#~ msgstr "# Actualizaciones de preferencias dadas al servicio principal"
+
+#, fuzzy
+#~ msgid "Error trying to send a message to peer `%s'.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+#~ "«%s»\n"
+
+#, fuzzy
+#~ msgid "Retrieve information about all defined sensors"
+#~ msgstr "proveer información acerca de un túnel en particular"
+
+#, fuzzy
+#~ msgid "Retrieve information about a single sensor"
+#~ msgstr "proveer información acerca de un túnel en particular"
+
+#, fuzzy
+#~ msgid "Missing or invalid topology file.\n"
+#~ msgstr "Parámetro no válido «%s»\n"
+
+#, fuzzy
+#~ msgid "Number of peers to run"
+#~ msgstr "número de pares para empezar"
+
+#, fuzzy
+#~ msgid "Number of peers to simulate anomalies on"
+#~ msgstr "número de pares para empezar"
+
+#, fuzzy
+#~ msgid "Profiler for sensor service"
+#~ msgstr "Perfilador para expresiones regulares."
+
+#, fuzzy
+#~ msgid "Received an invalid sensor value."
+#~ msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
+
+#, fuzzy
+#~ msgid "Analysis model not defined in configuration.\n"
+#~ msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
+
+#, fuzzy
+#~ msgid "Could not load analysis model `%s'.\n"
+#~ msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
+
+#, fuzzy
+#~ msgid "Could not connect to peerstore service.\n"
+#~ msgstr "No se pudo conectar al servicio %s.\n"
+
+#, fuzzy
+#~ msgid "Unknown value type expected by sensor, this should not happen.\n"
+#~ msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
+#, fuzzy
+#~ msgid "Received an invalid value for sensor `%s': %s\n"
+#~ msgstr ""
+#~ "La configuración especifica un valor no válido en la opción «%s» de la "
+#~ "sección «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "Double creation of proof-of-work, this should not happen.\n"
+#~ msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pow and signature block.\n"
+#~ msgstr "Se produjo un fallo al crear una nueva firma"
+
+#, fuzzy
+#~ msgid "Failed to connect to CORE service.\n"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to peerstore service.\n"
+#~ msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
+
+#, fuzzy
+#~ msgid "Failed to load my private key.\n"
+#~ msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to update point `%s'.\n"
+#~ msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#, fuzzy
+#~ msgid "Iterate request canceled due to disconnection.\n"
+#~ msgstr "# pares desconectados debido a desconexión global"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `SENSOR' service."
+#~ msgstr ""
+#~ "Petición de transmisión de iteración de expiración al servicio de "
+#~ "información de pares (PEERINFO)."
+
+#, fuzzy
+#~ msgid "Error reading sensor version\n"
+#~ msgstr "Error leyendo «%s»: %s"
+
+#, fuzzy
+#~ msgid "Error reading sensor category\n"
+#~ msgstr "Error leyendo «%s»: %s"
+
+#, fuzzy
+#~ msgid "Error reading sensor run interval\n"
+#~ msgstr "Error creando el túnel\n"
+
+#, fuzzy
+#~ msgid "Error reading sensor source\n"
+#~ msgstr "Error leyendo «%s»: %s"
+
+#, fuzzy
+#~ msgid "Error reading sensor process name\n"
+#~ msgstr "Error leyendo de «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to access sensor file: %s\n"
+#~ msgstr "Se produjo un fallo al acceder «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to load sensor definition: %s\n"
+#~ msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
+
+#, fuzzy
+#~ msgid "Error adding new sensor `%s' to global hashmap.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Error subiendo el fichero %s\n"
+
+#, fuzzy
+#~ msgid "Error loading sensor from file: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Error subiendo el fichero %s\n"
+
+#, fuzzy
+#~ msgid "dump statistics to stdout after completion"
+#~ msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
+#, fuzzy
+#~ msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
+#~ msgstr ""
+#~ "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
+#~ "P2P y de F2F)"
+
+#~ msgid "# REQUEST CONNECT messages received"
+#~ msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#, fuzzy
+#~ msgid "# REQUEST DISCONNECT messages received"
+#~ msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#, fuzzy
+#~ msgid "Blacklisting disapproved to connect to peer `%s'\n"
+#~ msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#~ msgid "# SET QUOTA messages ignored (no such peer)"
+#~ msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
+
+#, fuzzy
+#~ msgid "Successfully disconnected from `%s'\n"
+#~ msgstr "Conectado satisfactoriamente a «%s»\n"
+
+#~ msgid "Failed to send connect request to transport service\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al enviar una petición de conexión al servicio de "
+#~ "transporte\n"
+
+#, fuzzy
+#~ msgid "Failed to send disconnect request to transport service\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al enviar una petición de conexión al servicio de "
+#~ "transporte\n"
+
+#~ msgid "Failed to send request to transport service\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+
+#, fuzzy
+#~ msgid "Retrying to connect to `%s'\n"
+#~ msgstr "Intentando conectar a «%s» (%p)\n"
+
+#~ msgid "Must specify `%s' for `%s' in configuration!\n"
+#~ msgstr "¡Se debe especificar «%s» para «%s» en la configuración!\n"
+
 #~ msgid "# messages discarded (expired prior to transmission)"
 #~ msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
@@ -9963,13 +9862,6 @@
 #~ msgid "Starting default services `%s'\n"
 #~ msgstr "Iniciando servicios predeterminados «%s»\n"
 
-# Miguel: He traducido "default" por "predeterminado", la locución
-# "por defecto" no tiene sentido en sitios como este y he tratado
-# de ser consistente.
-#~ msgid "Default service `%s' not configured correctly!\n"
-#~ msgstr ""
-#~ "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
-
 # Miguel: ¿No hay servicios -> no hay ningún servicio?
 #~ msgid ""
 #~ "No default services configured, GNUnet will not really start right now.\n"

Modified: gnunet/po/fr.po
===================================================================
--- gnunet/po/fr.po     2016-04-19 11:25:51 UTC (rev 37056)
+++ gnunet/po/fr.po     2016-04-19 11:50:49 UTC (rev 37057)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2016-04-18 17:19+0200\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,12 +16,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:337
+#: src/arm/arm_api.c:336
 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"
+#: src/arm/arm_monitor_api.c:324
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:164
@@ -34,138 +35,138 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
+#: src/arm/gnunet-arm.c:217
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "ARM API is busy"
 msgstr "API ARM occupé"
 
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:223
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:261
 #, 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
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:367
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:377
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: 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:431
+#: src/arm/gnunet-arm.c:429
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:466
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:477
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:515
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:523
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
@@ -227,7 +228,7 @@
 msgstr ""
 
 #: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:746
@@ -246,208 +247,210 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:279
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:302
+#: src/arm/gnunet-service-arm.c:315
 msgid "Could not send list result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:529
+#: src/arm/gnunet-service-arm.c:581
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:540
+#: src/arm/gnunet-service-arm.c:592
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:639
+#: src/arm/gnunet-service-arm.c:693
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:661
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:695
+#: src/arm/gnunet-service-arm.c:753
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:891
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1160
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1324
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1329
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1334
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1340
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1367
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1384
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, c-format
-msgid "Starting default services `%s'\n"
+#: src/arm/mockup-service.c:41
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1511
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1524
-msgid "No default services configured, GNUnet will not really start right 
now.\n"
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
-msgid "Initiating shutdown as requested by client.\n"
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
-#, c-format
-msgid "Received %s message\n"
-msgstr "%s message(s) reçu(s)\n"
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+msgid "solver to use"
+msgstr "solveur utilisé"
 
-#: src/ats/ats_api_performance.c:511
-#, c-format
-msgid "Received last message for %s \n"
-msgstr "Dernier message reçu de %s\n"
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats-tests/gnunet-solver-eval.c:927
+msgid "experiment to use"
+msgstr ""
 
-#: 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 "Could not load quota for network `%s':  `%s', assigning default 
bandwidth %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3299
+msgid "be verbose"
 msgstr ""
 
-#: 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"
+#: src/ats/gnunet-ats-solver-eval.c:3302
+msgid "print logging"
+msgstr "afficher le journal"
+
+#: src/ats/gnunet-ats-solver-eval.c:3305
+msgid "save logging to disk"
 msgstr ""
 
-#: 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"
+#: src/ats/gnunet-ats-solver-eval.c:3308
+msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-service-ats_plugins.c:305
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_plugins.c:315
 #, c-format
-msgid "No outbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
-#: src/ats-tests/gnunet-solver-eval.c:919
-msgid "solver to use"
-msgstr "solveur utilisé"
-
-#: 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-ats-solver-eval.c:2680
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-service-ats_plugins.c:360
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_plugins.c:452
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
-msgid "Failed to initialize solver!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1869
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1913
 #, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
+msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
-#, c-format
-msgid "Adjusting inconsistent outbound quota configuration for network `%s', 
is %llu must be at least %llu\n"
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
-#, c-format
-msgid "Adjusting inconsistent inbound quota configuration for network `%s', is 
%llu must be at least %llu\n"
-msgstr ""
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 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
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2670
 #, c-format
-msgid "Adjusting outbound quota configuration for network `%s'from %llu to 
%.0f\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:2150
+#: src/ats/plugin_ats_mlp.c:2679
 #, c-format
-msgid "Adjusting inbound quota configuration for network `%s' from %llu to 
%.0f\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:2161
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "fornat invalide : « %s »\n"
+
 #: src/ats-tests/ats-testing.c:72
 msgid "Benchmarking done\n"
 msgstr "Benchmark terminé\n"
@@ -481,15 +484,15 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:634
 msgid "Initialization failed, shutdown\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:842
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr "Arrêter la journalisation\n"
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tests/ats-testing-log.c:888
 #, c-format
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
@@ -496,396 +499,482 @@
 
 #: src/ats-tests/gnunet-ats-sim.c:86
 #, 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 ""
+"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:169
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats-tool/gnunet-ats.c:311
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
+#: src/ats-tool/gnunet-ats.c:395
 #, c-format
-msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u 
Bytes/s, %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:413
+#: src/ats-tool/gnunet-ats.c:402
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:402
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:512
 #, c-format
-msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: 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
+#: src/ats-tool/gnunet-ats.c:705
 #, c-format
-msgid "Service `%s' is not running\n"
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/transport/gnunet-transport.c:1797
+#: src/transport/gnunet-transport-profiler.c:523
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:454
+#: src/ats-tool/gnunet-ats.c:773
 #, 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:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
-#, c-format
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
+#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
-#, c-format
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:515
-#, c-format
+#: src/ats-tool/gnunet-ats.c:862
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
-#, c-format
+#: src/ats-tool/gnunet-ats.c:869
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:887
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:949
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:951
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:954
+#, fuzzy
+msgid "connect to PEER"
+msgstr "Connecté à"
+
+#: src/ats-tool/gnunet-ats.c:957
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:601
+#: src/ats-tool/gnunet-ats.c:959
 msgid "monitor mode"
 msgstr "mode moniteur"
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:961
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:963
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:965
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:968
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:970
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:973
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:983
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/cadet/gnunet-cadet.c:458
+#, c-format
+msgid "Invalid target `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:736
+#, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:780
+#, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
+msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:941
+msgid "provide information about a particular connection"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:944
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:947
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:953
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:956
+msgid "provide information about a patricular peer"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:959
+msgid "provide information about all peers"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:962
+msgid "provide information about a particular tunnel"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:965
+msgid "provide information about all tunnels"
+msgstr ""
+
+#: src/cadet/gnunet-service-cadet_peer.c:561
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:440
-msgid "how many peers receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:499
+msgid ""
+"how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: 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
+#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/set/gnunet-set-profiler.c:374 src/set/gnunet-set-profiler.c:377
+#: src/set/gnunet-set-profiler.c:380
 msgid "number of values"
 msgstr "nombre de valeurs"
 
-#: src/consensus/gnunet-consensus-profiler.c:446
+#: src/consensus/gnunet-consensus-profiler.c:505
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:449
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/set/gnunet-set-profiler.c:386
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/secretsharing/gnunet-secretsharing-profiler.c:623
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/conversation_api.c:617
+#, fuzzy
+msgid "number too large"
+msgstr "nombre de valeurs"
+
+#: src/conversation/gnunet-conversation.c:269
 #, 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:286
+#: src/conversation/gnunet-conversation.c:294
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:329
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:334
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:352
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:366
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:378
 #, c-format
-msgid "Phone active on line %u.  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:390
+#: src/conversation/gnunet-conversation.c:400
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:407
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:414
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:422
+#, fuzzy, c-format
+msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:437
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:442
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:511
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:541
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:534
+#: src/conversation/gnunet-conversation.c:591
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:549
+#: src/conversation/gnunet-conversation.c:604
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:559
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:615
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:632
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:662
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:685
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:690
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:696
+#: src/conversation/gnunet-conversation.c:720
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
-msgid "We had an internal error setting up our phone line. You can still make 
calls.\n"
+#: src/conversation/gnunet-conversation.c:701
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:710
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:715
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:734
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:740
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:753
 #: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:783
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:816
+#: src/conversation/gnunet-conversation.c:832
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:839
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:848
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:865
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:900
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:925
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:951
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:955
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:957
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: 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."
+#: src/conversation/gnunet-conversation.c:959
+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:947
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:967
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1171
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1184
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1219
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1243
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1272
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1298
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, c-format
 msgid ""
 "\n"
@@ -892,91 +981,95 @@
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:145
 #, 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:215
+#: src/conversation/gnunet-conversation-test.c:211
 #, 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-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/conversation/gnunet-conversation-test.c:244
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:318
+#, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:602
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:627
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr "pa_stream_connect_playback() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:659
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:680
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:707
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:783
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: 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"
@@ -1034,18 +1127,19 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+#: src/conversation/gnunet-service-conversation.c:853
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
-msgid "No available phone for incoming call on line %u, sending HANG_UP 
signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1351
 #, c-format
-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"
 msgstr ""
 
 #: src/conversation/microphone.c:121
@@ -1061,597 +1155,641 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:767
+#: src/core/core_api.c:725
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:90
+msgid "fresh connection"
 msgstr ""
 
-#: 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"
+#: src/core/gnunet-core.c:93
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
-msgid "Connected to"
-msgstr "Connecté à"
+#: src/core/gnunet-core.c:96
+msgid "key received"
+msgstr ""
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
-msgid "Disconnected from"
+#: src/core/gnunet-core.c:99
+msgid "connection established"
+msgstr ""
+
+#: src/core/gnunet-core.c:102
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:105
+#, fuzzy
+msgid "disconnected"
 msgstr "Déconnecté de"
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:112
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:115
+#, fuzzy
+msgid "unknown state"
+msgstr "adresse inconnue"
+
+#: src/core/gnunet-core.c:120
 #, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: 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:2008
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:380
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core_clients.c:498
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core_clients.c:561
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:571
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:630
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:719
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:765
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:795
+msgid "# PING messages transmitted"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:870
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
+#: src/core/gnunet-service-core_kx.c:877
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:916
 #, c-format
-msgid "Ephemeral key message 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:861
+#: src/core/gnunet-service-core_kx.c:927
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:951
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/core/gnunet-service-core_kx.c:1029
+#: src/transport/gnunet-service-transport_validation.c:1081
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:1038
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: 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
+#: src/core/gnunet-service-core_kx.c:1091
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1118
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1131
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1096
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1404
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1209
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1214
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1250
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1288
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1299
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1306
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1462
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1470
 #, 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:1338
+#: src/core/gnunet-service-core_kx.c:1473
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1531
+#: src/core/gnunet-service-core_kx.c:1557
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1544
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1586
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1594
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1480
+#: src/core/gnunet-service-core_kx.c:1628
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:168
+#: src/core/gnunet-service-core_neighbours.c:183
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
+#: src/core/gnunet-service-core_neighbours.c:199
+#: src/core/gnunet-service-core_neighbours.c:387
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:252
+#: src/core/gnunet-service-core_neighbours.c:291
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:486
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: 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
+#: src/core/gnunet-service-core_sessions.c:253
+#: src/core/gnunet-service-core_sessions.c:337
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:867
+#: src/fs/gnunet-service-fs_cp.c:657 src/fs/gnunet-service-fs_cp.c:1718
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:727
+#: 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:255
+#: src/core/gnunet-service-core_sessions.c:284
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
-msgid "# messages discarded (expired prior to transmission)"
+#: src/core/gnunet-service-core_sessions.c:403
+msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# valid typemap confirmations received"
+msgstr ""
+
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/datastore/gnunet-service-datastore.c:863
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/datacache/datacache.c:202
 #, 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:192
+#: src/datacache/datacache.c:213
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:295
+#: src/datacache/datacache.c:329
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:304
+#: src/datacache/datacache.c:339
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
-msgid "Heap datacache running\n"
+#: src/datacache/datacache.c:367
+msgid "# requests for random value received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:392
-msgid "Postgres datacache running\n"
+#: src/datacache/datacache.c:399
+msgid "# proximity search requests received"
 msgstr ""
 
-#: 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/datacache/plugin_datacache_heap.c:466
+msgid "Heap datacache running\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datastore/plugin_datastore_mysql.c:818
+#: src/datastore/plugin_datastore_mysql.c:834
+#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:65 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_postgres.c:53
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
+#: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: 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
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
+#: src/include/gnunet_common.h:676 src/include/gnunet_common.h:685
+#: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
-msgid "Sqlite datacache running\n"
-msgstr ""
-
-#: 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
+#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
-#, c-format
-msgid "Failed to close statement %p: %d\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_template.c:125
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:310
+#: src/datastore/datastore_api.c:308
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:394
+#: src/datastore/datastore_api.c:392
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:443
+#: src/datastore/datastore_api.c:447
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:471
+#: src/datastore/datastore_api.c:475
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:491
+#: src/datastore/datastore_api.c:495
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:533
+#: src/datastore/datastore_api.c:536
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:624
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:638
+#: src/datastore/datastore_api.c:648
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:770
+#: src/datastore/datastore_api.c:790
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:784
+#: src/datastore/datastore_api.c:804
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
+#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:806
+#: src/datastore/datastore_api.c:826
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:905
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:944
+#: src/datastore/datastore_api.c:971
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1005
+#: src/datastore/datastore_api.c:1032
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
+#: src/datastore/datastore_api.c:1092
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1129
+#: src/datastore/datastore_api.c:1156
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1174
-msgid "Failed to receive response from database.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:1233
+#: src/datastore/datastore_api.c:1260
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1300
+#: src/datastore/datastore_api.c:1327
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
+#: src/datastore/datastore_api.c:1390
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1459
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:113
 #, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:199
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: 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"
+#: src/datastore/gnunet-datastore.c:245
+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:255
+#: src/datastore/gnunet-datastore.c:254
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:370
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:444
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:223
+#: src/datastore/gnunet-service-datastore.c:502
+#: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:262
+#: src/datastore/gnunet-service-datastore.c:533
+#: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:649
 msgid "# results found"
 msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:694
 #, c-format
-msgid "Insufficient space (%llu bytes are available) to satisfy `%s' 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:684
+#: src/datastore/gnunet-service-datastore.c:705
 #, 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:688
-msgid "Insufficient space to satisfy request and requested amount is larger 
than cache size"
+#: src/datastore/gnunet-service-datastore.c:709
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:715
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:721
+#: src/datastore/gnunet-service-datastore.c:776
+#: src/datastore/gnunet-service-datastore.c:1037
+#: src/datastore/gnunet-service-datastore.c:1670
 msgid "# reserved"
 msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:790
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:877
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:1092
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1022
+#: src/datastore/gnunet-service-datastore.c:1105
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
+#: src/datastore/gnunet-service-datastore.c:1153
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1185
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:1221
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1267
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1277
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1309
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1362
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1367
 #, c-format
+msgid "New payload: %lld\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1420
+#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1431
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1500
+#: src/datastore/gnunet-service-datastore.c:1563
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1550
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1560
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1701
+#: src/datastore/gnunet-service-datastore.c:1713
 #, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1707
+#, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1719
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1736
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1754
+#: src/datastore/gnunet-service-datastore.c:1770
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1800
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/datastore/plugin_datastore_heap.c:826
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/datastore/plugin_datastore_mysql.c:309
+#: src/datastore/plugin_datastore_sqlite.c:507
+msgid "Data too large"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
+#: src/datastore/plugin_datastore_mysql.c:328
+msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:820
-msgid "Heap database running\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_mysql.c:783
+#: src/datastore/plugin_datastore_mysql.c:793
 #, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:802
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1022
+#: src/datastore/plugin_datastore_mysql.c:1036
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:345
+msgid "Postgress exec failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:975
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/namecache/plugin_namecache_postgres.c:398
+#: src/namestore/plugin_namestore_postgres.c:571
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:65
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:58
@@ -1659,42 +1797,45 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:255
+#: src/datastore/plugin_datastore_sqlite.c:263
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:663
+#: src/datastore/plugin_datastore_sqlite.c:688
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1185
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1205
 #, 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:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:257
+#: src/datastore/plugin_datastore_template.c:260
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:132
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1703,399 +1844,568 @@
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:158
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:172
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
+#: src/dht/gnunet-dht-put.c:199
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:191
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:270
+#: src/dht/gnunet-dht-put.c:214 src/fs/gnunet-auto-share.c:788
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:952
+#: src/fs/gnunet-search.c:306 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:872
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:224
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:267
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:292
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1421
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
+
+#: src/dht/gnunet_dht_profiler.c:1424
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1427 src/nse/gnunet-nse-profiler.c:863
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1430
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1433
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1436
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1439
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1442
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1460
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:119
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:122
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:125
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:154
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:161
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:177
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:193
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:196
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:208
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:237
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172
 msgid "Failed to connect to transport service!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-wdht_clients.c:852
+#: src/dht/gnunet-service-xdht_clients.c:849
 msgid "# GET requests from clients injected"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-wdht_clients.c:937
+#: src/dht/gnunet-service-xdht_clients.c:933
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-wdht_clients.c:1003
+#: src/dht/gnunet-service-xdht_clients.c:998
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-wdht_clients.c:1212
+#: src/dht/gnunet-service-xdht_clients.c:1200
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1039
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-dht_clients.c:1040
+#: src/dht/gnunet-service-wdht_clients.c:505
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-dht_clients.c:1053
+#: src/dht/gnunet-service-wdht_clients.c:519
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-dht_clients.c:1098
+#: src/dht/gnunet-service-wdht_clients.c:561
+#: src/dht/gnunet-service-xdht_clients.c:559
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-dht_clients.c:1121
+#: src/dht/gnunet-service-wdht_clients.c:584
+#: src/dht/gnunet-service-xdht_clients.c:582
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1218
+#: src/dht/gnunet-service-wdht_clients.c:638
+#: src/dht/gnunet-service-wdht_clients.c:681
+#: src/dht/gnunet-service-xdht_clients.c:636
+#: src/dht/gnunet-service-xdht_clients.c:679
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-dht_clients.c:1185
+#: src/dht/gnunet-service-wdht_clients.c:648
+#: src/dht/gnunet-service-xdht_clients.c:646
 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:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-wdht_datacache.c:107
+#: src/dht/gnunet-service-xdht_datacache.c:91
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-dht_datacache.c:184
+#: src/dht/gnunet-service-wdht_datacache.c:216
+#: src/dht/gnunet-service-xdht_datacache.c:238
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:201
+#: src/dht/gnunet-service-wdht_datacache.c:231
+#: src/dht/gnunet-service-xdht_datacache.c:267
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:207
+#: src/dht/gnunet-service-wdht_datacache.c:237
+#: src/dht/gnunet-service-xdht_datacache.c:273
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-dht_datacache.c:213
+#: src/dht/gnunet-service-wdht_datacache.c:243
+#: src/dht/gnunet-service-xdht_datacache.c:279
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-dht_datacache.c:225
+#: src/dht/gnunet-service-wdht_datacache.c:255
+#: src/dht/gnunet-service-xdht_datacache.c:291
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-dht_datacache.c:229
+#: src/dht/gnunet-service-wdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:294
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:262
+#: src/dht/gnunet-service-wdht_datacache.c:295
+#: src/dht/gnunet-service-xdht_datacache.c:334
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: 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:516
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:739
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-dht_neighbours.c:904
+#: src/dht/gnunet-service-xdht_neighbours.c:6056
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-xdht_neighbours.c:986
+msgid "# Messages dropped (CORE timeout)"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:967
+#: src/dht/gnunet-service-xdht_neighbours.c:1018
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
+#: src/dht/gnunet-service-dht_neighbours.c:1013
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:1047
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1304
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1451
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1480
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_neighbours.c:1490
+#: src/dht/gnunet-service-dht_neighbours.c:1614
+#: src/dht/gnunet-service-dht_neighbours.c:1721
+#: src/dht/gnunet-service-xdht_neighbours.c:1128
+#: src/dht/gnunet-service-xdht_neighbours.c:1197
+#: src/dht/gnunet-service-xdht_neighbours.c:1247
+#: src/dht/gnunet-service-xdht_neighbours.c:1311
+#: src/dht/gnunet-service-xdht_neighbours.c:1378
+#: src/dht/gnunet-service-xdht_neighbours.c:1440
+#: src/dht/gnunet-service-xdht_neighbours.c:1502
+#: src/dht/gnunet-service-xdht_neighbours.c:1564
+#: src/dht/gnunet-service-xdht_neighbours.c:1624
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1603
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1728
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1815
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1818
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1990
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:2093
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:2161
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:2175
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2261
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2264
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-wdht_nse.c:59
+#: src/dht/gnunet-service-xdht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:218
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:227
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:233
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:239
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:251
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:324
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:406
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:424
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
+#: src/dht/gnunet-service-wdht_datacache.c:82
+msgid "PUT request received, but have no datacache!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1831
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1836
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+"\n"
+"SUPU %s, %s, %d"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1856
 #, c-format
 msgid ""
 "\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1866
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+"\n"
 "SUPU %s, %s, %d,my_identity = %s"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1887
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
 msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
 "\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1903
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+"\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: 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
+#: src/dht/gnunet-service-xdht_neighbours.c:1909
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3555
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3696
+#: src/dht/gnunet-service-xdht_neighbours.c:3934
+#: src/dht/gnunet-service-xdht_neighbours.c:4086
+#: src/dht/gnunet-service-xdht_neighbours.c:4238
+#: src/dht/gnunet-service-xdht_neighbours.c:4419
+#: src/dht/gnunet-service-xdht_neighbours.c:4932
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5506
+#: src/dht/gnunet-service-xdht_neighbours.c:5610
+#: src/dht/gnunet-service-xdht_neighbours.c:5754
+#: src/dht/gnunet-service-xdht_neighbours.c:5843
+msgid "# Bytes received from other peers"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:256
 #, c-format
 msgid ""
 "\n"
-"SUPU %s, %s, %d"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, fuzzy, c-format
+msgid ""
 "\n"
-"SUPU %s, %s, %d"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, fuzzy, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+
+#: src/dht/plugin_block_dht.c:142
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:149
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:159
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -2105,35 +2415,35 @@
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:297
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:366
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:438
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2149,493 +2459,383 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
+#: src/dns/gnunet-service-dns.c:457
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:603
+#: src/dns/gnunet-service-dns.c:604
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:714
+#: src/dns/gnunet-service-dns.c:715
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
+#: src/dns/gnunet-service-dns.c:793
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
+#: src/dns/gnunet-service-dns.c:908
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
+#: src/dns/gnunet-service-dns.c:924
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
+#: src/dns/gnunet-service-dns.c:933
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:942
+#: src/dns/gnunet-service-dns.c:943
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
+#: src/dns/gnunet-service-dns.c:1010
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: 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"
+#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+msgid "need a valid IPv4 or IPv6 address\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"
+#: src/dns/gnunet-service-dns.c:1081
+#, c-format
+msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:169
+#: src/dv/gnunet-dv.c:167
 msgid "verbose output"
 msgstr "sortie verbeuse"
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:176
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:802
+#: src/exit/gnunet-daemon-exit.c:807
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:853
-msgid "# Bytes transmitted via mesh channels"
+#: src/exit/gnunet-daemon-exit.c:858
+msgid "# Bytes transmitted via cadet channels"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:975 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:1446
+#: src/vpn/gnunet-service-vpn.c:1837 src/vpn/gnunet-service-vpn.c:2000
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:1012 src/exit/gnunet-daemon-exit.c:2467
+#: src/exit/gnunet-daemon-exit.c:2725 src/vpn/gnunet-service-vpn.c:1502
+#: src/vpn/gnunet-service-vpn.c:1896 src/vpn/gnunet-service-vpn.c:2033
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1047
+#: src/exit/gnunet-daemon-exit.c:1052
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1054
+#: src/exit/gnunet-daemon-exit.c:1059
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1130
+#: src/exit/gnunet-daemon-exit.c:1135
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1204
+#: src/exit/gnunet-daemon-exit.c:1209
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1256
+#: src/exit/gnunet-daemon-exit.c:1262
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1270
+#: src/exit/gnunet-daemon-exit.c:1276
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1296
+#: src/exit/gnunet-daemon-exit.c:1302
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1329
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1369
+#: src/exit/gnunet-daemon-exit.c:1375
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1377
+#: src/exit/gnunet-daemon-exit.c:1383
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1759
+#: src/exit/gnunet-daemon-exit.c:1765
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:1878
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: 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"
+#: src/exit/gnunet-daemon-exit.c:1881 src/exit/gnunet-daemon-exit.c:1975
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2332
+#: src/exit/gnunet-daemon-exit.c:2582 src/exit/gnunet-daemon-exit.c:2872
+#: src/exit/gnunet-daemon-exit.c:2980
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:1915 src/exit/gnunet-daemon-exit.c:3004
 #, c-format
 msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1914
+#: src/exit/gnunet-daemon-exit.c:1920
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:1978
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2085
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2090
+#: src/exit/gnunet-daemon-exit.c:2099
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2150
+#: src/exit/gnunet-daemon-exit.c:2161
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2335
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2585
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
-#: src/vpn/gnunet-service-vpn.c:1954
+#: src/exit/gnunet-daemon-exit.c:2651 src/vpn/gnunet-service-vpn.c:1436
+#: src/vpn/gnunet-service-vpn.c:1994
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: 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
+#: src/exit/gnunet-daemon-exit.c:2710 src/vpn/gnunet-service-vpn.c:1472
+#: src/vpn/gnunet-service-vpn.c:1484 src/vpn/gnunet-service-vpn.c:1884
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2748
+#: src/exit/gnunet-daemon-exit.c:2761
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2875
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2983
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2995
+#: src/exit/gnunet-daemon-exit.c:3009
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3031
-msgid "# Inbound MESH channels created"
+#: src/exit/gnunet-daemon-exit.c:3047
+msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3334
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3371
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: 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"
+#: src/exit/gnunet-daemon-exit.c:3549
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: 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"
+#: src/exit/gnunet-daemon-exit.c:3565
+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:3542
-msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use 
ENABLE_IPv4=YES\n"
+#: src/exit/gnunet-daemon-exit.c:3573
+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:3548
-msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use 
ENABLE_IPv6=YES\n"
+#: src/exit/gnunet-daemon-exit.c:3580
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
-#: src/pt/gnunet-daemon-pt.c:1247
+#: src/exit/gnunet-daemon-exit.c:3586
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3592 src/exit/gnunet-daemon-exit.c:3757
+#: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3704
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3855
 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
-msgid "Failed to create statistics!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for 
%llu sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr ""
-
-#: 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/experimentation/gnunet-daemon-experimentation_experiments.c:435
-msgid "Invalid value for public key\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, c-format
-msgid "Connected to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, c-format
-msgid "Disconnected from peer %s\n"
-msgstr ""
-
-#: 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:270
+#: src/fragmentation/defragmentation.c:275
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
+#: src/fragmentation/defragmentation.c:468
+#: src/transport/plugin_transport_wlan.c:1528
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:538
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:534
+#: src/fragmentation/defragmentation.c:556
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
+#: src/fragmentation/fragmentation.c:240
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:211
+#: src/fragmentation/fragmentation.c:245
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:237
+#: src/fragmentation/fragmentation.c:274
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:281
+#: src/fragmentation/fragmentation.c:321
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
+#: src/fragmentation/fragmentation.c:327
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
+#: src/fragmentation/fragmentation.c:451
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
+#: src/fragmentation/fragmentation.c:458
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
+#: src/fragmentation/fragmentation.c:482
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:504
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:512
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1120
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1640
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1654
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2312
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2450 src/fs/fs_api.c:2698
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2483 src/fs/fs_api.c:2502 src/fs/fs_api.c:2994
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2688
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2937
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3032
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2645,7 +2845,9 @@
 msgstr ""
 
 #: src/fs/fs_download.c:322
-msgid "Recursive downloads of directories larger than 4 GB are not supported 
on 32-bit systems\n"
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
 #: src/fs/fs_download.c:342
@@ -2664,7 +2866,9 @@
 
 #: 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:1013
@@ -2690,13 +2894,15 @@
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1939
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: src/fs/fs_getopt.c:192
+#: src/fs/fs_getopt.c:197
 #, 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
@@ -2738,297 +2944,318 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: 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
+#: src/fs/fs_publish.c:705 src/fs/fs_publish.c:722 src/fs/fs_publish.c:761
+#: src/fs/fs_publish.c:782 src/fs/fs_publish.c:806 src/fs/fs_publish.c:1054
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:669
+#: src/fs/fs_publish.c:707
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:719
 msgid "unknown error"
 msgstr "erreur unconnue."
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:763
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:783
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:808
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:831
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:1008
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:1016
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:1056
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
-#, c-format
-msgid "Insufficient space for publishing: %s"
-msgstr ""
+#: src/fs/fs_publish.c:1295
+#, fuzzy, c-format
+msgid "Datastore failure: %s"
+msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1386
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:219
+#: src/fs/fs_publish_ksk.c:220
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:241
 msgid "Internal error."
 msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:806 src/fs/fs_search.c:876
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:935
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:59
+#: src/fs/fs_unindex.c:63
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:68
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:234
+#: src/fs/fs_unindex.c:245
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:242
+#: src/fs/fs_unindex.c:253
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:250
+#: src/fs/fs_unindex.c:261
 msgid "Invalid response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:291
+#: src/fs/fs_unindex.c:304
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
+#: src/fs/fs_unindex.c:360 src/fs/fs_unindex.c:372
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:355
+#: src/fs/fs_unindex.c:368
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:427
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
+#: src/fs/fs_unindex.c:590 src/fs/fs_unindex.c:654
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:639
+#: src/fs/fs_unindex.c:667
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:673
+#: src/fs/fs_unindex.c:706
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:223
 #, no-c-format
-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:282
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:300
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:307
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
 #: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:417
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:432
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:511
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
-msgid "LOC URI malformed (could not decode public key)"
+#: src/fs/fs_uri.c:526
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:536
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:544
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:552
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:558
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
-msgid "Unrecognized URI type"
-msgstr "Type d’URI non reconnu"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (wrong syntax for signature)"
+msgstr ""
 
-#: src/fs/fs_uri.c:860
-msgid "Lacking key configuration settings.\n"
+#: src/fs/fs_uri.c:573
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
-#, c-format
-msgid "Could not access hostkey file `%s'.\n"
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:597
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:631
+#, fuzzy
+msgid "invalid argument"
+msgstr "Argument invalide « %s »\n"
+
+#: src/fs/fs_uri.c:643
+msgid "Unrecognized URI type"
+msgstr "Type d’URI non reconnu"
+
+#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1078
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:237
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
+#: src/fs/gnunet-auto-share.c:310
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:413
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:500
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:510
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:719
 #, 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:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:809
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:656
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-directory.c:53
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-directory.c:105
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-directory.c:108
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-directory.c:143
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:156
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:154
+#: src/fs/gnunet-directory.c:165
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:183
+#: src/fs/gnunet-directory.c:194
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
@@ -3043,7 +3270,9 @@
 
 #: 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:179
@@ -3056,65 +3285,67 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:233
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:321
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
-msgid "Download files from GNUnet using a GNUnet CHK or LOC URI 
(gnunet://fs/chk/...)"
+#: src/fs/gnunet-download.c:338
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
 #: src/fs/gnunet-fs.c:117
@@ -3125,304 +3356,369 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:191
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:194
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:197
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:206
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:239
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publication de « %s » terminée.\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "L’URI est « %s ».\n"
 
-#: src/fs/gnunet-publish.c:283
-msgid "Cleanup after abort complete.\n"
+#: src/fs/gnunet-publish.c:259
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "L’URI est « %s ».\n"
+
+#: src/fs/gnunet-publish.c:275
+msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:282
+msgid "Cleanup after abort completed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:288
+msgid "Cleanup after abort failed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:430
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:435
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:589
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:614
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:648
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:652
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:658
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:665
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:670
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:677
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:686
 msgid "Internal error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:714
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:695
-msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs 
installed?\n"
+#: src/fs/gnunet-publish.c:761
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:817
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:830
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: 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
+#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
+#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
+#: src/fs/gnunet-publish.c:910
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: 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)"
+#: src/fs/gnunet-publish.c:914
+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:843
+#: src/fs/gnunet-publish.c:918
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
+#: src/fs/gnunet-publish.c:921
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
+#: src/fs/gnunet-publish.c:926
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:934
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
-msgid "only simulate the process but do not do any actual publishing (useful 
to compute URIs)"
+#: src/fs/gnunet-publish.c:940
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+#: src/fs/gnunet-publish.c:944
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: 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)"
+#: src/fs/gnunet-publish.c:948
+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:889
+#: src/fs/gnunet-publish.c:964
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
+#: src/fs/gnunet-search.c:120
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:191
+#: src/fs/gnunet-search.c:197
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:240
+#: src/fs/gnunet-search.c:245
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:264
+#: src/fs/gnunet-search.c:269
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:295
+#: src/fs/gnunet-search.c:300
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:303
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:305
+#: src/fs/gnunet-search.c:310
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:321
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:272
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: 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
+#: src/fs/gnunet-service-fs.c:729
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:755 src/hostlist/gnunet-daemon-hostlist.c:309
+#: src/topology/gnunet-daemon-topology.c:1250
+#: src/topology/gnunet-daemon-topology.c:1258
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cadet_client.c:490
+msgid "# replies received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_client.c:504
+msgid "# replies received via cadet dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:258
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:359
+msgid "# queries received via CADET not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:439
+msgid "# queries received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:483
+msgid "# cadet client connections rejected"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:489
+#: src/fs/gnunet-service-fs_cadet_server.c:529
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# Session TCP active"
+
+#: src/fs/gnunet-service-fs_cp.c:738
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:742
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:780
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:788
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:921
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:977
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:985
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:999
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:1047
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1118
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1143
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
+#: src/fs/gnunet-service-fs_cp.c:1251
+msgid "# requests dropped due to higher-TTL request"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1340
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1361
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
-msgid "# requests dropped due TTL underflow"
+#: src/fs/gnunet-service-fs_cp.c:1372
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1427
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1471
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1916
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3439,7 +3735,9 @@
 
 #: 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"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:275
@@ -3470,189 +3768,160 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:378
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:261
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:332
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:372
 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
-msgid "# mesh client connections rejected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-msgid "# mesh connections active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:273
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
+#: src/fs/gnunet-service-fs_pe.c:412
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/fs/gnunet-service-fs_pe.c:447
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:501
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:511
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:593
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:603
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:661 src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:848
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:315
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:411 src/fs/gnunet-service-fs_pr.c:671
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:852
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:889
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:898
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:913
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:930
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1060
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1088
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1126
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1192
-msgid "# Replies received from MESH"
+#: src/fs/gnunet-service-fs_pr.c:1258
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1310
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1331
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1383
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1398
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1407
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1422
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1436
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1454
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1481 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1690
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1552
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1666
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1755
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:678
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3670,20 +3939,20 @@
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:129
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:146
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:178
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
+#: src/gns/gns_api.c:392
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
 
@@ -3692,287 +3961,298 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:360
+#: src/gns/gnunet-bcd.c:362
 #, c-format
 msgid "Businesscard HTTP server starts on %llu\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:374
+#: src/gns/gnunet-bcd.c:376
 #, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:520
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:532
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:232
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:402
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:418
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:426
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:704
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:730
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:752
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:773
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:776
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:779
 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"
+#: src/gns/gnunet-dns2gns.c:782
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:798
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:231
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:312
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:460
 #, c-format
-msgid "Ego for `gns-master' not found, cannot perform lookup.  Did you run 
gnunet-gns-import.sh?\n"
+msgid ""
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:403
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:453
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:456
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:459
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:462
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:465
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:468
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:482
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
+#: src/gns/gnunet-gns-helper-service-w32.c:766
 #, 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"
+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:838
+#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, c-format
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:479
+#: src/gns/gnunet-gns-import.c:483
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: 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
+#: src/gns/gnunet-gns-proxy.c:109
+#: src/hostlist/gnunet-daemon-hostlist_client.c:529
+#: src/hostlist/gnunet-daemon-hostlist_client.c:746
+#: src/hostlist/gnunet-daemon-hostlist_client.c:752
+#: src/hostlist/gnunet-daemon-hostlist_client.c:804
+#: src/hostlist/gnunet-daemon-hostlist_client.c:813
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1030
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1035
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:846
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:869
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:892
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:905
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:920
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:930
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:954
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1099
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1631
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:1997
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2027
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2199
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2538
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2567
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2585 src/gns/gnunet-gns-proxy.c:2614
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2665
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:3003
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3105
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3146
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3168
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:928
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:936
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:969
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:919
-msgid "valid public key required"
-msgstr ""
-
 #: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
@@ -3981,571 +4261,604 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:648
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:659
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:851
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:993
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1353
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1888
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1912
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2123
+#: src/gns/gnunet-service-gns_resolver.c:2194
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
 #, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:423
+msgid "Ego for not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:697
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:359
+#, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:380
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:402
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:486
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:522
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:541
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:564
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:587
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:602
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:629
 #, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:645
+#, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:662
+#, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:686
+#: src/gnsrecord/plugin_gnsrecord_dns.c:702
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:174
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:210
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:219
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:1139
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:1148
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:1158
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:1169
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:990
-#, c-format
-msgid "Plugin `%s' not found\n"
+#: src/hello/hello.c:1187
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1195
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1210
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: 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"
+#: src/hostlist/gnunet-daemon-hostlist.c:272
+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:308
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
-msgid "bootstrap using hostlists (it is highly recommended that you always use 
this option)"
+#: src/hostlist/gnunet-daemon-hostlist.c:334
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:337
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:357
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:348
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:369
+#: src/hostlist/gnunet-daemon-hostlist_client.c:399
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/hostlist/gnunet-daemon-hostlist_client.c:402
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:390
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:655
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:685
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:727
 #, 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/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:866
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:880
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:906
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:914
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:967
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:975
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
+#: src/transport/plugin_transport_http_client.c:2282
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
 #, 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/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:182
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:207
 msgid "expired addresses encountered"
 msgstr ""
 
-#: 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
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:590
+#: src/peerinfo-tool/gnunet-peerinfo.c:389
+#: src/peerinfo-tool/gnunet-peerinfo.c:538
+#: src/topology/gnunet-daemon-topology.c:870
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:267
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:284
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:388
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:407
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:422
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:424
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:485
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/peerinfo-tool/gnunet-peerinfo.c:741
+#: src/transport/gnunet-service-transport.c:857
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:798
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:811
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:832
 #, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:852
 #, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:892
+#, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:163
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:182
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:325
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:328
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:331
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -s)"
+#: src/identity/gnunet-identity.c:334
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:337
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -e)"
+#: src/identity/gnunet-identity.c:340
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:349
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:361
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:438
+#: src/identity/gnunet-service-identity.c:669
+#: src/identity/gnunet-service-identity.c:777
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:445
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:515
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:646
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:685
+#: src/identity/gnunet-service-identity.c:794
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:828
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:901
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:913
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:357
-#, c-format
-msgid "Invalid target `%s'\n"
+#: src/identity/plugin_rest_identity.c:923
+msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:607
-#, c-format
-msgid "Invalid peer ID `%s'\n"
+#: src/identity-provider/gnunet-identity-token.c:101
+msgid "GNUid token"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:650
-#, c-format
-msgid "Invalid tunnel owner `%s'\n"
+#: src/identity-provider/gnunet-identity-token.c:104
+msgid "Print token contents"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+#: src/identity-provider/plugin_rest_identity_provider.c:1089
+msgid "Identity Token REST API initialized\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:807
-msgid "provide information about a particular connection"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-msgid "provide information about all peers"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:825
-msgid "provide information about a particular tunnel"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:828
-msgid "provide information about all tunnels"
-msgstr ""
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
-msgstr ""
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -4556,40 +4869,40 @@
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:107
 #, c-format
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:395
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:183
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr ""
+#: src/namecache/gnunet-namecache.c:193
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:201
 #, c-format
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:235
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4597,205 +4910,278 @@
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
+#: src/namecache/plugin_namecache_flat.c:119
+#: src/namecache/plugin_namecache_flat.c:244
+#: src/namestore/plugin_namestore_flat.c:179
+#: src/namestore/plugin_namestore_flat.c:351
+#, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:130
+#: src/namestore/plugin_namestore_flat.c:190
+#, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:145
+#: src/namestore/plugin_namestore_flat.c:202
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/namecache/plugin_namecache_flat.c:399
+msgid "flat plugin running\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:90
+#: src/namestore/plugin_namestore_postgres.c:97
 msgid "Failed to create indices\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:301
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:330
+#: src/namestore/plugin_rest_namestore.c:532
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/plugin_rest_namestore.c:541
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:475 src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:491
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:505 src/namestore/gnunet-namestore.c:517
+#: src/namestore/gnunet-namestore.c:529
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:626
+#: src/namestore/plugin_rest_namestore.c:565
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:665
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:945
+#: src/transport/gnunet-transport.c:1786
+#: src/transport/gnunet-transport-profiler.c:504
+#, c-format
+msgid "Service `%s' is not running\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:706
+#, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:717
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/plugin_rest_namestore.c:954
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: 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
+#: src/namestore/gnunet-namestore.c:725 src/namestore/gnunet-namestore.c:734
+#: src/namestore/gnunet-namestore.c:751 src/namestore/gnunet-namestore.c:773
+#: src/namestore/gnunet-namestore.c:813
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:726 src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:752 src/namestore/gnunet-namestore.c:774
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:743
+#: src/namestore/plugin_rest_namestore.c:635
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:763
+#: src/namestore/plugin_rest_namestore.c:653
+#: src/namestore/plugin_rest_namestore.c:693
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:799
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:814
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:842
 #, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:901
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:984
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:968
+#: src/namestore/plugin_rest_namestore.c:1011
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:1004
+#: src/namestore/plugin_rest_namestore.c:1051
 #, c-format
 msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1092
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1064
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1067
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1070
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:922
-msgid "expiration time for record to use (for adding only), \"never\" is 
possible"
+#: src/namestore/gnunet-namestore.c:1073
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1076
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1079
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1085
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1088
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1091
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1094
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1097
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
-msgid "create shadow record (only valid if all other records of the same type 
have expired"
+#: src/namestore/gnunet-namestore.c:1100
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1103
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:476
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:503
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:537
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:546
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:608
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:664
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:680
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:716
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:724
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:918
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:944
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:986
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -4808,6 +5194,18 @@
 msgid "Namestore failed to store record\n"
 msgstr ""
 
+#: src/namestore/plugin_namestore_flat.c:632
+msgid "flat file database running\n"
+msgstr ""
+
+#: src/namestore/plugin_rest_namestore.c:1176
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:159
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -4817,171 +5215,236 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:203
+#: src/nat/nat_auto.c:392
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat/nat_auto.c:393
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat/nat_auto.c:412
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:274
+#: src/nat/nat_auto.c:444
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
+#: src/nat/nat_auto.c:576
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat/nat_auto.c:594
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:413
+#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:716
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat/nat_auto.c:717
 msgid "upnpc not found\n"
 msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:749
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat/nat_auto.c:798
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:867
+#: src/nat/nat.c:1024
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:917
+#: src/nat/nat.c:1074
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat.c:1205
+#: src/nat/nat.c:1325
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1400
+#, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr ""
+
+#: src/nat/nat.c:1544
 msgid "malformed"
 msgstr "malformé"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
+#: src/nat/nat.c:1598
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1727 src/nat/nat.c:1740
 #, c-format
-msgid "Configuration requires `%s', but binary is not installed properly (SUID 
bit not set).  Option disabled.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
+#: src/nat/nat.c:1895
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat/nat.c:1911
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
+#: src/nat/nat.c:2002
+msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
+#: src/nat/nat.c:2004
+msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
-msgid "`external-ip' command not found\n"
+#: src/nat/nat.c:2006
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_mini.c:366
+#: src/nat/nat.c:2008
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:2010
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:2012
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat.c:2014
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat_mini.c:512
+#: src/nat/nat.c:2016
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_mini.c:540
+#: src/nat/nat.c:2018
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_mini.c:604
-msgid "`upnpc' command not found\n"
+#: src/nat/nat.c:2020
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
+#: src/nat/nat.c:2022
+msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat_test.c:351
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat/nat.c:2024
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_test.c:423
+#: src/nat/nat.c:2026
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:2028
+msgid "Could not determine interface with internal/local network address"
+msgstr ""
+
+#: src/nat/nat.c:2030
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:2032
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:2034
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:2036
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:2038
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
+#: src/nat/nat_mini.c:201
+msgid "`external-ip' command not found\n"
+msgstr ""
+
+#: src/nat/nat_mini.c:605
+msgid "`upnpc' command not found\n"
+msgstr ""
+
+#: src/nat/nat_test.c:460
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:117
+#: src/nat/nat_test.c:495
+msgid "NAT test failed to start NAT library\n"
+msgstr ""
+
+#: src/nse/gnunet-nse.c:116
 msgid "NSE service is not running\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
+#: src/nse/gnunet-nse.c:121
 msgid "Error while checking if NSE service is running or not\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
+#: src/nse/gnunet-nse.c:167
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
+#: src/nse/gnunet-nse-profiler.c:860
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: 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
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: src/nse/gnunet-nse-profiler.c:869
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:876
+#: src/nse/gnunet-nse-profiler.c:875
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1533
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -4995,275 +5458,346 @@
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:371
-#: src/peerinfo/gnunet-service-peerinfo.c:388
+#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:401
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:481
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:519
 #, 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:653
+#: src/peerinfo/gnunet-service-peerinfo.c:675
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:681
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1056
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1375
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1388
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:361
 msgid "failed to transmit request (service down?)"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:516
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: 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
+#: src/peerinfo/peerinfo_api.c:560 src/peerinfo/peerinfo_api.c:583
+#: src/peerinfo/peerinfo_api.c:600 src/peerinfo/peerinfo_api.c:613
+#: src/peerinfo/peerinfo_api.c:628
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:715
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/peerinfo/peerinfo_api_notify.c:267
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:243
 #, c-format
 msgid "%sPeer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:250
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:303
 #, c-format
-msgid "Failure: Did not receive %s\n"
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:470
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:484
 #, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:503
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:573
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#: src/peerinfo-tool/gnunet-peerinfo.c:700
 #, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
+msgid "Failed to get my own HELLO from this peer!\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:732
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:844
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:885
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:888
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:891
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:894
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:903
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:920
 msgid "Print information about peers."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/postgres/postgres.c:59
+#: src/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:384
+msgid "Malformed iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:391
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:451
+msgid "Malformed store request from client\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:459
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:478
+msgid "Failed to store requested value, database error."
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:557
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:568
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
+
+#: src/peerstore/peerstore_api.c:329
 #, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:374
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:677
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:688
+msgid "Error communicating with `PEERSTORE' service."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:707
+msgid "Received a malformed response from service."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:819
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:831
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/psycstore/plugin_psycstore_sqlite.c:282
+#, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/psycstore/plugin_psycstore_sqlite.c:259
+#, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:504
+#, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr ""
+
+#: src/postgres/postgres.c:63
+#, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/postgres/postgres.c:148
+#: src/postgres/postgres.c:166
 #, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 msgid "Failed to test membership!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 msgid "Failed to store fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:364
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:422
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:453
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:481
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: 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/psycstore/gnunet-service-psycstore.c:664
+#, fuzzy, c-format
+msgid "Failed to begin modifying state: %d\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:408
-msgid "Failed to begin modifying state!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:674
+#, fuzzy, c-format
+msgid "Failed to modify state: %d\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
-#, c-format
-msgid "Unknown operator: %c\n"
+#: src/psycstore/gnunet-service-psycstore.c:682
+msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:441
-msgid "Failed to end modifying state!\n"
+#: src/psycstore/gnunet-service-psycstore.c:713
+msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:727
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:744
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:764
+#: src/psycstore/gnunet-service-psycstore.c:783
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:806
+#: src/psycstore/gnunet-service-psycstore.c:857
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:833
+#: src/psycstore/gnunet-service-psycstore.c:872
 msgid "Failed to get state variable!\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
+#: src/psycstore/plugin_psycstore_sqlite.c:61
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr ""
-
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1924
 msgid "SQLite database running\n"
 msgstr ""
 
@@ -5287,117 +5821,117 @@
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:824
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:881
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS mesh channel down)"
+#: src/pt/gnunet-daemon-pt.c:886
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:894
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:967
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:983
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: 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
+#: src/pt/gnunet-daemon-pt.c:1257 src/pt/gnunet-daemon-pt.c:1266
+#: src/pt/gnunet-daemon-pt.c:1286 src/pt/gnunet-daemon-pt.c:1297
+#: src/pt/gnunet-daemon-pt.c:1306
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1343
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/regex/gnunet-regex-simulation-profiler.c:656
 #, 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 mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-profiler.c:1284
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1299
+#: src/regex/gnunet-regex-profiler.c:1295
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1324
+#: src/regex/gnunet-regex-simulation-profiler.c:619
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1330
+#: src/regex/gnunet-regex-simulation-profiler.c:626
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1337
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1346
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1454
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1457
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1460
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1463
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:686
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:689
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:702
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -5406,509 +5940,408 @@
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/rest/gnunet-rest-server.c:792
+msgid "listen on specified port (default: 7776)"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:809
+msgid "GNUnet REST server"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:124
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:135
 msgid "Internal error\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:161
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:166
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:171
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:176
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:181
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:292
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:322
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:343
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:363
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:373
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:405
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:421
-msgid "Testing and revoking at the same time is not allowed, only executing 
test.\n"
+#: src/revocation/gnunet-revocation.c:419
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:439
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:461
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:486
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:502
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
-msgid "revoke the private key associated for the the private key associated 
with the ego NAME "
+#: src/revocation/gnunet-revocation.c:505
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:508
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:511
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
+#: src/revocation/gnunet-service-revocation.c:481
+msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:434
-#, c-format
-msgid "Error computing revocation set union with %s\n"
+#: src/revocation/gnunet-service-revocation.c:490
+msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
-msgid "SET service crashed, terminating revocation service\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:812
-msgid "Could not open revocation database file!"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:225
-msgid "You must specify at least one message ID to check!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:232
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:239
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/revocation/gnunet-service-revocation.c:495
 #, c-format
-msgid "Tried to set initiator mode, as peer ID was given. However, `%s' is not 
a valid peer identifier.\n"
+msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, c-format
-msgid "Could not convert `%s' to int32_t.\n"
+#: src/revocation/gnunet-service-revocation.c:499
+msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:286
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/revocation/gnunet-service-revocation.c:508
+msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
-#, c-format
-msgid "Could not convert `%s' to integer.\n"
+#: src/revocation/gnunet-service-revocation.c:545
+#: src/revocation/gnunet-service-revocation.c:776
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
-msgid "A comma separated list of elements to compare as vector with our remote 
peer."
+#: src/revocation/gnunet-service-revocation.c:868
+msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
-msgid "A comma separated mask to select which elements should actually be 
compared."
+#: src/rps/gnunet-rps.c:185
+msgid "Seed a PeerID"
 msgstr ""
 
-#: 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."
+#: src/scalarproduct/gnunet-scalarproduct.c:220
+msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
-msgid "Transaction ID shared with peer."
+#: src/scalarproduct/gnunet-scalarproduct.c:227
+msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
+#: src/scalarproduct/gnunet-scalarproduct.c:240
 #, c-format
-msgid "Client (%p) disconnected from us.\n"
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
 
-#: 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"
+#: src/scalarproduct/gnunet-scalarproduct.c:258
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
+#: src/scalarproduct/gnunet-scalarproduct.c:280
 #, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: 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-service-scalarproduct.c:1028
+#: src/scalarproduct/gnunet-scalarproduct.c:325
 #, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
-msgid "Transmitting service request.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:349
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
-msgid "Could not send service-request multipart message to channel!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:352
+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-service-scalarproduct.c:1147
-#, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:355
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
-msgid "Could not send message to channel!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:364
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-msgid "Too short message received from client!\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
-msgid "Invalid message received from client, session information incorrect!\n"
+#: src/scalarproduct/scalarproduct_api.c:296
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
-#, c-format
-msgid "Duplicate session information received, cannot create new session with 
key `%s'\n"
-msgstr ""
-
-#: 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/scalarproduct/gnunet-service-scalarproduct.c:1354
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
-msgstr ""
-
-#: 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/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/scalarproduct/gnunet-service-scalarproduct.c:1439
-#, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
-
-#: 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/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/scalarproduct/gnunet-service-scalarproduct.c:1771
-#, c-format
-msgid "Got message with duplicate session key (`%s'), ignoring service 
request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
-msgid "Shutting down, initiating cleanup.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
-msgid "Connect to MESH failed\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
-msgid "Mesh initialized\n"
-msgstr ""
-
-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
-msgstr ""
-
-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
-msgstr ""
-
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr ""
-
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
-msgid "Failed to send a message to the statistics service\n"
-msgstr ""
-
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
+#: src/secretsharing/gnunet-secretsharing-profiler.c:611
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
+#: src/secretsharing/gnunet-secretsharing-profiler.c:617
 msgid "threshold"
 msgstr "threshold"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1431
-msgid "Could not connect to mesh service\n"
+#: src/set/gnunet-service-set.c:2015
+msgid "Could not connect to cadet service\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/set/gnunet-set-ibf-profiler.c:249
 msgid "number of element in set A-B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/set/gnunet-set-ibf-profiler.c:252
 msgid "number of element in set B-A"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:255
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:258
 msgid "hash num"
 msgstr "numéro de hash"
 
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:261
 msgid "ibf size"
 msgstr "taille ibz"
 
-#: src/set/gnunet-set-profiler.c:295
-msgid "oeration to execute"
+#: src/set/gnunet-set-profiler.c:383
+msgid "operation to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:434
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-statistics.c:145
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:148
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:201
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:232
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:240
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:266
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:279
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:287
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:320
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:346
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:349
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:352
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:355
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:358
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:361
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:364
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:376
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:515
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1090
-msgid "Failed to receive acknowledgement from statistics service, some 
statistics might have been lost!\n"
+#: src/statistics/statistics_api.c:1082
+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"
+#: src/testbed/generate-underlay-topology.c:225
+msgid "Need at least 2 arguments\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, c-format
 msgid "Invalid topology: %s\n"
 msgstr "Topologie invalide : %s\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:261
 #, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:289
 #, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:335
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:338
+#: src/testbed/gnunet-testbed-profiler.c:291
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:347
 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"
@@ -5923,41 +6356,45 @@
 "\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:325
+#: src/testbed/gnunet-daemon-latency-logger.c:322
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
-msgid "Daemon to restrict incoming transport layer connections during testbed 
deployments"
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
 msgstr ""
 
 #: 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
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:475
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:732
 #, c-format
-msgid "Cannot open %s for writing load statistics.  Not logging load 
statistics\n"
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1057
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -5966,22 +6403,20 @@
 msgid "Waiting for child to exit.\n"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:248
 #, c-format
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: 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:296
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: 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"
+#: src/testbed/gnunet-testbed-profiler.c:297
+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:415
@@ -6004,7 +6439,7 @@
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
+#: src/testbed/testbed_api_hosts.c:1590
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr ""
@@ -6013,92 +6448,96 @@
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:987
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1052
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1141
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1145
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1183
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1201
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1261
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1273
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1297
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1347
 #, 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:1365
+#: src/testbed/testbed_api_testbed.c:1363
 #, 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:960
+#: src/testbed/testbed_api_topology.c:966
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:974
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:982
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1004
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1013
+#: src/testbed/testbed_api_topology.c:1037
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1019
+#: src/testbed/testbed_api_topology.c:1043
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1025
+#: src/testbed/testbed_api_topology.c:1049
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1083
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
@@ -6122,7 +6561,9 @@
 msgstr ""
 
 #: src/testing/gnunet-testing.c:359
-msgid "number of unique configuration files to create, or number of the 
hostkey to extract"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 
 #: src/testing/gnunet-testing.c:361
@@ -6150,50 +6591,52 @@
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:720
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1157
+#: src/testing/testing.c:1163
 #, 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:1166
+#: src/testing/testing.c:1172
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing.c:1176
+#: src/testing/testing.c:1182
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1189
+#: src/testing/testing.c:1195
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1203
+#: src/testing/testing.c:1209
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1215
+#: src/testing/testing.c:1221
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1240
+#: src/testing/testing.c:1246
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1342
+#: src/testing/testing.c:1348
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1710
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
@@ -6208,458 +6651,466 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
-msgid "# connect requests issued to transport"
+#: src/topology/gnunet-daemon-topology.c:349
+msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:734
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:931
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:964
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:971
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1057
-msgid "Fewer friends specified than required by minimum friend count. Will 
only connect to friends.\n"
+#: src/topology/gnunet-daemon-topology.c:1003
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
-msgid "More friendly connections required than target total number of 
connections.\n"
+#: src/topology/gnunet-daemon-topology.c:1009
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1043
+#: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1288
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:284
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:279
+#: src/transport/gnunet-service-transport_blacklist.c:293
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:500
+#: src/transport/gnunet-service-transport_blacklist.c:851
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:220
+#: src/transport/gnunet-service-transport_blacklist.c:855
+#, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:231
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:424
+#: src/transport/gnunet-service-transport.c:383
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:515
+#: src/transport/gnunet-service-transport.c:478
 msgid "# bytes payload received"
 msgstr ""
 
-#: 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: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:1084
+#: src/transport/gnunet-service-transport.c:823
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: 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_clients.c:439
+#: src/transport/gnunet-service-transport_clients.c:523
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: 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_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:845
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
-#, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#: src/transport/gnunet-service-transport_hello.c:195
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:776
-#, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:805
+#, fuzzy
+msgid "# session creation failed"
+msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_clients.c:801
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:1048
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:815
-#, c-format
-msgid "Received a request connect message for peer `%s'\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1168
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:826
-msgid "# REQUEST DISCONNECT messages received"
-msgstr ""
-
-#: 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_hello.c:181
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1095
-msgid "# DISCONNECT messages sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1458
+msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1512
+msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1557
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1566
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1574
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
-msgid "# messages discarded due to lack of neighbour record"
+#: src/transport/gnunet-service-transport_neighbours.c:1583
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1588
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_neighbours.c:1594
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
-#, c-format
-msgid "Failed to send CONNECT message to peer `%s' using address `%s' session 
%p\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1661
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1695
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
-msgid "# SESSION_CONNECT messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1710
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
-#, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1830
+#, fuzzy, c-format
+msgid "Failed to send SYN message to peer `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1794
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1850
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
-#, c-format
-msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' 
session %p\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1889
+msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
-msgid "# CONNECT_ACK messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1906
+#, fuzzy, c-format
+msgid "Failed to transmit SYN message to %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1936
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
-#, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2055
+msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
-msgid "# CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2072
+#, fuzzy, c-format
+msgid "Failed to transmit SYN_ACK message to %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2228
+msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2599
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
-msgid "# Failed attempts to switch addresses (no response)"
+#: src/transport/gnunet-service-transport_neighbours.c:3081
+msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-msgid "# CONNECT_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3089
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3131
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3143
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3168
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3181
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
-msgid "# SESSION_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3357
+msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
-msgid "# unexpected SESSION_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3393
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3481
+msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
-msgid "# disconnects due to quota of 0"
+#: src/transport/gnunet-service-transport_neighbours.c:3488
+msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3528
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3535
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3546
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3680
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: 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
+#: 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
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:343
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: 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"
+#: src/transport/gnunet-service-transport_validation.c:452
+#: src/transport/gnunet-service-transport_validation.c:638
+#: src/transport/gnunet-service-transport_validation.c:950
+#: src/transport/gnunet-service-transport_validation.c:1552
+msgid "# validations running"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:616
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:493
+msgid "# address records discarded (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:722
+#: src/transport/gnunet-service-transport_validation.c:541
+msgid "# address records discarded (blacklist)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:629
+msgid "# PINGs for address validation sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:709
+msgid "# validations delayed by global throttle"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:746
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1011
+#: src/transport/gnunet-service-transport_validation.c:1076
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/transport/gnunet-service-transport_validation.c:1127
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1140
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1143
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1083
+#: src/transport/gnunet-service-transport_validation.c:1151
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1095
+#: src/transport/gnunet-service-transport_validation.c:1164
 #, 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
+#: src/transport/gnunet-service-transport_validation.c:1219
 #, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: 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:1206
+#: src/transport/gnunet-service-transport_validation.c:1270
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1215
+#: src/transport/gnunet-service-transport_validation.c:1279
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1460
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
-#, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1515
+msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-transport.c:558
 #, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:367
-#, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:567
+#: src/transport/gnunet-transport-profiler.c:282
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:608
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:623
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:635
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:559
+#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
 #, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:667
+#, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:672
+#, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:677
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/transport/gnunet-transport.c:682
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:807
+#, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -6667,329 +7118,403 @@
 "\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:586
+#: src/transport/gnunet-transport.c:842
 #, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:712
+#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:993
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:1007
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:1032
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/transport/gnunet-transport.c:1078
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:1107
 #, c-format
-msgid "Successfully connected to `%s'\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:1144
+#: src/transport/gnunet-transport-profiler.c:439
 #, c-format
-msgid "Successfully connected to `%s', starting to send benchmark data in %u 
Kb blocks\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
+#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
 #, c-format
-msgid "Successfully disconnected from `%s'\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:888
-#, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:1171
+msgid "Connected to"
+msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:1197
+msgid "Disconnected from"
+msgstr "Déconnecté de"
+
+#: src/transport/gnunet-transport.c:1221
+#: src/transport/gnunet-transport-profiler.c:464
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:1261
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:1273
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
-msgid "Failed to send connect request to transport service\n"
+#: src/transport/gnunet-transport.c:1809
+#, c-format
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1817
 #, c-format
-msgid "Multiple operations given. Please choose only one operation: %s, %s, 
%s, %s, %s, %s\n"
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
-#, c-format
-msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, 
%s\n"
+#: src/transport/gnunet-transport.c:1840
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: 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"
+#: src/transport/gnunet-transport.c:1846
+msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
-msgid "Failed to send request to transport service\n"
+#: src/transport/gnunet-transport.c:1865 src/transport/gnunet-transport.c:1884
+#: src/transport/gnunet-transport.c:1942
+#: src/transport/gnunet-transport-profiler.c:560
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1381
+#: src/transport/gnunet-transport.c:1889
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
-msgid "print information for all peers (instead of only connected peers )"
+#: src/transport/gnunet-transport.c:1990
+msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1993
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
-msgid "connect to a peer"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1474
+#: src/transport/gnunet-transport.c:1996
 msgid "disconnect to a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1477
+#: src/transport/gnunet-transport.c:1999
 msgid "print information for all pending validations "
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1480
-msgid "print information for all pending validations continously"
+#: src/transport/gnunet-transport.c:2002
+msgid "print information for all pending validations continuously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:2005
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1489
-msgid "provide information about all connects and disconnect events 
(continuously)"
+#: src/transport/gnunet-transport.c:2011
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:2014
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:2017
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
+#: src/transport/gnunet-transport.c:2020
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2023
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
+#: src/transport/gnunet-transport.c:2026
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:2037
+#: src/transport/gnunet-transport-profiler.c:637
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:226
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-msgid "# Bluetooth messages defragmented"
+#: src/transport/gnunet-transport-profiler.c:262
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: 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"
+#: src/transport/gnunet-transport-profiler.c:271
+#, c-format
+msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-msgid "# Bluetooth message fragments sent"
+#: src/transport/gnunet-transport-profiler.c:288
+msgid "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:341
+msgid "."
 msgstr ""
 
-#: 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"
+#: src/transport/gnunet-transport-profiler.c:361
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
-msgid "# HELLO messages received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:411
+#, c-format
+msgid "Connected to different peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1331
-msgid "# fragments received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:418
+#, c-format
+msgid "Successfully connected to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1341
-msgid "# ACKs received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:480
+#, c-format
+msgid "Denying connection to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1401
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#: src/transport/gnunet-transport-profiler.c:510
+msgid "Message size too big!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1512
-msgid "# DATA messages received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:516
+msgid "No peer identity given\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1547
-msgid "# Bluetooth DATA messages processed"
+#: src/transport/gnunet-transport-profiler.c:531
+#, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1610
-msgid "# HELLO beacons sent via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:537
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "Dernier message reçu de %s\n"
+
+#: src/transport/gnunet-transport-profiler.c:542
+msgid "No operation given\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
+#: src/transport/gnunet-transport-profiler.c:549
+msgid "Failed to connect to ATS service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/gnunet-transport-profiler.c:611
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/gnunet-transport-profiler.c:614
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:620
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1482
+#: src/transport/plugin_transport_http_server.c:2247
+#: src/transport/plugin_transport_http_server.c:3433
+#: src/transport/plugin_transport_tcp.c:2985
+#: src/transport/plugin_transport_tcp.c:2992
+msgid "TCP_STEALTH not supported on this platform.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:2123
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:2172
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_server.c:3218
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:2223
 #, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1733
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:1965
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:1973
 #, 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:1958
-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:2123
+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:1982
+#: src/transport/plugin_transport_http_server.c:2146
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2273
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2582
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
+#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2747
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_udp.c:3604
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:2924
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:2939
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2945
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:2956
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:2962
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:2976
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2794
+#: src/transport/plugin_transport_http_server.c:2986
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:3008
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_http_server.c:3018
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:3081
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2893
+#: src/transport/plugin_transport_http_server.c:3102
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:3119
+#, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:3445
+msgid "Unable to compile URL regex\n"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7032,225 +7557,248 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:672
+#: src/transport/plugin_transport_tcp.c:1983
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:1079
+#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:3106
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1185
+#: src/transport/plugin_transport_tcp.c:1258
+#: src/transport/plugin_transport_tcp.c:1358
+#: src/transport/plugin_transport_tcp.c:1383
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:900
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1188
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1262
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: 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
+#: src/transport/plugin_transport_tcp.c:1653
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1821
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:2312
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:2503
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279
+#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:2612
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_tcp.c:2558
+msgid "# TCP server connect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2564
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2566
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2606
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2616
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
-#: src/util/service.c:588
+#: src/transport/plugin_transport_tcp.c:2919 src/util/service.c:584
+#: src/util/service.c:590
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:2935
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:3094
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:3098
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:3102
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:167
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:170
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:210
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:546
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: 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_broadcasting.c:626
+#: src/transport/plugin_transport_udp_broadcasting.c:567
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:3344
 #, c-format
-msgid "Trying to create session for address of unexpected length %u (should be 
%u or %u)\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:2602
-#, c-format
-msgid "UDP could not transmit message to `%s': Network seems down, please 
check your network configuration\n"
+#: src/transport/plugin_transport_udp.c:3358
+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: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"
+#: src/transport/plugin_transport_udp.c:3680
+#: src/transport/plugin_transport_udp.c:3779
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_udp.c:3698
+msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3789
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3056
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/plugin_transport_udp.c:3861
+#: src/transport/plugin_transport_udp.c:3875
+msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
-#, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr ""
+#: src/transport/plugin_transport_udp.c:3907
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3168
-msgid "Failed to create network sockets, plugin failed\n"
+#: src/transport/plugin_transport_udp.c:3934
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "adresse invalide"
+
+#: src/transport/plugin_transport_udp.c:4000
+msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1407
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1652
-msgid "No UNIXPATH given in configuration!\n"
+#: src/transport/plugin_transport_unix.c:1420
+#, c-format
+msgid "Cannot bind to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1688
+#: src/transport/plugin_transport_unix.c:1820
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:742
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
+#: src/transport/plugin_transport_wlan.c:762
+msgid "# Messages defragmented"
 msgstr ""
 
-#: 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:803
+#: src/transport/plugin_transport_wlan.c:888
+#, fuzzy
+msgid "# Sessions allocated"
+msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
+#: src/transport/plugin_transport_wlan.c:1009
+msgid "# message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:1038
+msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: 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"
+#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:2279
+msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1541
+msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1610
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1714
+msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1831
+msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1865
+msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1553
-msgid "# WLAN DATA messages processed"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/plugin_transport_wlan.c:2254
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/plugin_transport_wlan.c:2276
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# Session TCP active"
+
+#: src/transport/transport_api.c:816
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:584
+#: src/transport/transport-testing.c:680
 msgid "Failed to initialize testing library!\n"
 msgstr ""
 
-#: src/tun/regex.c:129
+#: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
 msgstr "Masque érroné : %d\n"
@@ -7284,205 +7832,196 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
+#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
+#: src/util/client.c:268 src/util/client.c:895 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/util/client.c:360
+#: src/util/client.c:367
 #, c-format
-msgid "Could not determine valid hostname and port for service `%s' from 
configuration.\n"
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:375
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
+#: src/util/client.c:1040
 #, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr ""
 
-#: src/util/client.c:1020
+#: src/util/client.c:1052
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1303
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
-#: src/util/common_logging.c:254 src/util/common_logging.c:1039
+#: src/util/common_logging.c:255 src/util/common_logging.c:1062
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1037
+#: src/util/common_logging.c:257 src/util/common_logging.c:1060
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1035
+#: src/util/common_logging.c:259 src/util/common_logging.c:1058
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1033
+#: src/util/common_logging.c:261 src/util/common_logging.c:1056
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1041
+#: src/util/common_logging.c:263 src/util/common_logging.c:1064
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:391
+#: src/util/common_logging.c:840
 #, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr ""
-
-#: 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:1042
+#: src/util/common_logging.c:1065
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1157
+#: src/util/common_logging.c:1181
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1223
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1241
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1262
 #, 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:288
+#: src/util/configuration.c:291
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:1028
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1147
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1179
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1253
 #, c-format
-msgid "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor 
defined as an environmental variable\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/connection.c:423
+#: src/util/connection.c:429
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:438
+#: src/util/connection.c:446
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:553
+#: src/util/container_bloomfilter.c:531
 #, c-format
-msgid "Failed to establish TCP connection to `%s:%u', no further addresses to 
try.\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/crypto_ecc.c:756
 #, c-format
-msgid "Trying to connect to `%s' (%p)\n"
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/connection.c:910
+#: src/util/crypto_ecc.c:806
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/crypto_ecc.c:880
 #, c-format
-msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, 
have %llu)\n"
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc.c:937
 #, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr ""
+
+#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:160
+#: src/util/crypto_ecc_setup.c:278 src/util/crypto_ecc_setup.c:316
+#, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:283
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:320
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:350
 #, 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.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc_setup.c:198 src/util/crypto_ecc_setup.c:354
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc_setup.c:413
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_random.c:284
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_rsa.c:1146
 #, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/disk.c:1228
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:1301
-#, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/crypto_random.c:284
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr ""
-
-#: src/util/disk.c:1184
-#, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/disk.c:1451 src/util/service.c:1327
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -7547,62 +8086,77 @@
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:91
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
+#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:298
+#: src/util/getopt_helpers.c:308
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:90
+#: src/util/gnunet-config.c:111
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:133
+#: src/util/gnunet-config.c:113
 #, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:157
+#, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:184
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:163
+#: src/util/gnunet-config.c:187
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:166
+#: src/util/gnunet-config.c:190
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:169
+#: src/util/gnunet-config.c:193
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:178
+#: src/util/gnunet-config.c:196
+msgid "print available configuration sections"
+msgstr ""
+
+#: src/util/gnunet-config.c:205
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:84
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:120
 #, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:133
+#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:174
 #, c-format
 msgid ""
 "\n"
@@ -7609,7 +8163,7 @@
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
@@ -7618,7 +8172,7 @@
 "\n"
 "Terminé !\n"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:187
 #, c-format
 msgid ""
 "\n"
@@ -7625,50 +8179,46 @@
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:280
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:291
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:364
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:414
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:417
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:420
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:423
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:426
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:437
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -7680,175 +8230,182 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:234
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:295
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:298
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:301
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:304
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:316
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:327
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:401
+#: src/util/gnunet-service-resolver.c:442
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-uri.c:88
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-uri.c:95
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-uri.c:105
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:168
+#: src/util/gnunet-uri.c:167
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:340
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:383
+#: src/util/helper.c:386
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:609
+#: src/util/helper.c:616
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1731 src/util/network.c:1907
 #, 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:421
+#: src/util/os_installation.c:500
 #, 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:766
+#: src/util/os_installation.c:860
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:826
+#: src/util/os_installation.c:920
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:836
+#: src/util/os_installation.c:930
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/util/plugin.c:86
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:151
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:223
+#: src/util/plugin.c:226
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:382
+#: src/util/plugin.c:385
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:246 src/util/service.c:1452
+#: src/util/program.c:248 src/util/service.c:1461
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/program.c:260 src/util/service.c:1476
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:263 src/util/service.c:1462
+#: src/util/program.c:265 src/util/service.c:1471
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:204
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:216
+#: src/util/resolver_api.c:223
 #, c-format
-msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in 
configuration!\n"
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
+#: src/util/resolver_api.c:357
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:352
+#: src/util/resolver_api.c:364
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:908
-#, c-format
-msgid "Could not resolve our FQDN : %s\n"
+#: src/util/resolver_api.c:952
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/scheduler.c:813
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
+#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
+#: src/util/resolver_api.c:1063
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/scheduler.c:948
+#: src/util/server.c:483
 #, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
-#: src/util/server.c:484
-#, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
@@ -7862,9 +8419,11 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:892
+#: src/util/server.c:902
 #, c-format
-msgid "Processing code for message of type %u did not call 
`GNUNET_SERVER_receive_done' after %s\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:347
@@ -7877,77 +8436,80 @@
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:409
+#: src/util/service.c:410
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:446
+#: src/util/service.c:448
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:563
+#: src/util/service.c:565
 #, c-format
-msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: 
%s\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:653
+#: src/util/service.c:656
 #, c-format
-msgid "Disabling UNIX domain socket support for service `%s', failed to create 
UNIX domain socket: %s\n"
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:669
+#: src/util/service.c:673
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:903
+#: src/util/service.c:912
 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
+#: src/util/service.c:961 src/util/service.c:979
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:995
+#: src/util/service.c:1004
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1174
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1207
+#: src/util/service.c:1216
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1265
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1260
+#: src/util/service.c:1269
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1264
+#: src/util/service.c:1273
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1319
+#: src/util/service.c:1328
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/util/service.c:1332
+#: src/util/service.c:1341
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1402
+#: src/util/service.c:1411
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -7956,220 +8518,235 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:145
+#: src/util/socks.c:597
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/util/socks.c:610
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgstr ""
+
+#: src/util/strings.c:146
 msgid "b"
 msgstr "o"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:437
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:565
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:658
+#: src/util/strings.c:662
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:666
 msgid "forever"
 msgstr "perpetuel"
 
-#: src/util/strings.c:664
+#: src/util/strings.c:668
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:674
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:680
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:686
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:692
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:699
 msgid "day"
 msgstr "jour"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:701
 msgid "days"
 msgstr "jours"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:730
 msgid "end of time"
 msgstr "fin du temps"
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1229
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1237
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1243
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1250
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1259
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1465 src/util/strings.c:1481
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1490
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1573 src/util/strings.c:1604 src/util/strings.c:1652
+#: src/util/strings.c:1673
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1630
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1682
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1734
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1784
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1815
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+#: src/vpn/gnunet-service-vpn.c:556 src/vpn/gnunet-service-vpn.c:1113
 msgid "# Active channels"
 msgstr "# Canaux actifs"
 
-#: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
+#: src/vpn/gnunet-service-vpn.c:632
+msgid "# Bytes given to cadet for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:670
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:753
-msgid "# Mesh channels created"
+#: src/vpn/gnunet-service-vpn.c:781
+msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:784
-msgid "Failed to setup mesh channel!\n"
-msgstr ""
+#: src/vpn/gnunet-service-vpn.c:809
+#, fuzzy
+msgid "Failed to setup cadet channel!\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:978
+#: src/vpn/gnunet-service-vpn.c:1008
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1305
+#: src/vpn/gnunet-service-vpn.c:1133
+msgid "# Packets dropped (channel not yet online)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1344
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1326
+#: src/vpn/gnunet-service-vpn.c:1365
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1531
+#: src/vpn/gnunet-service-vpn.c:1571
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1604 src/vpn/gnunet-service-vpn.c:1640
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1610
+#: src/vpn/gnunet-service-vpn.c:1650
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1624
+#: src/vpn/gnunet-service-vpn.c:1664
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:1746
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:2086
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:2242
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2351
+#: src/vpn/gnunet-service-vpn.c:2394
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2449
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
+#: src/vpn/gnunet-service-vpn.c:2491 src/vpn/gnunet-service-vpn.c:2702
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2715
+#: src/vpn/gnunet-service-vpn.c:2753
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:3017
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3041
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3049
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3062
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3075
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3085
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8238,18 +8815,21 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
+#: src/include/gnunet_common.h:655
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:667
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
+
+#~ msgid "Received %s message\n"
+#~ msgstr "%s message(s) reçu(s)\n"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2016-04-19 11:25:51 UTC (rev 37056)
+++ gnunet/po/sv.po     2016-04-19 11:50:49 UTC (rev 37057)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2015-10-11 21:29+0200\n"
+"POT-Creation-Date: 2016-04-18 17:19+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,11 +16,11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:337
+#: src/arm/arm_api.c:336
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/arm_monitor_api.c:321
+#: src/arm/arm_monitor_api.c:324
 msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
@@ -35,143 +35,143 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
+#: src/arm/gnunet-arm.c:217
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:223
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:261
 #, 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
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:367
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:377
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:419
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:429
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:515
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:523
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:528
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
@@ -234,7 +234,7 @@
 msgstr ""
 
 #: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:746
@@ -264,65 +264,65 @@
 msgid "Could not send list result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:542
+#: src/arm/gnunet-service-arm.c:581
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:553
+#: src/arm/gnunet-service-arm.c:592
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:653
+#: src/arm/gnunet-service-arm.c:693
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:677
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:713
+#: src/arm/gnunet-service-arm.c:753
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:853
+#: src/arm/gnunet-service-arm.c:891
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1123
+#: src/arm/gnunet-service-arm.c:1160
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1281
+#: src/arm/gnunet-service-arm.c:1324
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1286
+#: src/arm/gnunet-service-arm.c:1329
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1291
+#: src/arm/gnunet-service-arm.c:1334
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1297
+#: src/arm/gnunet-service-arm.c:1340
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1319
+#: src/arm/gnunet-service-arm.c:1367
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1384
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -331,7 +331,7 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2778 src/ats/gnunet-ats-solver-eval.c:2819
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -338,7 +338,7 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2796
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -345,7 +345,7 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2837
+#: src/ats/gnunet-ats-solver-eval.c:2840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -352,29 +352,29 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3290 src/ats-tests/gnunet-solver-eval.c:918
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
-#: src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:924
+#: src/ats-tests/gnunet-solver-eval.c:927
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3302
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3305
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3308
 msgid "disable normalization"
 msgstr ""
 
@@ -423,10 +423,10 @@
 #: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
 #: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
 #: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2613 src/ats/plugin_ats_ril.c:2630
-#: src/ats/plugin_ats_ril.c:2647 src/ats/plugin_ats_ril.c:2664
-#: src/ats/plugin_ats_ril.c:2681 src/ats/plugin_ats_ril.c:2698
-#: src/ats/plugin_ats_ril.c:2715 src/ats/plugin_ats_ril.c:2732
+#: 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
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -500,11 +500,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:834
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:885
+#: src/ats-tests/ats-testing-log.c:888
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -516,17 +516,17 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:289
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:293
+#: src/ats-tool/gnunet-ats.c:311
 #, c-format
 msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:395
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -533,120 +533,118 @@
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373
+#: src/ats-tool/gnunet-ats.c:402
 msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:483
+#: src/ats-tool/gnunet-ats.c:512
 #, fuzzy, c-format
 msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:705
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:708 src/namestore/gnunet-namestore.c:700
-#: src/namestore/plugin_rest_namestore.c:850
-#: src/transport/gnunet-transport.c:1890
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
+#: src/transport/gnunet-transport.c:1797
+#: src/transport/gnunet-transport-profiler.c:523
 #, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/ats-tool/gnunet-ats.c:722 src/transport/gnunet-transport.c:1899
-#: src/transport/gnunet-transport-profiler.c:549
-#, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:732
+#: src/ats-tool/gnunet-ats.c:773
 #, 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:754 src/ats-tool/gnunet-ats.c:780
-#: src/ats-tool/gnunet-ats.c:808 src/ats-tool/gnunet-ats.c:854
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
+#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:766 src/ats-tool/gnunet-ats.c:792
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:862
 #, fuzzy
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:827
+#: src/ats-tool/gnunet-ats.c:869
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:845
+#: src/ats-tool/gnunet-ats.c:887
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:916
+#: src/ats-tool/gnunet-ats.c:949
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:918
+#: src/ats-tool/gnunet-ats.c:951
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:921
+#: src/ats-tool/gnunet-ats.c:954
 #, fuzzy
+msgid "connect to PEER"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/ats-tool/gnunet-ats.c:957
+#, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:923
+#: src/ats-tool/gnunet-ats.c:959
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:925
+#: src/ats-tool/gnunet-ats.c:961
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:927
+#: src/ats-tool/gnunet-ats.c:963
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:929
+#: src/ats-tool/gnunet-ats.c:965
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:932
+#: src/ats-tool/gnunet-ats.c:968
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:934
+#: src/ats-tool/gnunet-ats.c:970
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:937
+#: src/ats-tool/gnunet-ats.c:973
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:944
+#: src/ats-tool/gnunet-ats.c:983
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:460
+#: src/cadet/gnunet-cadet.c:458
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:737
+#: src/cadet/gnunet-cadet.c:736
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -656,80 +654,85 @@
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:846
+#: src/cadet/gnunet-cadet.c:844
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:941
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:946
+#: src/cadet/gnunet-cadet.c:944
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:949
+#: src/cadet/gnunet-cadet.c:947
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:955
+#: src/cadet/gnunet-cadet.c:953
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:958
+#: src/cadet/gnunet-cadet.c:956
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:961
+#: src/cadet/gnunet-cadet.c:959
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:964
+#: src/cadet/gnunet-cadet.c:962
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:967
+#: src/cadet/gnunet-cadet.c:965
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:543
+#: src/cadet/gnunet-service-cadet_peer.c:561
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:478
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/consensus/gnunet-consensus-profiler.c:496
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:481
+#: src/consensus/gnunet-consensus-profiler.c:499
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:484
-#: src/set/gnunet-set-profiler.c:356 src/set/gnunet-set-profiler.c:359
-#: src/set/gnunet-set-profiler.c:362
+#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/set/gnunet-set-profiler.c:374 src/set/gnunet-set-profiler.c:377
+#: src/set/gnunet-set-profiler.c:380
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-profiler.c:487
+#: src/consensus/gnunet-consensus-profiler.c:505
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-profiler.c:490
+#: src/consensus/gnunet-consensus-profiler.c:508
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:493
-#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/set/gnunet-set-profiler.c:386
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/secretsharing/gnunet-secretsharing-profiler.c:623
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -969,39 +972,39 @@
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1175
+#: src/conversation/gnunet-conversation.c:1171
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1188
+#: src/conversation/gnunet-conversation.c:1184
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1219
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1247
+#: src/conversation/gnunet-conversation.c:1243
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1272
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1302
+#: src/conversation/gnunet-conversation.c:1298
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, c-format
 msgid ""
 "\n"
@@ -1008,7 +1011,7 @@
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:145
 #, c-format
 msgid ""
 "\n"
@@ -1016,7 +1019,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:211
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1023,14 +1026,19 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/sensordashboard/gnunet-sensordashboard.c:70
+#: src/conversation/gnunet-conversation-test.c:244
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
 
+#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
 #: src/conversation/gnunet-helper-audio-playback.c:318
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
@@ -1097,11 +1105,6 @@
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
 #: src/conversation/gnunet-helper-audio-record.c:344
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
@@ -1193,68 +1196,68 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:726
+#: src/core/core_api.c:725
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:92
+#: src/core/gnunet-core.c:90
 #, fuzzy
 msgid "fresh connection"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:93
 msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:98
+#: src/core/gnunet-core.c:96
 #, fuzzy
 msgid "key received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-core.c:101
+#: src/core/gnunet-core.c:99
 #, fuzzy
 msgid "connection established"
 msgstr "Samling stoppad.\n"
 
-#: src/core/gnunet-core.c:104
+#: src/core/gnunet-core.c:102
 msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
+#: src/core/gnunet-core.c:105
 #, fuzzy
 msgid "disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:114
+#: src/core/gnunet-core.c:112
 msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/core/gnunet-core.c:117
+#: src/core/gnunet-core.c:115
 #, fuzzy
 msgid "unknown state"
 msgstr "Okänt fel"
 
-#: src/core/gnunet-core.c:122
+#: src/core/gnunet-core.c:120
 #, c-format
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:157
+#: src/core/gnunet-core.c:155
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2154
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:188
+#: src/core/gnunet-core.c:186
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1269,16 +1272,16 @@
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:379
+#: src/core/gnunet-service-core_clients.c:380
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:497
+#: src/core/gnunet-service-core_clients.c:498
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:562
+#: src/core/gnunet-service-core_clients.c:561
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1326,7 +1329,7 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1081
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -1336,102 +1339,95 @@
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1067
-#, 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:1093
+#: src/core/gnunet-service-core_kx.c:1091
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1122
+#: src/core/gnunet-service-core_kx.c:1118
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1131
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1206
-#: src/transport/gnunet-service-transport_validation.c:1392
+#: src/core/gnunet-service-core_kx.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1404
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1213
+#: src/core/gnunet-service-core_kx.c:1209
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1218
+#: src/core/gnunet-service-core_kx.c:1214
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1254
+#: src/core/gnunet-service-core_kx.c:1250
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1292
+#: src/core/gnunet-service-core_kx.c:1288
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1310
+#: src/core/gnunet-service-core_kx.c:1306
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1466
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1474
+#: src/core/gnunet-service-core_kx.c:1470
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1477
+#: src/core/gnunet-service-core_kx.c:1473
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1535
-#: src/core/gnunet-service-core_kx.c:1561
+#: src/core/gnunet-service-core_kx.c:1531
+#: src/core/gnunet-service-core_kx.c:1557
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1548
+#: src/core/gnunet-service-core_kx.c:1544
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1586
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1598
+#: src/core/gnunet-service-core_kx.c:1594
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1442,7 +1438,7 @@
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/core/gnunet-service-core_neighbours.c:199
-#: src/core/gnunet-service-core_neighbours.c:384
+#: src/core/gnunet-service-core_neighbours.c:387
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -1450,34 +1446,34 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:470
+#: src/core/gnunet-service-core_neighbours.c:486
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:253
-#: src/core/gnunet-service-core_sessions.c:339
-#: src/dht/gnunet-service-dht_neighbours.c:660
-#: src/dht/gnunet-service-dht_neighbours.c:725
-#: src/fs/gnunet-service-fs_cp.c:655 src/fs/gnunet-service-fs_cp.c:1649
-#: src/topology/gnunet-daemon-topology.c:734
-#: src/topology/gnunet-daemon-topology.c:835
-#: src/transport/gnunet-service-transport_neighbours.c:755
-#: src/transport/gnunet-service-transport_neighbours.c:763
+#: src/core/gnunet-service-core_sessions.c:337
+#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:867
+#: src/fs/gnunet-service-fs_cp.c:657 src/fs/gnunet-service-fs_cp.c:1718
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:727
+#: src/transport/gnunet-service-transport_neighbours.c:720
+#: src/transport/gnunet-service-transport_neighbours.c:728
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:286
+#: src/core/gnunet-service-core_sessions.c:284
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:405
+#: src/core/gnunet-service-core_sessions.c:403
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:414
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
@@ -1493,7 +1489,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:866
+#: src/datastore/gnunet-service-datastore.c:863
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -1544,9 +1540,9 @@
 #: src/datastore/plugin_datastore_sqlite.c:65 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_postgres.c:53
 #: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_postgres.c:53
 #: src/namestore/plugin_namestore_sqlite.c:52
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:47
@@ -1554,7 +1550,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:671 src/include/gnunet_common.h:680
+#: src/include/gnunet_common.h:676 src/include/gnunet_common.h:685
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1567,144 +1563,144 @@
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:310
+#: src/datastore/datastore_api.c:308
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/datastore/datastore_api.c:395
+#: src/datastore/datastore_api.c:392
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:450
+#: src/datastore/datastore_api.c:447
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:478
+#: src/datastore/datastore_api.c:475
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:498
+#: src/datastore/datastore_api.c:495
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:536
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:628
+#: src/datastore/datastore_api.c:624
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:652
+#: src/datastore/datastore_api.c:648
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:790
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:808
+#: src/datastore/datastore_api.c:804
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:820 src/datastore/datastore_api.c:826
+#: src/datastore/datastore_api.c:816 src/datastore/datastore_api.c:822
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:830
+#: src/datastore/datastore_api.c:826
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:909
+#: src/datastore/datastore_api.c:905
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:975
+#: src/datastore/datastore_api.c:971
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1036
+#: src/datastore/datastore_api.c:1032
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1096
+#: src/datastore/datastore_api.c:1092
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1160
+#: src/datastore/datastore_api.c:1156
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1264
+#: src/datastore/datastore_api.c:1260
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1327
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1394
+#: src/datastore/datastore_api.c:1390
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1463
+#: src/datastore/datastore_api.c:1459
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:113
 #, fuzzy, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:199
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
+#: src/datastore/gnunet-datastore.c:245
 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:255
+#: src/datastore/gnunet-datastore.c:254
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/datastore/gnunet-service-datastore.c:372
+#: src/datastore/gnunet-service-datastore.c:370
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:447
+#: src/datastore/gnunet-service-datastore.c:444
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:505
-#: src/gns/gnunet-gns-helper-service-w32.c:223
+#: src/datastore/gnunet-service-datastore.c:502
+#: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:536
-#: src/gns/gnunet-gns-helper-service-w32.c:262
+#: src/datastore/gnunet-service-datastore.c:533
+#: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:652
+#: src/datastore/gnunet-service-datastore.c:649
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:694
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1711,7 +1707,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:707
+#: src/datastore/gnunet-service-datastore.c:705
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1718,133 +1714,133 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:709
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:717
+#: src/datastore/gnunet-service-datastore.c:715
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:723
-#: src/datastore/gnunet-service-datastore.c:779
-#: src/datastore/gnunet-service-datastore.c:1035
-#: src/datastore/gnunet-service-datastore.c:1630
+#: src/datastore/gnunet-service-datastore.c:721
+#: src/datastore/gnunet-service-datastore.c:776
+#: src/datastore/gnunet-service-datastore.c:1037
+#: src/datastore/gnunet-service-datastore.c:1670
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:793
+#: src/datastore/gnunet-service-datastore.c:790
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:879
+#: src/datastore/gnunet-service-datastore.c:877
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1088
+#: src/datastore/gnunet-service-datastore.c:1092
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1101
+#: src/datastore/gnunet-service-datastore.c:1105
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1153
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1170
+#: src/datastore/gnunet-service-datastore.c:1185
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1204
+#: src/datastore/gnunet-service-datastore.c:1221
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1267
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1244
+#: src/datastore/gnunet-service-datastore.c:1277
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1321
+#: src/datastore/gnunet-service-datastore.c:1362
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1326
+#: src/datastore/gnunet-service-datastore.c:1367
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1379
+#: src/datastore/gnunet-service-datastore.c:1420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1390
+#: src/datastore/gnunet-service-datastore.c:1431
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1459
-#: src/datastore/gnunet-service-datastore.c:1522
+#: src/datastore/gnunet-service-datastore.c:1500
+#: src/datastore/gnunet-service-datastore.c:1563
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1509
+#: src/datastore/gnunet-service-datastore.c:1550
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1519
+#: src/datastore/gnunet-service-datastore.c:1560
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1661
-#: src/datastore/gnunet-service-datastore.c:1673
+#: src/datastore/gnunet-service-datastore.c:1701
+#: src/datastore/gnunet-service-datastore.c:1713
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1707
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1679
+#: src/datastore/gnunet-service-datastore.c:1719
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1681
+#: src/datastore/gnunet-service-datastore.c:1721
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1696
+#: src/datastore/gnunet-service-datastore.c:1736
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1714
-#: src/datastore/gnunet-service-datastore.c:1730
+#: src/datastore/gnunet-service-datastore.c:1754
+#: src/datastore/gnunet-service-datastore.c:1770
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1760
+#: src/datastore/gnunet-service-datastore.c:1800
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -1877,18 +1873,18 @@
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:331
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:846
+#: src/datastore/plugin_datastore_postgres.c:975
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:882
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/namecache/plugin_namecache_postgres.c:398
+#: src/namestore/plugin_namestore_postgres.c:571
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1939,7 +1935,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:132
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1946,151 +1942,151 @@
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:158
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:172
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
+#: src/dht/gnunet-dht-put.c:199
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:191
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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:794
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:954
+#: src/dht/gnunet-dht-get.c:203 src/dht/gnunet-dht-monitor.c:270
+#: src/dht/gnunet-dht-put.c:214 src/fs/gnunet-auto-share.c:788
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:952
 #: src/fs/gnunet-search.c:306 src/fs/gnunet-unindex.c:167
-#: src/nse/gnunet-nse-profiler.c:873
+#: src/nse/gnunet-nse-profiler.c:872
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:224
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:267
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:292
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1393 src/testbed/gnunet-testbed-profiler.c:267
+#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:1418
+#: src/dht/gnunet_dht_profiler.c:1421
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1424
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1424 src/nse/gnunet-nse-profiler.c:864
-#: src/testbed/gnunet-testbed-profiler.c:306
+#: src/dht/gnunet_dht_profiler.c:1427 src/nse/gnunet-nse-profiler.c:863
+#: src/testbed/gnunet-testbed-profiler.c:304
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1427
+#: src/dht/gnunet_dht_profiler.c:1430
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1433
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1436
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1439
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1442
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1457
+#: src/dht/gnunet_dht_profiler.c:1460
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet-dht-put.c:119
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:122
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:125
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:154
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: src/dht/gnunet-dht-put.c:161
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:177
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:193
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:196
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:208
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: src/dht/gnunet-dht-put.c:237
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2229,65 +2225,61 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:514
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:608
+#: src/dht/gnunet-service-dht_neighbours.c:739
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:762
-#: src/dht/gnunet-service-xdht_neighbours.c:6061
+#: src/dht/gnunet-service-dht_neighbours.c:904
+#: src/dht/gnunet-service-xdht_neighbours.c:6056
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:937
 #: src/dht/gnunet-service-xdht_neighbours.c:986
 #, fuzzy
 msgid "# Messages dropped (CORE timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:822
+#: src/dht/gnunet-service-dht_neighbours.c:967
 #: src/dht/gnunet-service-xdht_neighbours.c:1018
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:868
+#: src/dht/gnunet-service-dht_neighbours.c:1013
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-dht_neighbours.c:1047
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1104
-#: src/dht/gnunet-service-dht_neighbours.c:1141
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1289
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1119
-#: src/dht/gnunet-service-dht_neighbours.c:1156
+#: src/dht/gnunet-service-dht_neighbours.c:1267
+#: src/dht/gnunet-service-dht_neighbours.c:1304
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1300
+#: src/dht/gnunet-service-dht_neighbours.c:1451
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1329
+#: src/dht/gnunet-service-dht_neighbours.c:1480
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1339
-#: src/dht/gnunet-service-dht_neighbours.c:1463
-#: src/dht/gnunet-service-dht_neighbours.c:1568
+#: src/dht/gnunet-service-dht_neighbours.c:1490
+#: src/dht/gnunet-service-dht_neighbours.c:1614
+#: src/dht/gnunet-service-dht_neighbours.c:1721
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2301,65 +2293,65 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1425
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1603
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1728
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1815
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1665
+#: src/dht/gnunet-service-dht_neighbours.c:1818
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1990
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1841
+#: src/dht/gnunet-service-dht_neighbours.c:1998
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1936
+#: src/dht/gnunet-service-dht_neighbours.c:2093
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1939
+#: src/dht/gnunet-service-dht_neighbours.c:2096
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2004
+#: src/dht/gnunet-service-dht_neighbours.c:2161
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2175
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2103
+#: src/dht/gnunet-service-dht_neighbours.c:2261
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2106
+#: src/dht/gnunet-service-dht_neighbours.c:2264
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2464,22 +2456,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3558
+#: src/dht/gnunet-service-xdht_neighbours.c:3555
 msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3699
-#: src/dht/gnunet-service-xdht_neighbours.c:3937
-#: src/dht/gnunet-service-xdht_neighbours.c:4089
-#: src/dht/gnunet-service-xdht_neighbours.c:4241
-#: src/dht/gnunet-service-xdht_neighbours.c:4422
-#: src/dht/gnunet-service-xdht_neighbours.c:4935
-#: src/dht/gnunet-service-xdht_neighbours.c:5328
-#: src/dht/gnunet-service-xdht_neighbours.c:5421
-#: src/dht/gnunet-service-xdht_neighbours.c:5511
-#: src/dht/gnunet-service-xdht_neighbours.c:5615
-#: src/dht/gnunet-service-xdht_neighbours.c:5759
-#: src/dht/gnunet-service-xdht_neighbours.c:5848
+#: src/dht/gnunet-service-xdht_neighbours.c:3696
+#: src/dht/gnunet-service-xdht_neighbours.c:3934
+#: src/dht/gnunet-service-xdht_neighbours.c:4086
+#: src/dht/gnunet-service-xdht_neighbours.c:4238
+#: src/dht/gnunet-service-xdht_neighbours.c:4419
+#: src/dht/gnunet-service-xdht_neighbours.c:4932
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5506
+#: src/dht/gnunet-service-xdht_neighbours.c:5610
+#: src/dht/gnunet-service-xdht_neighbours.c:5754
+#: src/dht/gnunet-service-xdht_neighbours.c:5843
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# byte mottagna av typen %d"
@@ -2541,22 +2533,22 @@
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:293 src/dns/dnsstub.c:381
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:297
 #, fuzzy, c-format
 msgid &quo