gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r37185 - in gnunet: po src/include
Date: Thu, 19 May 2016 15:15:51 +0200

Author: christophe.genevey
Date: 2016-05-19 15:15:51 +0200 (Thu, 19 May 2016)
New Revision: 37185

Modified:
   gnunet/po/POTFILES.in
   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_my_lib.h
Log:
result for libgnunetmy

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/POTFILES.in       2016-05-19 13:15:51 UTC (rev 37185)
@@ -226,6 +226,7 @@
 src/multicast/gnunet-service-multicast.c
 src/multicast/multicast_api.c
 src/my/my.c
+src/my/my_query_helper.c
 src/mysql/mysql.c
 src/namecache/gnunet-namecache.c
 src/namecache/gnunet-service-namecache.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/de.po     2016-05-19 13:15:51 UTC (rev 37185)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+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,7 +21,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -30,21 +30,21 @@
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
@@ -51,207 +51,207 @@
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr "ARM-API ist belegt"
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 msgid "Request does not fit into a message"
 msgstr "Anfrage passt nicht in eine Meldung"
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr "Zeitüberschreitung der Anfrage"
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, c-format
 msgid "%s service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/arm/gnunet-arm.c:261
+#: src/arm/gnunet-arm.c:271
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, 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:367
+#: src/arm/gnunet-arm.c:380
 #, 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:377
+#: src/arm/gnunet-arm.c:391
 #, 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:419
+#: src/arm/gnunet-arm.c:434
 #, 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:429
+#: src/arm/gnunet-arm.c:444
 #, 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:466
+#: src/arm/gnunet-arm.c:482
 #, 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:477
+#: src/arm/gnunet-arm.c:493
 #, 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:515
+#: src/arm/gnunet-arm.c:533
 #, 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:523
+#: src/arm/gnunet-arm.c:542
 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:528
+#: src/arm/gnunet-arm.c:547
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -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:581
+#: src/arm/gnunet-service-arm.c:555
 #, 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:592
+#: src/arm/gnunet-service-arm.c:566
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, 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:717
+#: src/arm/gnunet-service-arm.c:687
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:753
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:863
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr "Signal"
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, 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:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, 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:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -352,11 +352,13 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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:3296 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 ""
@@ -377,7 +379,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -384,18 +386,18 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -499,11 +501,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:836
 msgid "Stop logging\n"
 msgstr "Protokollierung stoppen\n"
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -551,8 +553,8 @@
 msgstr ""
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
@@ -562,13 +564,13 @@
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 #, 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:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
@@ -634,66 +636,66 @@
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
@@ -704,8 +706,8 @@
 msgstr ""
 
 #: 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
+#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
+#: src/set/gnunet-set-profiler.c:383
 msgid "number of values"
 msgstr "Anzahl der Werte"
 
@@ -718,12 +720,12 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:389
 msgid "write statistics to file"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:514
-#: src/secretsharing/gnunet-secretsharing-profiler.c:623
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
 
@@ -1010,7 +1012,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:211
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1017,8 +1019,8 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:244
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "Hilfetext"
@@ -1029,65 +1031,65 @@
 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
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr "gnunet-helper-audio-playback - Signal erhalten, wird abgebrochen\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr "pa_stream_connect_playback() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:659
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:707
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:783
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %s\n"
@@ -1145,21 +1147,21 @@
 msgstr "ogg_stream_init() fehlgeschlagen.\n"
 
 #: src/conversation/gnunet-helper-audio-record.c:721
-#, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Failed to allocate %u bytes for second packet\n"
+msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/conversation/gnunet-service-conversation.c:853
+#: src/conversation/gnunet-service-conversation.c:855
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:946
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1360
 #, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr ""
@@ -1223,7 +1225,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
@@ -1233,11 +1235,11 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:186
+#: src/core/gnunet-core.c:185
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
@@ -1245,7 +1247,7 @@
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:127
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
@@ -1276,25 +1278,25 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:766
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:796
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:878
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:917
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1301,107 +1303,107 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:928
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1081
+#: src/core/gnunet-service-core_kx.c:1030
+#: src/transport/gnunet-service-transport_validation.c:1080
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1039
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1091
+#: src/core/gnunet-service-core_kx.c:1092
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1118
+#: src/core/gnunet-service-core_kx.c:1119
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1131
+#: src/core/gnunet-service-core_kx.c:1132
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1202
-#: src/transport/gnunet-service-transport_validation.c:1404
+#: src/core/gnunet-service-core_kx.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1403
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1210
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1214
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1251
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/core/gnunet-service-core_kx.c:1289
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1462
+#: src/core/gnunet-service-core_kx.c:1463
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1470
+#: src/core/gnunet-service-core_kx.c:1471
 #, 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:1473
+#: src/core/gnunet-service-core_kx.c:1474
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1531
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1558
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1544
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1586
+#: src/core/gnunet-service-core_kx.c:1587
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1594
+#: src/core/gnunet-service-core_kx.c:1595
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1628
+#: src/core/gnunet-service-core_kx.c:1629
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1425,11 +1427,11 @@
 
 #: 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/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:863
+#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
+#: src/topology/gnunet-daemon-topology.c:611
+#: src/topology/gnunet-daemon-topology.c:723
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
@@ -1461,7 +1463,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:863
+#: src/datastore/gnunet-service-datastore.c:865
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
@@ -1506,9 +1508,9 @@
 #: 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
+#: 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:53
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:53
@@ -1519,7 +1521,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:676 src/include/gnunet_common.h:685
+#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1637,13 +1639,13 @@
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:245
+#: src/datastore/gnunet-datastore.c:244
 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:254
+#: src/datastore/gnunet-datastore.c:253
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "sqlite Datenspeicher"
@@ -1652,25 +1654,25 @@
 msgid "# bytes expired"
 msgstr "# abgelaufene Bytes"
 
-#: src/datastore/gnunet-service-datastore.c:444
+#: src/datastore/gnunet-service-datastore.c:446
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:502
+#: src/datastore/gnunet-service-datastore.c:504
 #: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:533
+#: src/datastore/gnunet-service-datastore.c:535
 #: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:649
+#: src/datastore/gnunet-service-datastore.c:651
 msgid "# results found"
 msgstr "# gefundene Ergebnisse"
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1677,7 +1679,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:707
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1684,134 +1686,134 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:709
+#: src/datastore/gnunet-service-datastore.c:711
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:715
+#: src/datastore/gnunet-service-datastore.c:717
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:723
+#: src/datastore/gnunet-service-datastore.c:778
+#: src/datastore/gnunet-service-datastore.c:1039
+#: src/datastore/gnunet-service-datastore.c:1673
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:790
+#: src/datastore/gnunet-service-datastore.c:792
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:877
+#: src/datastore/gnunet-service-datastore.c:879
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1092
+#: src/datastore/gnunet-service-datastore.c:1094
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1105
+#: src/datastore/gnunet-service-datastore.c:1107
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1153
+#: src/datastore/gnunet-service-datastore.c:1155
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1185
+#: src/datastore/gnunet-service-datastore.c:1187
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1221
+#: src/datastore/gnunet-service-datastore.c:1223
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1267
+#: src/datastore/gnunet-service-datastore.c:1269
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1279
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1311
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1362
+#: src/datastore/gnunet-service-datastore.c:1364
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1367
+#: src/datastore/gnunet-service-datastore.c:1369
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1420
+#: src/datastore/gnunet-service-datastore.c:1423
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1431
+#: src/datastore/gnunet-service-datastore.c:1434
 #, 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:1500
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1566
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1550
+#: src/datastore/gnunet-service-datastore.c:1553
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1560
+#: src/datastore/gnunet-service-datastore.c:1563
 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
+#: src/datastore/gnunet-service-datastore.c:1704
+#: src/datastore/gnunet-service-datastore.c:1716
 #, 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:1707
+#: src/datastore/gnunet-service-datastore.c:1710
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1719
+#: src/datastore/gnunet-service-datastore.c:1722
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1724
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1736
+#: src/datastore/gnunet-service-datastore.c:1739
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1754
-#: src/datastore/gnunet-service-datastore.c:1770
+#: src/datastore/gnunet-service-datastore.c:1757
+#: src/datastore/gnunet-service-datastore.c:1773
 #, 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:1800
+#: src/datastore/gnunet-service-datastore.c:1803
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
@@ -1905,7 +1907,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1912,219 +1914,220 @@
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:181
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
+#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:172
+#: src/dht/gnunet-dht-get.c:195
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:202
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:191
+#: src/dht/gnunet-dht-get.c:215
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
+#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224
+#: src/dht/gnunet-dht-get.c:248
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:267
+#: src/dht/gnunet-dht-monitor.c:295
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-monitor.c:320
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1417
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
 
-#: src/dht/gnunet_dht_profiler.c:1424
+#: src/dht/gnunet_dht_profiler.c:1420
 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
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1426
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1429
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1432
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1435
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1442
+#: src/dht/gnunet_dht_profiler.c:1438
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1460
+#: src/dht/gnunet_dht_profiler.c:1456
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:122
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:125
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:154
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-put.c:164
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-put.c:177
+#: src/dht/gnunet-dht-put.c:180
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:196
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:199
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-put.c:208
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:211
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:237
+#: src/dht/gnunet-dht-put.c:240
 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-dht.c:171
 msgid "Failed to connect to transport service!\n"
 msgstr "Verbindung zum Transportdienst ist fehlgeschlagen!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-wdht_clients.c:857
+#: src/dht/gnunet-service-xdht_clients.c:854
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:509
+#: src/dht/gnunet-service-wdht_clients.c:938
+#: src/dht/gnunet-service-xdht_clients.c:934
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:593
+#: src/dht/gnunet-service-wdht_clients.c:1004
+#: src/dht/gnunet-service-xdht_clients.c:999
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:794
+#: src/dht/gnunet-service-wdht_clients.c:1213
+#: src/dht/gnunet-service-xdht_clients.c:1201
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:686
+#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-xdht_clients.c:684
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1186
+#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/gnunet-service-xdht_clients.c:651
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -2183,64 +2186,65 @@
 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:739
+#: src/dht/gnunet-service-dht_neighbours.c:735
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:904
-#: src/dht/gnunet-service-xdht_neighbours.c:6056
+#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-xdht_neighbours.c:6062
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-dht_neighbours.c:933
 #: 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:967
+#: src/dht/gnunet-service-dht_neighbours.c:963
 #: 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:1013
+#: src/dht/gnunet-service-dht_neighbours.c:1009
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1043
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1248
+#: src/dht/gnunet-service-dht_neighbours.c:1285
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1263
+#: src/dht/gnunet-service-dht_neighbours.c:1300
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1451
+#: src/dht/gnunet-service-dht_neighbours.c:1447
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1480
+#: src/dht/gnunet-service-dht_neighbours.c:1476
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1610
+#: src/dht/gnunet-service-dht_neighbours.c:1717
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2253,61 +2257,61 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1572
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1603
+#: src/dht/gnunet-service-dht_neighbours.c:1599
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1728
+#: src/dht/gnunet-service-dht_neighbours.c:1724
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1815
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1818
+#: src/dht/gnunet-service-dht_neighbours.c:1814
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1990
+#: src/dht/gnunet-service-dht_neighbours.c:1986
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:1994
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2093
+#: src/dht/gnunet-service-dht_neighbours.c:2089
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2096
+#: src/dht/gnunet-service-dht_neighbours.c:2092
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2161
+#: src/dht/gnunet-service-dht_neighbours.c:2157
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2175
+#: src/dht/gnunet-service-dht_neighbours.c:2171
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2261
+#: src/dht/gnunet-service-dht_neighbours.c:2257
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2264
+#: src/dht/gnunet-service-dht_neighbours.c:2260
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2412,22 +2416,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3555
+#: src/dht/gnunet-service-xdht_neighbours.c:3557
 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
+#: src/dht/gnunet-service-xdht_neighbours.c:3698
+#: src/dht/gnunet-service-xdht_neighbours.c:3936
+#: src/dht/gnunet-service-xdht_neighbours.c:4088
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5325
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5849
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# Bytes des Typs %d empfangen"
@@ -2509,27 +2513,27 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:238
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2570,20 +2574,20 @@
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1081
+#: src/dns/gnunet-service-dns.c:1080
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:167
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr "Ausführliche Ausgabe"
 
-#: src/dv/gnunet-dv.c:176
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -2748,70 +2752,70 @@
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
+#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
 #, 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:3293 src/exit/gnunet-daemon-exit.c:3301
+#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334
+#: src/exit/gnunet-daemon-exit.c:3333
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
+#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3371
+#: src/exit/gnunet-daemon-exit.c:3370
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3549
+#: src/exit/gnunet-daemon-exit.c:3548
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3565
+#: src/exit/gnunet-daemon-exit.c:3563
 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:3573
+#: src/exit/gnunet-daemon-exit.c:3571
 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:3580
+#: src/exit/gnunet-daemon-exit.c:3578
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3586
+#: src/exit/gnunet-daemon-exit.c:3584
 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/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
 #: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3704
+#: src/exit/gnunet-daemon-exit.c:3701
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3855
+#: src/exit/gnunet-daemon-exit.c:3852
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3033,17 +3037,17 @@
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -3055,49 +3059,49 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: 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
+#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
+#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
 #, 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:707
+#: src/fs/fs_publish.c:708
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:719
+#: src/fs/fs_publish.c:720
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:763
+#: src/fs/fs_publish.c:764
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:783
+#: src/fs/fs_publish.c:784
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:808
+#: src/fs/fs_publish.c:809
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:831
+#: src/fs/fs_publish.c:832
 #, 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:895 src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1008
+#: src/fs/fs_publish.c:1009
 #, 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:1016
+#: src/fs/fs_publish.c:1017
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
@@ -3104,17 +3108,17 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1056
+#: src/fs/fs_publish.c:1057
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1296
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1386
+#: src/fs/fs_publish.c:1387
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3289,63 +3293,63 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, fuzzy, c-format
 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:413
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:500
+#: src/fs/gnunet-auto-share.c:494
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:510
+#: src/fs/gnunet-auto-share.c:504
 #, 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:719
+#: src/fs/gnunet-auto-share.c:713
 #, 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:772 src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:809
+#: src/fs/gnunet-auto-share.c:801
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3412,7 +3416,7 @@
 msgstr "Dateien aus dem GNUnet herunterladen."
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3436,12 +3440,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
@@ -3449,7 +3453,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3484,19 +3488,19 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-fs-profiler.c:191
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:194
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:214
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:206
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3625,18 +3629,18 @@
 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:838 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, 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:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
+#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
 #, 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:910
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3644,7 +3648,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:914
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3652,13 +3656,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:918
+#: src/fs/gnunet-publish.c:917
 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:921
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3666,7 +3670,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet-Datenbank)"
 
-#: src/fs/gnunet-publish.c:926
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3674,19 +3678,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:934
+#: src/fs/gnunet-publish.c:933
 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:940
+#: src/fs/gnunet-publish.c:939
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
@@ -3693,67 +3697,67 @@
 "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namensräume)"
 
-#: src/fs/gnunet-publish.c:948
+#: src/fs/gnunet-publish.c:947
 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:964
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:123
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:200
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:256
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:280
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:312
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:315
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:322
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:333
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:272
+#: src/fs/gnunet-service-fs.c:273
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
+#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:729
+#: src/fs/gnunet-service-fs.c:730
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: 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
+#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/topology/gnunet-daemon-topology.c:1245
+#: src/topology/gnunet-daemon-topology.c:1253
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -3793,96 +3797,96 @@
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/fs/gnunet-service-fs_cp.c:738
+#: src/fs/gnunet-service-fs_cp.c:743
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:747
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:780
+#: src/fs/gnunet-service-fs_cp.c:785
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:788
+#: src/fs/gnunet-service-fs_cp.c:793
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# gap falsche Antworten"
 
-#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
+#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:921
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:977
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:985
+#: src/fs/gnunet-service-fs_cp.c:982
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:999
+#: src/fs/gnunet-service-fs_cp.c:996
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1118
+#: src/fs/gnunet-service-fs_cp.c:1115
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1140
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/fs/gnunet-service-fs_cp.c:1150
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1251
+#: src/fs/gnunet-service-fs_cp.c:1248
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1305
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1337
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1361
+#: src/fs/gnunet-service-fs_cp.c:1358
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1372
+#: src/fs/gnunet-service-fs_cp.c:1369
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1427
+#: src/fs/gnunet-service-fs_cp.c:1424
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1471
+#: src/fs/gnunet-service-fs_cp.c:1468
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1916
+#: src/fs/gnunet-service-fs_cp.c:1913
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -4134,7 +4138,7 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:392
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4141,20 +4145,20 @@
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 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:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
+#: src/gns/gnunet-bcd.c:357
 #, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
 #: src/gns/gnunet-bcd.c:362
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %u\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
@@ -4161,88 +4165,88 @@
 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:520
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:532
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:232
+#: src/gns/gnunet-dns2gns.c:238
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:408
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:424
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:432
 #, 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:704
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:730
+#: src/gns/gnunet-dns2gns.c:737
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:758
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:788
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:798
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
+#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:231
+#: src/gns/gnunet-gns.c:254
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:312
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:460
+#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4249,42 +4253,42 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:415 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:403
+#: src/gns/gnunet-gns.c:429
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:479
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456
+#: src/gns/gnunet-gns.c:482
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:459
+#: src/gns/gnunet-gns.c:485
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:462
+#: src/gns/gnunet-gns.c:488
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:465
+#: src/gns/gnunet-gns.c:491
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:468
+#: src/gns/gnunet-gns.c:494
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:508
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -4302,19 +4306,19 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-import.c:483
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: 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/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:805
+#: src/hostlist/gnunet-daemon-hostlist_client.c:814
+#: src/hostlist/gnunet-daemon-hostlist_client.c:925
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4381,7 +4385,7 @@
 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:2218 src/rest/gnunet-rest-server.c:536
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -4405,29 +4409,29 @@
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3003
+#: src/gns/gnunet-gns-proxy.c:2999
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3105
+#: src/gns/gnunet-gns-proxy.c:3101
 #, 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:3146
+#: src/gns/gnunet-gns-proxy.c:3141
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3144
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3163
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4525,11 +4529,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_rest_gns.c:423
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:697
+#: src/gns/plugin_rest_gns.c:717
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -4679,25 +4683,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:334
+#: src/hostlist/gnunet-daemon-hostlist.c:333
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:337
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:357
+#: src/hostlist/gnunet-daemon-hostlist.c:356
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4723,7 +4727,7 @@
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4732,7 +4736,7 @@
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:728
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4739,117 +4743,117 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:866
+#: src/hostlist/gnunet-daemon-hostlist_client.c:856
 #, 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:880
+#: src/hostlist/gnunet-daemon-hostlist_client.c:870
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:900
+#: src/hostlist/gnunet-daemon-hostlist_client.c:890
 #, 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:906
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:914
+#: src/hostlist/gnunet-daemon-hostlist_client.c:904
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:967
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:975
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
 #, 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:1364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
 #, 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:1373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
 #, 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:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
 #, 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:1463
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, 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:1487
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
-#: src/transport/plugin_transport_http_client.c:2282
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
+#: src/transport/plugin_transport_http_client.c:2273
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4868,7 +4872,7 @@
 #: 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
+#: src/topology/gnunet-daemon-topology.c:866
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4925,42 +4929,47 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:857
+#: src/transport/gnunet-service-transport.c:856
 #, 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:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:782
 #, 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:798
+#: src/hostlist/gnunet-daemon-hostlist_server.c:795
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:811
+#: src/hostlist/gnunet-daemon-hostlist_server.c:808
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:832
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, 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:852
+#: src/hostlist/gnunet-daemon-hostlist_server.c:849
 #, 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:892
+#: src/hostlist/gnunet-daemon-hostlist_server.c:889
 #, 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"
@@ -4975,33 +4984,33 @@
 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:325
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:328
+#: src/identity/gnunet-identity.c:327
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:331
+#: src/identity/gnunet-identity.c:330
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:334
+#: src/identity/gnunet-identity.c:333
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:337
+#: src/identity/gnunet-identity.c:336
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:340
+#: src/identity/gnunet-identity.c:339
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:349
+#: src/identity/gnunet-identity.c:348
 msgid "Maintain egos"
 msgstr ""
 
@@ -5052,7 +5061,7 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:923
+#: src/identity/plugin_rest_identity.c:938
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5064,7 +5073,7 @@
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1089
+#: src/identity-provider/plugin_rest_identity_provider.c:1126
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5104,16 +5113,16 @@
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:235
+#: src/namecache/gnunet-namecache.c:233
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5159,13 +5168,13 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:532
+#: src/namestore/plugin_rest_namestore.c:547
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:541
+#: src/namestore/plugin_rest_namestore.c:556
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -5183,7 +5192,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:565
+#: src/namestore/plugin_rest_namestore.c:580
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
@@ -5195,9 +5204,9 @@
 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
+#: src/namestore/plugin_rest_namestore.c:954
+#: src/transport/gnunet-transport.c:1769
+#: src/transport/gnunet-transport-profiler.c:497
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "Dienst »%s« läuft nicht\n"
@@ -5209,7 +5218,7 @@
 
 #: src/namestore/gnunet-namestore.c:717
 #: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:954
+#: src/namestore/plugin_rest_namestore.c:963
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -5227,14 +5236,14 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:635
+#: src/namestore/plugin_rest_namestore.c:650
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
 #: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:653
-#: src/namestore/plugin_rest_namestore.c:693
+#: src/namestore/plugin_rest_namestore.c:668
+#: src/namestore/plugin_rest_namestore.c:708
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
@@ -5253,7 +5262,8 @@
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#: src/namestore/gnunet-namestore.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:819
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5264,81 +5274,81 @@
 msgstr "Ungültiger Parameter: `%s'\n"
 
 #: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:984
+#: src/namestore/plugin_rest_namestore.c:999
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
 #: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1011
+#: src/namestore/plugin_rest_namestore.c:1026
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1066
 #, c-format
 msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1016
-#: src/namestore/plugin_rest_namestore.c:1092
+#: src/namestore/gnunet-namestore.c:1015
+#: src/namestore/plugin_rest_namestore.c:1107
 #, 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:1064
+#: src/namestore/gnunet-namestore.c:1063
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1066
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1070
+#: src/namestore/gnunet-namestore.c:1069
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1072
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1076
+#: src/namestore/gnunet-namestore.c:1075
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1079
+#: src/namestore/gnunet-namestore.c:1078
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1085
+#: src/namestore/gnunet-namestore.c:1084
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1088
+#: src/namestore/gnunet-namestore.c:1087
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1091
+#: src/namestore/gnunet-namestore.c:1090
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1094
+#: src/namestore/gnunet-namestore.c:1093
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1097
+#: src/namestore/gnunet-namestore.c:1096
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1100
+#: src/namestore/gnunet-namestore.c:1099
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1103
+#: src/namestore/gnunet-namestore.c:1102
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5398,7 +5408,7 @@
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1018
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5416,7 +5426,7 @@
 msgid "flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1176
+#: src/namestore/plugin_rest_namestore.c:1187
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5434,92 +5444,92 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:392
+#: src/nat/nat_auto.c:388
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:389
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:412
+#: src/nat/nat_auto.c:408
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:444
+#: src/nat/nat_auto.c:440
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:576
+#: src/nat/nat_auto.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:594
+#: src/nat/nat_auto.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:662 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:716
+#: src/nat/nat_auto.c:709
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:717
+#: src/nat/nat_auto.c:710
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:749
+#: src/nat/nat_auto.c:742
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:798
+#: src/nat/nat_auto.c:788
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1024
+#: src/nat/nat.c:1019
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1074
+#: src/nat/nat.c:1070
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1325
+#: src/nat/nat.c:1321
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1400
+#: src/nat/nat.c:1396
 #, 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:1544
+#: src/nat/nat.c:1540
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:1594
 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
+#: src/nat/nat.c:1723 src/nat/nat.c:1736
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5526,102 +5536,102 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1895
+#: src/nat/nat.c:1891
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1911
+#: src/nat/nat.c:1907
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:1998
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2000
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2002
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2004
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2006
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2008
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2010
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2012
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2014
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2016
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2018
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2022
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2026
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2028
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2030
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2032
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2034
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:205
 #, fuzzy
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_mini.c:605
+#: src/nat/nat_mini.c:611
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
@@ -5631,7 +5641,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:495
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -5648,56 +5658,56 @@
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/nse/gnunet-nse-profiler.c:840
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:860
+#: src/nse/gnunet-nse-profiler.c:843
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:869
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:875
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1533
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
+#: src/nse/gnunet-service-nse.c:1535
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:225
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:382
+#: src/peerinfo/gnunet-service-peerinfo.c:411
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:491
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:529
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5705,27 +5715,27 @@
 "Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
 "Die Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:683
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:689
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1056
+#: src/peerinfo/gnunet-service-peerinfo.c:1061
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1375
+#: src/peerinfo/gnunet-service-peerinfo.c:1391
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1388
+#: src/peerinfo/gnunet-service-peerinfo.c:1404
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5754,7 +5764,7 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:267
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -5804,44 +5814,44 @@
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:844
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Knoten »%s«.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:884
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:887
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:890
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:893
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:896
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:902
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:905
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:920
+#: src/peerinfo-tool/gnunet-peerinfo.c:919
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -5864,38 +5874,38 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
+#: src/peerstore/gnunet-service-peerstore.c:395
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/peerstore/gnunet-service-peerstore.c:391
+#: src/peerstore/gnunet-service-peerstore.c:402
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:451
+#: src/peerstore/gnunet-service-peerstore.c:462
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:459
+#: src/peerstore/gnunet-service-peerstore.c:470
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:478
+#: src/peerstore/gnunet-service-peerstore.c:489
 #, fuzzy
 msgid "Failed to store requested value, database error."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:557
+#: src/peerstore/gnunet-service-peerstore.c:568
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:579
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -5905,30 +5915,30 @@
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:374
+#: src/peerstore/peerstore_api.c:376
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:677
+#: src/peerstore/peerstore_api.c:679
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:688
+#: src/peerstore/peerstore_api.c:690
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerstore/peerstore_api.c:707
+#: src/peerstore/peerstore_api.c:709
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:819
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:831
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5983,63 +5993,63 @@
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:422
+#: src/psycstore/gnunet-service-psycstore.c:423
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:453
+#: src/psycstore/gnunet-service-psycstore.c:454
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:481
+#: src/psycstore/gnunet-service-psycstore.c:482
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:664
+#: src/psycstore/gnunet-service-psycstore.c:665
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:674
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:714
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:745
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:765
+#: src/psycstore/gnunet-service-psycstore.c:784
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:807
+#: src/psycstore/gnunet-service-psycstore.c:858
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:834
+#: src/psycstore/gnunet-service-psycstore.c:873
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -6117,8 +6127,7 @@
 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:656
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -6127,72 +6136,68 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1284
+#: src/regex/gnunet-regex-profiler.c:1301
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1295
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1324
-#: src/regex/gnunet-regex-simulation-profiler.c:619
+#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1330
-#: src/regex/gnunet-regex-simulation-profiler.c:626
+#: src/regex/gnunet-regex-profiler.c:1348
+#: src/regex/gnunet-regex-simulation-profiler.c:646
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1337
+#: src/regex/gnunet-regex-profiler.c:1355
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1346
+#: src/regex/gnunet-regex-profiler.c:1364
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1384
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1472
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1460
+#: src/regex/gnunet-regex-profiler.c:1478
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1463
+#: src/regex/gnunet-regex-profiler.c:1481
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1493
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:686
+#: src/regex/gnunet-regex-simulation-profiler.c:704
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:702
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6201,113 +6206,113 @@
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:792
+#: src/rest/gnunet-rest-server.c:784
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:809
+#: src/rest/gnunet-rest-server.c:801
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/revocation/gnunet-revocation.c:124
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Schlüssel »%s« ist gültig\n"
 
-#: src/revocation/gnunet-revocation.c:129
+#: src/revocation/gnunet-revocation.c:134
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Schlüssel »%s« wurde widerrufen\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:140
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:171
 msgid "Revocation failed (!)\n"
 msgstr "Widerruf fehlgeschlagen (!)\n"
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:292
+#: src/revocation/gnunet-revocation.c:320
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:322
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/revocation/gnunet-revocation.c:343
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:363
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:405
+#: src/revocation/gnunet-revocation.c:435
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:439
+#: src/revocation/gnunet-revocation.c:468
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:461
+#: src/revocation/gnunet-revocation.c:489
 #, 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:486
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:533
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:536
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
+#: src/revocation/gnunet-revocation.c:539
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6345,7 +6350,7 @@
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps.c:185
+#: src/rps/gnunet-rps.c:177
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6384,29 +6389,29 @@
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:352
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 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:355
+#: src/scalarproduct/gnunet-scalarproduct.c:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6415,23 +6420,23 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:611
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:617
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2015
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -6458,10 +6463,135 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:383
+#: src/set/gnunet-set-profiler.c:386
 msgid "operation to execute"
 msgstr ""
 
+#: src/social/gnunet-social.c:1138
+#, fuzzy
+msgid "--place missing or invalid.\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/social/gnunet-social.c:1180
+msgid "assign --name in state to --data"
+msgstr ""
+
+#: src/social/gnunet-social.c:1184
+msgid "say good-bye and leave somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1188
+msgid "create a place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1192
+msgid "destroy a place we were hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1196
+msgid "enter somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1200
+msgid "find state matching name prefix"
+msgstr ""
+
+#: src/social/gnunet-social.c:1204
+msgid "replay history of messages up to the given --limit"
+msgstr ""
+
+#: src/social/gnunet-social.c:1208
+msgid "reconnect to a previously created place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1212
+msgid "publish something to a place we are hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1216
+msgid "reconnect to a previously entered place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1220
+msgid "search for state matching exact name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1224
+msgid "submit something to somebody's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1228
+msgid "list of egos and subscribed places"
+msgstr ""
+
+#: src/social/gnunet-social.c:1232
+msgid "extract and replay history between message IDs --start and --until"
+msgstr ""
+
+#: src/social/gnunet-social.c:1239
+msgid "application ID to use when connecting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1243
+msgid "message body or state value"
+msgstr ""
+
+#: src/social/gnunet-social.c:1247
+#, fuzzy
+msgid "name or public key of ego"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/social/gnunet-social.c:1251
+msgid "wait for incoming messages"
+msgstr ""
+
+#: src/social/gnunet-social.c:1255
+msgid "GNS name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1259
+msgid "peer ID for --guest-enter"
+msgstr ""
+
+#: src/social/gnunet-social.c:1263
+msgid "name (key) to query from state"
+msgstr ""
+
+#: src/social/gnunet-social.c:1267
+msgid "method name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1271
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "Anzahl an Durchläufen"
+
+#: src/social/gnunet-social.c:1275
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1279
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1283
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1287
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1291
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1301
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6482,11 +6612,11 @@
 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:195
+#: src/statistics/gnunet-statistics.c:194
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:200
 msgid "Missing argument: name\n"
 msgstr ""
 
@@ -6495,7 +6625,7 @@
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:240
+#: src/statistics/gnunet-statistics.c:241
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -6606,7 +6736,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:291
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6634,46 +6764,46 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:322
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
 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/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
 #: 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:475
+#: src/testbed/gnunet-daemon-testbed-underlay.c:468
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:732
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6680,16 +6810,16 @@
 "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
 "verbleiben)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:248
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:297
+#: src/testbed/gnunet-testbed-profiler.c:287
 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 "
@@ -6721,11 +6851,11 @@
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:987
+#: src/testbed/testbed_api_testbed.c:986
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
@@ -6825,36 +6955,36 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 msgid "configuration template"
 msgstr "Konfigurationsvorlage"
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -6940,55 +7070,55 @@
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:634
+#: src/topology/gnunet-daemon-topology.c:730
 msgid "# friends connected"
 msgstr "# verbundener Freunde"
 
-#: src/topology/gnunet-daemon-topology.c:931
+#: src/topology/gnunet-daemon-topology.c:927
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:964
+#: src/topology/gnunet-daemon-topology.c:960
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:971
+#: src/topology/gnunet-daemon-topology.c:967
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:989
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "# friends in configuration"
 msgstr "# Freunde in Konfiguration"
 
-#: src/topology/gnunet-daemon-topology.c:1003
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1005
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1043
+#: src/topology/gnunet-daemon-topology.c:1039
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1288
+#: src/topology/gnunet-daemon-topology.c:1283
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7211,40 +7341,40 @@
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3357
+#: src/transport/gnunet-service-transport_neighbours.c:3353
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3393
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3488
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3528
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3546
+#: src/transport/gnunet-service-transport_neighbours.c:3542
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3680
+#: src/transport/gnunet-service-transport_neighbours.c:3676
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7278,8 +7408,8 @@
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:949
+#: src/transport/gnunet-service-transport_validation.c:1551
 #, fuzzy
 msgid "# validations running"
 msgstr "Sqlite-Datenbank läuft\n"
@@ -7306,30 +7436,30 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1076
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:1127
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1140
+#: src/transport/gnunet-service-transport_validation.c:1139
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1143
+#: src/transport/gnunet-service-transport_validation.c:1142
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1151
+#: src/transport/gnunet-service-transport_validation.c:1150
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1163
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7336,28 +7466,28 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1219
+#: src/transport/gnunet-service-transport_validation.c:1218
 #, 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:1270
+#: src/transport/gnunet-service-transport_validation.c:1269
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1279
+#: src/transport/gnunet-service-transport_validation.c:1278
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/transport/gnunet-service-transport_validation.c:1441
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1460
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1515
+#: src/transport/gnunet-service-transport_validation.c:1514
 msgid "# validations succeeded"
 msgstr ""
 
@@ -7367,7 +7497,7 @@
 msgstr ""
 
 #: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:282
+#: src/transport/gnunet-transport-profiler.c:277
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
@@ -7377,17 +7507,17 @@
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:621
 #, 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:635
+#: src/transport/gnunet-transport.c:633
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
@@ -7394,27 +7524,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:667
+#: src/transport/gnunet-transport.c:663
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/gnunet-transport.c:672
+#: src/transport/gnunet-transport.c:668
 #, 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:677
+#: src/transport/gnunet-transport.c:673
 #, 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:682
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:807
+#: src/transport/gnunet-transport.c:803
 #, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7423,36 +7553,36 @@
 "\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:842
+#: src/transport/gnunet-transport.c:838
 #, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Knoten »%s« %s »%s« \n"
 
-#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:982
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:996
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1021
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:1078
+#: src/transport/gnunet-transport.c:1067
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1107
+#: src/transport/gnunet-transport.c:1096
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7459,42 +7589,42 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1144
-#: src/transport/gnunet-transport-profiler.c:439
+#: src/transport/gnunet-transport.c:1133
+#: src/transport/gnunet-transport-profiler.c:432
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
+#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:1160
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:1197
+#: src/transport/gnunet-transport.c:1186
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1221
-#: src/transport/gnunet-transport-profiler.c:464
+#: src/transport/gnunet-transport.c:1210
+#: src/transport/gnunet-transport-profiler.c:457
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:1261
+#: src/transport/gnunet-transport.c:1250
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1262
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1809
+#: src/transport/gnunet-transport.c:1792
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7501,111 +7631,111 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1817
+#: src/transport/gnunet-transport.c:1800
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1840
+#: src/transport/gnunet-transport.c:1823
 #, 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
+#: src/transport/gnunet-transport.c:1829
 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
+#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
+#: src/transport/gnunet-transport.c:1925
+#: src/transport/gnunet-transport-profiler.c:553
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1889
+#: src/transport/gnunet-transport.c:1872
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:1972
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1975
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1978
 msgid "disconnect to a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport.c:1981
 msgid "print information for all pending validations "
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1984
 msgid "print information for all pending validations continuously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1987
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1993
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2014
+#: src/transport/gnunet-transport.c:1996
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:2017
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport-profiler.c:618
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2020
+#: src/transport/gnunet-transport.c:2002
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2023
+#: src/transport/gnunet-transport.c:2005
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2008
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2037
-#: src/transport/gnunet-transport-profiler.c:637
+#: src/transport/gnunet-transport.c:2019
+#: src/transport/gnunet-transport-profiler.c:629
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
 
-#: src/transport/gnunet-transport-profiler.c:226
+#: src/transport/gnunet-transport-profiler.c:221
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:262
+#: src/transport/gnunet-transport-profiler.c:257
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:271
+#: src/transport/gnunet-transport-profiler.c:266
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:288
+#: src/transport/gnunet-transport-profiler.c:283
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:341
+#: src/transport/gnunet-transport-profiler.c:336
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:361
+#: src/transport/gnunet-transport-profiler.c:356
 #, c-format
 msgid ""
 "\n"
@@ -7612,103 +7742,103 @@
 "Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:411
+#: src/transport/gnunet-transport-profiler.c:404
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport-profiler.c:418
+#: src/transport/gnunet-transport-profiler.c:411
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Mit »%s« wurde erfolgreich verbunden.\n"
 
-#: src/transport/gnunet-transport-profiler.c:480
+#: src/transport/gnunet-transport-profiler.c:473
 #, 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:510
+#: src/transport/gnunet-transport-profiler.c:503
 msgid "Message size too big!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport-profiler.c:509
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/transport/gnunet-transport-profiler.c:524
 #, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:530
 #, 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:542
+#: src/transport/gnunet-transport-profiler.c:535
 #, fuzzy
 msgid "No operation given\n"
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/transport/gnunet-transport-profiler.c:542
 #, fuzzy
 msgid "Failed to connect to ATS service\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/transport/gnunet-transport-profiler.c:611
+#: src/transport/gnunet-transport-profiler.c:603
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport-profiler.c:606
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/gnunet-transport-profiler.c:617
+#: src/transport/gnunet-transport-profiler.c:609
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:620
+#: src/transport/gnunet-transport-profiler.c:612
 #, fuzzy
 msgid "number of messages to send"
 msgstr "Anzahl an Durchläufen"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 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_http_client.c:1473
+#: src/transport/plugin_transport_http_server.c:2237
+#: src/transport/plugin_transport_http_server.c:3427
 #: 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
+#: src/transport/plugin_transport_http_client.c:2114
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2172
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_client.c:2163
+#: src/transport/plugin_transport_http_server.c:3142
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
-#: src/transport/plugin_transport_http_server.c:3218
+#: src/transport/plugin_transport_http_client.c:2180
+#: src/transport/plugin_transport_http_server.c:3212
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2223
+#: src/transport/plugin_transport_http_client.c:2214
 #, 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:1733
+#: src/transport/plugin_transport_http_server.c:1721
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7715,116 +7845,116 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1955
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1973
+#: src/transport/plugin_transport_http_server.c:1963
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2123
+#: src/transport/plugin_transport_http_server.c:2113
 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:2146
+#: src/transport/plugin_transport_http_server.c:2136
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2273
+#: src/transport/plugin_transport_http_server.c:2263
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2582
+#: src/transport/plugin_transport_http_server.c:2572
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2606 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:2634 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2624 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:2747
+#: src/transport/plugin_transport_http_server.c:2737
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
-#: src/transport/plugin_transport_udp.c:3604
+#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2924
+#: src/transport/plugin_transport_http_server.c:2918
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2933
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2945
+#: src/transport/plugin_transport_http_server.c:2939
 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:2956
+#: src/transport/plugin_transport_http_server.c:2950
 msgid "Port is required! Fix in configuration\n"
 msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2962
+#: src/transport/plugin_transport_http_server.c:2956
 #, c-format
 msgid "Using port %u\n"
 msgstr "Port %u wird verwendet\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2970
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2986
+#: src/transport/plugin_transport_http_server.c:2980
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3008
+#: src/transport/plugin_transport_http_server.c:3002
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3018
+#: src/transport/plugin_transport_http_server.c:3012
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3081
+#: src/transport/plugin_transport_http_server.c:3075
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3102
+#: src/transport/plugin_transport_http_server.c:3096
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3119
+#: src/transport/plugin_transport_http_server.c:3113
 #, 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:3445
+#: src/transport/plugin_transport_http_server.c:3439
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -8004,51 +8134,51 @@
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3680
-#: src/transport/plugin_transport_udp.c:3779
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
 #, 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:3698
+#: src/transport/plugin_transport_udp.c:3694
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3789
+#: src/transport/plugin_transport_udp.c:3785
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3861
-#: src/transport/plugin_transport_udp.c:3875
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3907
+#: src/transport/plugin_transport_udp.c:3903
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3934
+#: src/transport/plugin_transport_udp.c:3930
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:4000
+#: src/transport/plugin_transport_udp.c:3996
 #, 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:1407
+#: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/plugin_transport_unix.c:1420
+#: src/transport/plugin_transport_unix.c:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/plugin_transport_unix.c:1820
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -8124,7 +8254,7 @@
 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:680
+#: src/transport/transport-testing.c:676
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -8163,12 +8293,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:892 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:895 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -8185,12 +8315,12 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1040
+#: src/util/client.c:1042
 #, 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:1052
+#: src/util/client.c:1054
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -8276,12 +8406,12 @@
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:429
+#: src/util/connection.c:441
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert auf »%s«\n"
 
-#: src/util/connection.c:446
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
@@ -8354,12 +8484,12 @@
 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:1228
+#: src/util/disk.c:1227
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1451 src/util/service.c:1327
+#: src/util/disk.c:1450 src/util/service.c:1322
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -8442,43 +8572,52 @@
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#: src/util/gnunet-config.c:137
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
 
@@ -8573,28 +8712,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:234
+#: src/util/gnunet-scrypt.c:242
 #, 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:295
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:301
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:336
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8609,41 +8748,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:83
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:91
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "URL beginnt nicht mit »%s«\n"
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:105
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:167
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:340
+#: src/util/helper.c:331
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
 
-#: src/util/helper.c:386
+#: src/util/helper.c:382
 #, 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:616
+#: src/util/helper.c:601
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8659,7 +8798,7 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:500
+#: src/util/os_installation.c:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8666,17 +8805,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:860
+#: src/util/os_installation.c:861
 #, 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:920
+#: src/util/os_installation.c:921
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:930
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8702,17 +8841,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:248 src/util/service.c:1461
+#: src/util/program.c:244 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:260 src/util/service.c:1476
+#: src/util/program.c:256 src/util/service.c:1471
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/program.c:265 src/util/service.c:1471
+#: src/util/program.c:261 src/util/service.c:1466
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8742,33 +8881,33 @@
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:952
+#: src/util/resolver_api.c:950
 #, 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
+#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
+#: src/util/resolver_api.c:1061
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/server.c:483
+#: src/util/server.c:478
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:493
+#: src/util/server.c:488
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:499
+#: src/util/server.c:494
 #, fuzzy, c-format
 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:902
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8827,38 +8966,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1174
+#: src/util/service.c:1170
 #, 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:1216
+#: src/util/service.c:1211
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/util/service.c:1265
+#: src/util/service.c:1260
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1264
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1273
+#: src/util/service.c:1268
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1328
+#: src/util/service.c:1323
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1341
+#: src/util/service.c:1336
 #, 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:1411
+#: src/util/service.c:1406
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8867,12 +9006,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/socks.c:597
+#: src/util/socks.c:586
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:610
+#: src/util/socks.c:599
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9113,79 +9252,79 @@
 msgid "Error creating tunnel\n"
 msgstr "Fehler beim Anlegen des Tunnels\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Option »%s« ergibt keinen Sinn mit der Option »%s«.\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Option »%s« oder »%s« ergibt keinen Sinn mit der Option »%s«.\n"
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n"
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr "Ziel-IP des Tunnels"
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr "Name des Dienstes, auf den zugegriffen werden soll"
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 msgid "service is offered via TCP"
 msgstr "Dienst wird über TCP angeboten"
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 msgid "service is offered via UDP"
 msgstr "Dienst wird über UDP angeboten"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
-#: src/include/gnunet_common.h:655
+#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
+#: src/include/gnunet_common.h:656
 #, 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:667
+#: src/include/gnunet_common.h:668
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
+#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
 #, 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"
@@ -9203,10 +9342,6 @@
 #~ 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"
 
@@ -9388,10 +9523,6 @@
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
 #, fuzzy
-#~ msgid "Invalid value for public key\n"
-#~ msgstr "Ungültiger Parameter: `%s'\n"
-
-#, fuzzy
 #~ msgid "Cannot read experiments file `%s'\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/es.po     2016-05-19 13:15:51 UTC (rev 37185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+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,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 #, fuzzy
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
@@ -30,36 +30,36 @@
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, c-format
 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:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 #, 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:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 #, 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:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 #, 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:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,154 +114,154 @@
 # 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:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, 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:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, 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:261
+#: src/arm/gnunet-arm.c:271
 #, 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:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, 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:367
+#: src/arm/gnunet-arm.c:380
 #, 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:377
+#: src/arm/gnunet-arm.c:391
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:434
 #, 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:429
+#: src/arm/gnunet-arm.c:444
 #, 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:466
+#: src/arm/gnunet-arm.c:482
 #, 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:477
+#: src/arm/gnunet-arm.c:493
 #, 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:515
+#: src/arm/gnunet-arm.c:533
 #, 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:523
+#: src/arm/gnunet-arm.c:542
 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:528
+#: src/arm/gnunet-arm.c:547
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr "borrar el directorio y el fichero de configuración al salir"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr "no permite heredar la salida estándar a «gnunet-service-arm»"
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr "no permite heredar la salida de error estándar a «gnunet-service-arm»"
 
 # Miguel: ARM se mantiene en todo el texto, aquí está la traducción.
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
@@ -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:581
+#: src/arm/gnunet-service-arm.c:555
 #, 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:592
+#: src/arm/gnunet-service-arm.c:566
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, 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:717
+#: src/arm/gnunet-service-arm.c:687
 #, 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:753
+#: src/arm/gnunet-service-arm.c:723
 #, 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:891
+#: src/arm/gnunet-service-arm.c:863
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, 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:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, 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:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, 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"
@@ -378,12 +378,14 @@
 "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:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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:3296 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 ""
@@ -405,7 +407,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, fuzzy, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -415,12 +417,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, fuzzy, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, fuzzy, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
@@ -428,7 +430,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
@@ -538,11 +540,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:837
+#: src/ats-tests/ats-testing-log.c:836
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Iniciando descarga «%s».\n"
@@ -598,8 +600,8 @@
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -609,12 +611,12 @@
 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:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n"
 
@@ -690,67 +692,67 @@
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 #, 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:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
@@ -761,8 +763,8 @@
 msgstr "¿cuántos pares reciben un valor?"
 
 #: 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
+#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
+#: src/set/gnunet-set-profiler.c:383
 msgid "number of values"
 msgstr "número de valores"
 
@@ -777,13 +779,13 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:389
 #, 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
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -1073,7 +1075,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:211
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1080,8 +1082,8 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:244
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
@@ -1092,69 +1094,69 @@
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:318
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Colección detenida.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:659
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 #, fuzzy
 msgid "Wrong Spec\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:707
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# reconexiones rápidas fallidas"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:783
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1215,21 +1217,21 @@
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, fuzzy, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:853
+#: src/conversation/gnunet-service-conversation.c:855
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:946
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1360
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "Desconectado de %s\n"
@@ -1298,7 +1300,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
@@ -1309,12 +1311,12 @@
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
 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:186
+#: src/core/gnunet-core.c:185
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -1324,7 +1326,7 @@
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:127
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1354,25 +1356,25 @@
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:766
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:796
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:878
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:917
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1379,99 +1381,99 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:928
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1081
+#: src/core/gnunet-service-core_kx.c:1030
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1039
 #, fuzzy
 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:1091
+#: src/core/gnunet-service-core_kx.c:1092
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1118
+#: src/core/gnunet-service-core_kx.c:1119
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1131
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1202
-#: src/transport/gnunet-service-transport_validation.c:1404
+#: src/core/gnunet-service-core_kx.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1403
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1210
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1214
+#: src/core/gnunet-service-core_kx.c:1215
 #, 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:1250
+#: src/core/gnunet-service-core_kx.c:1251
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/core/gnunet-service-core_kx.c:1289
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1462
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1470
+#: src/core/gnunet-service-core_kx.c:1471
 #, 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:1473
+#: src/core/gnunet-service-core_kx.c:1474
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1531
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1558
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1544
+#: src/core/gnunet-service-core_kx.c:1545
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1586
+#: src/core/gnunet-service-core_kx.c:1587
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1594
+#: src/core/gnunet-service-core_kx.c:1595
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1628
+#: src/core/gnunet-service-core_kx.c:1629
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1496,11 +1498,11 @@
 
 #: 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/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:863
+#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
+#: src/topology/gnunet-daemon-topology.c:611
+#: src/topology/gnunet-daemon-topology.c:723
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
@@ -1530,7 +1532,7 @@
 msgstr "# actualizaciones de mi mapa de tipos"
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:863
+#: src/datastore/gnunet-service-datastore.c:865
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
@@ -1576,9 +1578,9 @@
 #: 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
+#: 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:53
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:53
@@ -1589,7 +1591,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:676 src/include/gnunet_common.h:685
+#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1703,13 +1705,13 @@
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:245
+#: src/datastore/gnunet-datastore.c:244
 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:254
+#: src/datastore/gnunet-datastore.c:253
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
@@ -1718,25 +1720,25 @@
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:444
+#: src/datastore/gnunet-service-datastore.c:446
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:502
+#: src/datastore/gnunet-service-datastore.c:504
 #: 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:533
+#: src/datastore/gnunet-service-datastore.c:535
 #: 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:649
+#: src/datastore/gnunet-service-datastore.c:651
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1745,7 +1747,7 @@
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:707
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1754,7 +1756,7 @@
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:709
+#: src/datastore/gnunet-service-datastore.c:711
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1762,61 +1764,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:715
+#: src/datastore/gnunet-service-datastore.c:717
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:723
+#: src/datastore/gnunet-service-datastore.c:778
+#: src/datastore/gnunet-service-datastore.c:1039
+#: src/datastore/gnunet-service-datastore.c:1673
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:790
+#: src/datastore/gnunet-service-datastore.c:792
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:877
+#: src/datastore/gnunet-service-datastore.c:879
 #, 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:1092
+#: src/datastore/gnunet-service-datastore.c:1094
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1105
+#: src/datastore/gnunet-service-datastore.c:1107
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1153
+#: src/datastore/gnunet-service-datastore.c:1155
 msgid "# UPDATE requests received"
 msgstr "# peticiones «UPDATE» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1185
+#: src/datastore/gnunet-service-datastore.c:1187
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1221
+#: src/datastore/gnunet-service-datastore.c:1223
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1267
+#: src/datastore/gnunet-service-datastore.c:1269
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1279
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1311
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1362
+#: src/datastore/gnunet-service-datastore.c:1364
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1824,62 +1826,62 @@
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1367
+#: src/datastore/gnunet-service-datastore.c:1369
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1420
+#: src/datastore/gnunet-service-datastore.c:1423
 #, 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:1431
+#: src/datastore/gnunet-service-datastore.c:1434
 #, 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:1500
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1566
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1550
+#: src/datastore/gnunet-service-datastore.c:1553
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1560
+#: src/datastore/gnunet-service-datastore.c:1563
 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:1701
-#: src/datastore/gnunet-service-datastore.c:1713
+#: src/datastore/gnunet-service-datastore.c:1704
+#: src/datastore/gnunet-service-datastore.c:1716
 #, 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:1707
+#: src/datastore/gnunet-service-datastore.c:1710
 #, 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:1719
+#: src/datastore/gnunet-service-datastore.c:1722
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1724
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1736
+#: src/datastore/gnunet-service-datastore.c:1739
 #, 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:1754
-#: src/datastore/gnunet-service-datastore.c:1770
+#: src/datastore/gnunet-service-datastore.c:1757
+#: src/datastore/gnunet-service-datastore.c:1773
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
@@ -1886,7 +1888,7 @@
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1800
+#: src/datastore/gnunet-service-datastore.c:1803
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
@@ -1984,7 +1986,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:132
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1993,224 +1995,225 @@
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:181
 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:164 src/dht/gnunet-dht-monitor.c:224
+#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
 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:172
+#: src/dht/gnunet-dht-get.c:195
 msgid "Issueing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:202
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:191
+#: src/dht/gnunet-dht-get.c:215
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
+#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
 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:200 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: 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
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/dht/gnunet-dht-get.c:224
+#: src/dht/gnunet-dht-get.c:248
 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:267
+#: src/dht/gnunet-dht-monitor.c:295
 msgid "how long should the monitor command run"
 msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
 
-#: src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-monitor.c:320
 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:1396 src/testbed/gnunet-testbed-profiler.c:265
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:255
 #, 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:1421
+#: src/dht/gnunet_dht_profiler.c:1417
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
-#: src/dht/gnunet_dht_profiler.c:1424
+#: src/dht/gnunet_dht_profiler.c:1420
 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
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 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:1430
+#: src/dht/gnunet_dht_profiler.c:1426
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1429
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1432
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1435
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1442
+#: src/dht/gnunet_dht_profiler.c:1438
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1460
+#: src/dht/gnunet_dht_profiler.c:1456
 #, 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:119
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr "Petición «PUT» enviada con clave"
 
-#: src/dht/gnunet-dht-put.c:122
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
 
-#: src/dht/gnunet-dht-put.c:125
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr "¡Petición «PUT» no confirmada!\n"
 
-#: src/dht/gnunet-dht-put.c:154
+#: src/dht/gnunet-dht-put.c:157
 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:161
+#: src/dht/gnunet-dht-put.c:164
 #, 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:177
+#: src/dht/gnunet-dht-put.c:180
 #, 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:193
+#: src/dht/gnunet-dht-put.c:196
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:199
 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:205
+#: src/dht/gnunet-dht-put.c:208
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:211
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:237
+#: src/dht/gnunet-dht-put.c:240
 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 "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht.c:172
+#: src/dht/gnunet-service-dht.c:171
 msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-wdht_clients.c:857
+#: src/dht/gnunet-service-xdht_clients.c:854
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:509
+#: src/dht/gnunet-service-wdht_clients.c:938
+#: src/dht/gnunet-service-xdht_clients.c:934
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:593
+#: src/dht/gnunet-service-wdht_clients.c:1004
+#: src/dht/gnunet-service-xdht_clients.c:999
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:794
+#: src/dht/gnunet-service-wdht_clients.c:1213
+#: src/dht/gnunet-service-xdht_clients.c:1201
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:686
+#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-xdht_clients.c:684
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1186
+#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/gnunet-service-xdht_clients.c:651
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
@@ -2269,60 +2272,61 @@
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
-#: 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 "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:735
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:904
-#: src/dht/gnunet-service-xdht_neighbours.c:6056
+#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-xdht_neighbours.c:6062
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-dht_neighbours.c:933
 #: 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:967
+#: src/dht/gnunet-service-dht_neighbours.c:963
 #: 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:1013
+#: src/dht/gnunet-service-dht_neighbours.c:1009
 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:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1043
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1248
+#: src/dht/gnunet-service-dht_neighbours.c:1285
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1263
+#: src/dht/gnunet-service-dht_neighbours.c:1300
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1451
+#: src/dht/gnunet-service-dht_neighbours.c:1447
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1480
+#: src/dht/gnunet-service-dht_neighbours.c:1476
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: 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-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1610
+#: src/dht/gnunet-service-dht_neighbours.c:1717
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2335,57 +2339,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:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1572
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1603
+#: src/dht/gnunet-service-dht_neighbours.c:1599
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1728
+#: src/dht/gnunet-service-dht_neighbours.c:1724
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1815
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1818
+#: src/dht/gnunet-service-dht_neighbours.c:1814
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1990
+#: src/dht/gnunet-service-dht_neighbours.c:1986
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:1994
 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:2093
+#: src/dht/gnunet-service-dht_neighbours.c:2089
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2096
+#: src/dht/gnunet-service-dht_neighbours.c:2092
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2161
+#: src/dht/gnunet-service-dht_neighbours.c:2157
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2175
+#: src/dht/gnunet-service-dht_neighbours.c:2171
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2261
+#: src/dht/gnunet-service-dht_neighbours.c:2257
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2264
+#: src/dht/gnunet-service-dht_neighbours.c:2260
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2494,22 +2498,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3555
+#: src/dht/gnunet-service-xdht_neighbours.c:3557
 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
+#: src/dht/gnunet-service-xdht_neighbours.c:3698
+#: src/dht/gnunet-service-xdht_neighbours.c:3936
+#: src/dht/gnunet-service-xdht_neighbours.c:4088
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5325
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5849
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# respuestas recibidas de otros pares"
@@ -2595,27 +2599,27 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr "sólo monitorizar respuestas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr "Monitorizar consultas DNS."
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr "establece registros de clase A"
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:238
 msgid "set AAAA records"
 msgstr "establece registros de clase AAAA"
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
 
@@ -2656,20 +2660,20 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
 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:1081
+#: src/dns/gnunet-service-dns.c:1080
 #, 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:167
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:176
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
@@ -2828,17 +2832,17 @@
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
+#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
 #, 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:3293 src/exit/gnunet-daemon-exit.c:3301
+#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334
+#: src/exit/gnunet-daemon-exit.c:3333
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2845,12 +2849,12 @@
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
+#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
 #, 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:3371
+#: src/exit/gnunet-daemon-exit.c:3370
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
@@ -2857,12 +2861,12 @@
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3549
+#: src/exit/gnunet-daemon-exit.c:3548
 #, 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:3565
+#: src/exit/gnunet-daemon-exit.c:3563
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2870,7 +2874,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:3573
+#: src/exit/gnunet-daemon-exit.c:3571
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2878,7 +2882,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:3580
+#: src/exit/gnunet-daemon-exit.c:3578
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2886,7 +2890,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:3586
+#: src/exit/gnunet-daemon-exit.c:3584
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2894,16 +2898,16 @@
 "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:3592 src/exit/gnunet-daemon-exit.c:3757
+#: src/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
 #: 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:3704
+#: src/exit/gnunet-daemon-exit.c:3701
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3855
+#: src/exit/gnunet-daemon-exit.c:3852
 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"
 
@@ -3144,17 +3148,17 @@
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
@@ -3163,64 +3167,64 @@
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: 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
+#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
+#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
 #, 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:707
+#: src/fs/fs_publish.c:708
 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:719
+#: src/fs/fs_publish.c:720
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:763
+#: src/fs/fs_publish.c:764
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:783
+#: src/fs/fs_publish.c:784
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:808
+#: src/fs/fs_publish.c:809
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:831
+#: src/fs/fs_publish.c:832
 #, 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:895 src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1008
+#: src/fs/fs_publish.c:1009
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1016
+#: src/fs/fs_publish.c:1017
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1056
+#: src/fs/fs_publish.c:1057
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1296
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1386
+#: src/fs/fs_publish.c:1387
 #, 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"
@@ -3403,33 +3407,33 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, c-format
 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:413
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publicación de «%s» finalizada\n"
 
-#: src/fs/gnunet-auto-share.c:500
+#: src/fs/gnunet-auto-share.c:494
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publicando «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:510
+#: src/fs/gnunet-auto-share.c:504
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:719
+#: src/fs/gnunet-auto-share.c:713
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
@@ -3437,32 +3441,32 @@
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
 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:779 src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 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:782 src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/fs/gnunet-auto-share.c:809
+#: src/fs/gnunet-auto-share.c:801
 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:656
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
@@ -3528,7 +3532,7 @@
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
@@ -3551,12 +3555,12 @@
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
@@ -3564,7 +3568,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
@@ -3600,21 +3604,21 @@
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
 
-#: src/fs/gnunet-fs-profiler.c:191
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
 
-#: src/fs/gnunet-fs-profiler.c:194
+#: src/fs/gnunet-fs-profiler.c:211
 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:197
+#: src/fs/gnunet-fs-profiler.c:214
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
 
-#: src/fs/gnunet-fs-profiler.c:206
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
@@ -3743,18 +3747,18 @@
 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:838 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, 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:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
+#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
 #, 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:910
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3762,7 +3766,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:914
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3770,11 +3774,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:918
+#: src/fs/gnunet-publish.c:917
 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:921
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3782,7 +3786,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:926
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3790,13 +3794,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:934
+#: src/fs/gnunet-publish.c:933
 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:940
+#: src/fs/gnunet-publish.c:939
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3804,7 +3808,7 @@
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
@@ -3811,7 +3815,7 @@
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:948
+#: src/fs/gnunet-publish.c:947
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3819,11 +3823,11 @@
 "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:964
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:123
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
@@ -3830,44 +3834,44 @@
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:200
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error buscando: %s.\n"
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:256
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:280
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:312
 msgid "write search results to file starting with PREFIX"
 msgstr "escribir resultados de búsqueda al fichero que empiecen por «PREFIX»"
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:315
 msgid "automatically terminate search after DELAY"
 msgstr "terminar búsqueda automáticamente después de «DELAY»"
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:322
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:333
 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:272
+#: src/fs/gnunet-service-fs.c:273
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
+#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:729
+#: src/fs/gnunet-service-fs.c:730
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
@@ -3874,9 +3878,9 @@
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: 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
+#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/topology/gnunet-daemon-topology.c:1245
+#: src/topology/gnunet-daemon-topology.c:1253
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -3917,89 +3921,89 @@
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:738
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:747
 #, 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:780
+#: src/fs/gnunet-service-fs_cp.c:785
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:788
+#: src/fs/gnunet-service-fs_cp.c:793
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
+#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:921
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:977
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:985
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:999
+#: src/fs/gnunet-service-fs_cp.c:996
 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:1047
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1118
+#: src/fs/gnunet-service-fs_cp.c:1115
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1140
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/fs/gnunet-service-fs_cp.c:1150
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1251
+#: src/fs/gnunet-service-fs_cp.c:1248
 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
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1337
 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:1361
+#: src/fs/gnunet-service-fs_cp.c:1358
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1372
+#: src/fs/gnunet-service-fs_cp.c:1369
 #, 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:1427
+#: src/fs/gnunet-service-fs_cp.c:1424
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1471
+#: src/fs/gnunet-service-fs_cp.c:1468
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1916
+#: src/fs/gnunet-service-fs_cp.c:1913
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -4243,7 +4247,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:392
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4250,19 +4254,19 @@
 "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
 "servicio GNS!\n"
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 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:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+#: src/gns/gnunet-bcd.c:357
+#, fuzzy, c-format
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
 #: src/gns/gnunet-bcd.c:362
 #, fuzzy, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
+msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
 #: src/gns/gnunet-bcd.c:376
@@ -4271,62 +4275,62 @@
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:532
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:232
+#: src/gns/gnunet-dns2gns.c:238
 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:402
+#: src/gns/gnunet-dns2gns.c:408
 #, 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:418
+#: src/gns/gnunet-dns2gns.c:424
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:432
 #, 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:704
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:730
+#: src/gns/gnunet-dns2gns.c:737
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:758
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:782
 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:779
+#: src/gns/gnunet-dns2gns.c:785
 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:782
+#: src/gns/gnunet-dns2gns.c:788
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
@@ -4333,31 +4337,31 @@
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:798
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
+#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:231
+#: src/gns/gnunet-gns.c:254
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:312
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:460
+#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4364,44 +4368,44 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:415 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:403
+#: src/gns/gnunet-gns.c:429
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:479
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:456
+#: src/gns/gnunet-gns.c:482
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:459
+#: src/gns/gnunet-gns.c:485
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:462
+#: src/gns/gnunet-gns.c:488
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:465
+#: src/gns/gnunet-gns.c:491
 #, 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:468
+#: src/gns/gnunet-gns.c:494
 #, 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:482
+#: src/gns/gnunet-gns.c:508
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -4419,19 +4423,19 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:483
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: 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/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:805
+#: src/hostlist/gnunet-daemon-hostlist_client.c:814
+#: src/hostlist/gnunet-daemon-hostlist_client.c:925
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4498,7 +4502,7 @@
 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:2218 src/rest/gnunet-rest-server.c:536
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -4522,30 +4526,30 @@
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3003
+#: src/gns/gnunet-gns-proxy.c:2999
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3039 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:3105
+#: src/gns/gnunet-gns-proxy.c:3101
 #, 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:3146
+#: src/gns/gnunet-gns-proxy.c:3141
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3144
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3163
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
@@ -4643,11 +4647,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:423
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:697
+#: src/gns/plugin_rest_gns.c:717
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -4815,11 +4819,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:329
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:334
+#: src/hostlist/gnunet-daemon-hostlist.c:333
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4827,16 +4831,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:337
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 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:341
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:357
+#: src/hostlist/gnunet-daemon-hostlist.c:356
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -4860,7 +4864,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:1413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -4869,7 +4873,7 @@
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:728
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4878,68 +4882,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:866
+#: src/hostlist/gnunet-daemon-hostlist_client.c:856
 #, 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:880
+#: src/hostlist/gnunet-daemon-hostlist_client.c:870
 #, 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:900
+#: src/hostlist/gnunet-daemon-hostlist_client.c:890
 #, 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:906
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, 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:914
+#: src/hostlist/gnunet-daemon-hostlist_client.c:904
 #, 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:967
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #, 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:975
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
 #, 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:1183
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
 #, 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:1364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
 #, 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:1373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
@@ -4946,16 +4950,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:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
 #, 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:1410
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
@@ -4962,36 +4966,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:1463
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, 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:1487
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
 #, 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:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
-#: src/transport/plugin_transport_http_client.c:2282
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
+#: src/transport/plugin_transport_http_client.c:2273
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
 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:1652
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -5011,7 +5015,7 @@
 #: 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
+#: src/topology/gnunet-daemon-topology.c:866
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -5071,45 +5075,50 @@
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:857
+#: src/transport/gnunet-service-transport.c:856
 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:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:755
 #, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Número de puerto %llu no válido.  Saliendo.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#, 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:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:782
 #, 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:798
+#: src/hostlist/gnunet-daemon-hostlist_server.c:795
 #, 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:811
+#: src/hostlist/gnunet-daemon-hostlist_server.c:808
 #, 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:832
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, 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:852
+#: src/hostlist/gnunet-daemon-hostlist_server.c:849
 #, 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:892
+#: src/hostlist/gnunet-daemon-hostlist_server.c:889
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5125,21 +5134,21 @@
 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:325
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:328
+#: src/identity/gnunet-identity.c:327
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/identity/gnunet-identity.c:331
+#: src/identity/gnunet-identity.c:330
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
 
-#: src/identity/gnunet-identity.c:334
+#: src/identity/gnunet-identity.c:333
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
@@ -5146,17 +5155,17 @@
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:337
+#: src/identity/gnunet-identity.c:336
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
 
-#: src/identity/gnunet-identity.c:340
+#: src/identity/gnunet-identity.c:339
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:349
+#: src/identity/gnunet-identity.c:348
 msgid "Maintain egos"
 msgstr ""
 
@@ -5209,7 +5218,7 @@
 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:923
+#: src/identity/plugin_rest_identity.c:938
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5222,7 +5231,7 @@
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1089
+#: src/identity-provider/plugin_rest_identity_provider.c:1126
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5262,16 +5271,16 @@
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namecache/gnunet-namecache.c:235
+#: src/namecache/gnunet-namecache.c:233
 #, 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:246 src/namestore/gnunet-namestore.c:1114
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5316,13 +5325,13 @@
 msgstr "No se pudo añadir el registro: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:532
+#: src/namestore/plugin_rest_namestore.c:547
 #, 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:337
-#: src/namestore/plugin_rest_namestore.c:541
+#: src/namestore/plugin_rest_namestore.c:556
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
@@ -5340,7 +5349,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:565
+#: src/namestore/plugin_rest_namestore.c:580
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
@@ -5352,9 +5361,9 @@
 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
+#: src/namestore/plugin_rest_namestore.c:954
+#: src/transport/gnunet-transport.c:1769
+#: src/transport/gnunet-transport-profiler.c:497
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
@@ -5366,7 +5375,7 @@
 
 #: src/namestore/gnunet-namestore.c:717
 #: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:954
+#: src/namestore/plugin_rest_namestore.c:963
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
@@ -5383,14 +5392,14 @@
 msgstr "añadir"
 
 #: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:635
+#: src/namestore/plugin_rest_namestore.c:650
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
 #: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:653
-#: src/namestore/plugin_rest_namestore.c:693
+#: src/namestore/plugin_rest_namestore.c:668
+#: src/namestore/plugin_rest_namestore.c:708
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
@@ -5409,7 +5418,8 @@
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#: src/namestore/gnunet-namestore.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:819
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -5420,42 +5430,42 @@
 msgstr "URI no válida: «%s»\n"
 
 #: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:984
+#: src/namestore/plugin_rest_namestore.c:999
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
 #: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1011
+#: src/namestore/plugin_rest_namestore.c:1026
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
 #: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1066
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore.c:1016
-#: src/namestore/plugin_rest_namestore.c:1092
+#: src/namestore/gnunet-namestore.c:1015
+#: src/namestore/plugin_rest_namestore.c:1107
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1064
+#: src/namestore/gnunet-namestore.c:1063
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1066
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1070
+#: src/namestore/gnunet-namestore.c:1069
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1072
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
@@ -5462,44 +5472,44 @@
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1076
+#: src/namestore/gnunet-namestore.c:1075
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1079
+#: src/namestore/gnunet-namestore.c:1078
 #, 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:1085
+#: src/namestore/gnunet-namestore.c:1084
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1088
+#: src/namestore/gnunet-namestore.c:1087
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1091
+#: src/namestore/gnunet-namestore.c:1090
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1094
+#: src/namestore/gnunet-namestore.c:1093
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1097
+#: src/namestore/gnunet-namestore.c:1096
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1100
+#: src/namestore/gnunet-namestore.c:1099
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1103
+#: src/namestore/gnunet-namestore.c:1102
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5560,7 +5570,7 @@
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1018
 #, fuzzy
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
@@ -5580,7 +5590,7 @@
 msgid "flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:1176
+#: src/namestore/plugin_rest_namestore.c:1187
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5601,92 +5611,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:392
+#: src/nat/nat_auto.c:388
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:389
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:412
+#: src/nat/nat_auto.c:408
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:444
+#: src/nat/nat_auto.c:440
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:576
+#: src/nat/nat_auto.c:574
 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:594
+#: src/nat/nat_auto.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:662 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:716
+#: src/nat/nat_auto.c:709
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:717
+#: src/nat/nat_auto.c:710
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:749
+#: src/nat/nat_auto.c:742
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
 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:798
+#: src/nat/nat_auto.c:788
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1024
+#: src/nat/nat.c:1019
 #, 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:1074
+#: src/nat/nat.c:1070
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat.c:1325
+#: src/nat/nat.c:1321
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1400
+#: src/nat/nat.c:1396
 #, 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:1544
+#: src/nat/nat.c:1540
 msgid "malformed"
 msgstr "mal formado"
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:1594
 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
+#: src/nat/nat.c:1723 src/nat/nat.c:1736
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5695,107 +5705,107 @@
 "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:1895
+#: src/nat/nat.c:1891
 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:1911
+#: src/nat/nat.c:1907
 #, 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:2002
+#: src/nat/nat.c:1998
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2000
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2002
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2004
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2006
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2008
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2010
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2012
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2014
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2016
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2018
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2020
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2022
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2024
 #, 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:2030
+#: src/nat/nat.c:2026
 #, 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:2032
+#: src/nat/nat.c:2028
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2030
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2032
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2034
 #, 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:201
+#: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat_mini.c:605
+#: src/nat/nat_mini.c:611
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
@@ -5806,7 +5816,7 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/nat_test.c:495
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
@@ -5825,57 +5835,57 @@
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/nse/gnunet-nse-profiler.c:840
 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:860
+#: src/nse/gnunet-nse-profiler.c:843
 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:866
+#: src/nse/gnunet-nse-profiler.c:849
 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:869
+#: src/nse/gnunet-nse-profiler.c:852
 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:875
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1533
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
+#: src/nse/gnunet-service-nse.c:1535
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:225
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:382
+#: src/peerinfo/gnunet-service-peerinfo.c:411
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:491
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:529
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5883,27 +5893,27 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:683
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:689
 #, c-format
 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:1056
+#: src/peerinfo/gnunet-service-peerinfo.c:1061
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1375
+#: src/peerinfo/gnunet-service-peerinfo.c:1391
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1388
+#: src/peerinfo/gnunet-service-peerinfo.c:1404
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5936,7 +5946,7 @@
 "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:267
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
@@ -5986,44 +5996,44 @@
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:844
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:884
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:887
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:890
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:893
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:896
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:902
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:905
 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:920
+#: src/peerinfo-tool/gnunet-peerinfo.c:919
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -6045,34 +6055,34 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
+#: src/peerstore/gnunet-service-peerstore.c:395
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:391
+#: src/peerstore/gnunet-service-peerstore.c:402
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
 # Miguel: "shutdown request" se refiere a finalizar el
 # que hace de cliente.
-#: src/peerstore/gnunet-service-peerstore.c:451
+#: src/peerstore/gnunet-service-peerstore.c:462
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr ""
 "Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:459
+#: src/peerstore/gnunet-service-peerstore.c:470
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
 # Miguel: "Drop" en bases de datos es eliminar una tabla
 # del modelo.
-#: src/peerstore/gnunet-service-peerstore.c:478
+#: src/peerstore/gnunet-service-peerstore.c:489
 #, fuzzy
 msgid "Failed to store requested value, database error."
 msgstr ""
@@ -6079,12 +6089,12 @@
 "Se produjo un fallo al transmitir la petición de eliminación a la base de "
 "datos.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:557
+#: src/peerstore/gnunet-service-peerstore.c:568
 #, fuzzy
 msgid "No database backend configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:579
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
@@ -6094,32 +6104,32 @@
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:374
+#: src/peerstore/peerstore_api.c:376
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:677
+#: src/peerstore/peerstore_api.c:679
 #, 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:688
+#: src/peerstore/peerstore_api.c:690
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/peerstore/peerstore_api.c:707
+#: src/peerstore/peerstore_api.c:709
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:819
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:831
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6174,63 +6184,63 @@
 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:422
+#: src/psycstore/gnunet-service-psycstore.c:423
 #, 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:453
+#: src/psycstore/gnunet-service-psycstore.c:454
 #, 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:481
+#: src/psycstore/gnunet-service-psycstore.c:482
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:664
+#: src/psycstore/gnunet-service-psycstore.c:665
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:674
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:714
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:745
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:765
+#: src/psycstore/gnunet-service-psycstore.c:784
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:807
+#: src/psycstore/gnunet-service-psycstore.c:858
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:834
+#: src/psycstore/gnunet-service-psycstore.c:873
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
@@ -6302,8 +6312,7 @@
 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:656
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -6315,17 +6324,12 @@
 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:1284
+#: src/regex/gnunet-regex-profiler.c:1301
 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: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:1324
-#: src/regex/gnunet-regex-simulation-profiler.c:619
+#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
@@ -6332,30 +6336,30 @@
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1330
-#: src/regex/gnunet-regex-simulation-profiler.c:626
+#: src/regex/gnunet-regex-profiler.c:1348
+#: src/regex/gnunet-regex-simulation-profiler.c:646
 #, 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:1337
+#: src/regex/gnunet-regex-profiler.c:1355
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1346
+#: src/regex/gnunet-regex-profiler.c:1364
 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:1366
+#: src/regex/gnunet-regex-profiler.c:1384
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1472
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
@@ -6362,34 +6366,34 @@
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1460
+#: src/regex/gnunet-regex-profiler.c:1478
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1463
+#: src/regex/gnunet-regex-profiler.c:1481
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1493
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/regex/gnunet-regex-simulation-profiler.c:686
+#: src/regex/gnunet-regex-simulation-profiler.c:704
 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:689
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:702
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
@@ -6398,17 +6402,17 @@
 msgid "Regex `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:792
+#: src/rest/gnunet-rest-server.c:784
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/rest/gnunet-rest-server.c:809
+#: src/rest/gnunet-rest-server.c:801
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/revocation/gnunet-revocation.c:124
+#: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
@@ -6415,102 +6419,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:129
+#: src/revocation/gnunet-revocation.c:134
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "El servicio «%s» se ha parado.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:140
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Error interno."
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:171
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:292
+#: src/revocation/gnunet-revocation.c:320
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:322
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/revocation/gnunet-revocation.c:343
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:363
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:405
+#: src/revocation/gnunet-revocation.c:435
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:439
+#: src/revocation/gnunet-revocation.c:468
 #, 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:461
+#: src/revocation/gnunet-revocation.c:489
 #, 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:486
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:533
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:536
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
+#: src/revocation/gnunet-revocation.c:539
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6549,7 +6553,7 @@
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps.c:185
+#: src/rps/gnunet-rps.c:177
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6588,29 +6592,29 @@
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:352
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 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:355
+#: src/scalarproduct/gnunet-scalarproduct.c:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6619,23 +6623,23 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:611
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:617
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2015
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6663,10 +6667,138 @@
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/set/gnunet-set-profiler.c:383
+#: src/set/gnunet-set-profiler.c:386
 msgid "operation to execute"
 msgstr ""
 
+#: src/social/gnunet-social.c:1138
+#, fuzzy
+msgid "--place missing or invalid.\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/social/gnunet-social.c:1180
+msgid "assign --name in state to --data"
+msgstr ""
+
+#: src/social/gnunet-social.c:1184
+msgid "say good-bye and leave somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1188
+msgid "create a place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1192
+msgid "destroy a place we were hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1196
+msgid "enter somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1200
+msgid "find state matching name prefix"
+msgstr ""
+
+#: src/social/gnunet-social.c:1204
+msgid "replay history of messages up to the given --limit"
+msgstr ""
+
+#: src/social/gnunet-social.c:1208
+msgid "reconnect to a previously created place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1212
+msgid "publish something to a place we are hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1216
+msgid "reconnect to a previously entered place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1220
+msgid "search for state matching exact name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1224
+msgid "submit something to somebody's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1228
+msgid "list of egos and subscribed places"
+msgstr ""
+
+#: src/social/gnunet-social.c:1232
+msgid "extract and replay history between message IDs --start and --until"
+msgstr ""
+
+#: src/social/gnunet-social.c:1239
+msgid "application ID to use when connecting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1243
+msgid "message body or state value"
+msgstr ""
+
+#: src/social/gnunet-social.c:1247
+#, fuzzy
+msgid "name or public key of ego"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/social/gnunet-social.c:1251
+#, fuzzy
+msgid "wait for incoming messages"
+msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#: src/social/gnunet-social.c:1255
+#, fuzzy
+msgid "GNS name"
+msgstr "Mostrar el _nombre"
+
+#: src/social/gnunet-social.c:1259
+msgid "peer ID for --guest-enter"
+msgstr ""
+
+#: src/social/gnunet-social.c:1263
+msgid "name (key) to query from state"
+msgstr ""
+
+#: src/social/gnunet-social.c:1267
+#, fuzzy
+msgid "method name"
+msgstr "Mostrar el _nombre"
+
+#: src/social/gnunet-social.c:1271
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/social/gnunet-social.c:1275
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1279
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1283
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1287
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1291
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1301
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6687,11 +6819,11 @@
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:194
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:200
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
@@ -6700,7 +6832,7 @@
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:240
+#: src/statistics/gnunet-statistics.c:241
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
@@ -6816,7 +6948,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:291
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
@@ -6844,63 +6976,63 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:322
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
 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/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
 #: src/testing/testing.c:293 src/util/gnunet-ecc.c:298
 #, c-format
 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:475
+#: src/testbed/gnunet-daemon-testbed-underlay.c:468
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:732
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, 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:1019
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 #, 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:1057
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, 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"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
 msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:248
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:284
 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:297
+#: src/testbed/gnunet-testbed-profiler.c:287
 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 "
@@ -6932,11 +7064,11 @@
 msgid "Adding host %u failed with error: %s\n"
 msgstr "No se pudo añadir la máquina %u por el error: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:987
+#: src/testbed/testbed_api_testbed.c:986
 #, 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"
@@ -7041,22 +7173,22 @@
 "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
 "grande?)\n"
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 "extraer los ficheros de claves de máquinas de una lista pre-computada de "
 "claves de máquinas"
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -7064,15 +7196,15 @@
 "número de ficheros de configuración únicos o claves de máquina a crear, o el "
 "número de claves de máquina a extraer"
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
@@ -7173,36 +7305,36 @@
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:634
+#: src/topology/gnunet-daemon-topology.c:730
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:931
+#: src/topology/gnunet-daemon-topology.c:927
 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:964
+#: src/topology/gnunet-daemon-topology.c:960
 #, 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:971
+#: src/topology/gnunet-daemon-topology.c:967
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:989
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1003
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7210,7 +7342,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:1009
+#: src/topology/gnunet-daemon-topology.c:1005
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
@@ -7217,17 +7349,17 @@
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1043
+#: src/topology/gnunet-daemon-topology.c:1039
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1288
+#: src/topology/gnunet-daemon-topology.c:1283
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7462,41 +7594,41 @@
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3357
+#: src/transport/gnunet-service-transport_neighbours.c:3353
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3393
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3488
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3528
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3546
+#: src/transport/gnunet-service-transport_neighbours.c:3542
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3680
+#: src/transport/gnunet-service-transport_neighbours.c:3676
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7531,8 +7663,8 @@
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:949
+#: src/transport/gnunet-service-transport_validation.c:1551
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -7560,11 +7692,11 @@
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1076
+#: src/transport/gnunet-service-transport_validation.c:1075
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:1127
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, fuzzy, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
@@ -7571,20 +7703,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:1140
+#: src/transport/gnunet-service-transport_validation.c:1139
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1143
+#: src/transport/gnunet-service-transport_validation.c:1142
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1151
+#: src/transport/gnunet-service-transport_validation.c:1150
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1163
 #, fuzzy, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7593,28 +7725,28 @@
 "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:1219
+#: src/transport/gnunet-service-transport_validation.c:1218
 #, 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:1270
+#: src/transport/gnunet-service-transport_validation.c:1269
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1279
+#: src/transport/gnunet-service-transport_validation.c:1278
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/transport/gnunet-service-transport_validation.c:1441
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1460
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1515
+#: src/transport/gnunet-service-transport_validation.c:1514
 #, fuzzy
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
@@ -7625,7 +7757,7 @@
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
 #: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:282
+#: src/transport/gnunet-transport-profiler.c:277
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
@@ -7635,7 +7767,7 @@
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:621
 #, 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"
@@ -7642,36 +7774,36 @@
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:635
+#: src/transport/gnunet-transport.c:633
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
 #, 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:667
+#: src/transport/gnunet-transport.c:663
 #, 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:672
+#: src/transport/gnunet-transport.c:668
 #, 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:677
+#: src/transport/gnunet-transport.c:673
 #, 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:682
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:807
+#: src/transport/gnunet-transport.c:803
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7680,39 +7812,39 @@
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:842
+#: src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
 #, 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:993
+#: src/transport/gnunet-transport.c:982
 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:1007
+#: src/transport/gnunet-transport.c:996
 #, 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:1032
+#: src/transport/gnunet-transport.c:1021
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:1078
+#: src/transport/gnunet-transport.c:1067
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:1107
+#: src/transport/gnunet-transport.c:1096
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7721,42 +7853,42 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:1144
-#: src/transport/gnunet-transport-profiler.c:439
+#: src/transport/gnunet-transport.c:1133
+#: src/transport/gnunet-transport-profiler.c:432
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
+#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
 #, 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:1171
+#: src/transport/gnunet-transport.c:1160
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1197
+#: src/transport/gnunet-transport.c:1186
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1221
-#: src/transport/gnunet-transport-profiler.c:464
+#: src/transport/gnunet-transport.c:1210
+#: src/transport/gnunet-transport-profiler.c:457
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1261
+#: src/transport/gnunet-transport.c:1250
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1262
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1809
+#: src/transport/gnunet-transport.c:1792
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7765,7 +7897,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1817
+#: src/transport/gnunet-transport.c:1800
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7773,56 +7905,56 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1840
+#: src/transport/gnunet-transport.c:1823
 #, 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
+#: src/transport/gnunet-transport.c:1829
 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
+#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
+#: src/transport/gnunet-transport.c:1925
+#: src/transport/gnunet-transport-profiler.c:553
 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:1889
+#: src/transport/gnunet-transport.c:1872
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:1972
 #, 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:1993
+#: src/transport/gnunet-transport.c:1975
 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:1996
+#: src/transport/gnunet-transport.c:1978
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport.c:1981
 #, 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:2002
+#: src/transport/gnunet-transport.c:1984
 #, 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:2005
+#: src/transport/gnunet-transport.c:1987
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1993
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
@@ -7829,57 +7961,57 @@
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:2014
+#: src/transport/gnunet-transport.c:1996
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:2017
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport-profiler.c:618
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:2020
+#: src/transport/gnunet-transport.c:2002
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:2023
+#: src/transport/gnunet-transport.c:2005
 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:2026
+#: src/transport/gnunet-transport.c:2008
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:2037
-#: src/transport/gnunet-transport-profiler.c:637
+#: src/transport/gnunet-transport.c:2019
+#: src/transport/gnunet-transport-profiler.c:629
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/gnunet-transport-profiler.c:226
+#: src/transport/gnunet-transport-profiler.c:221
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:262
+#: src/transport/gnunet-transport-profiler.c:257
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:271
+#: src/transport/gnunet-transport-profiler.c:266
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:288
+#: src/transport/gnunet-transport-profiler.c:283
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:341
+#: src/transport/gnunet-transport-profiler.c:336
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:361
+#: src/transport/gnunet-transport-profiler.c:356
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7888,37 +8020,37 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport-profiler.c:411
+#: src/transport/gnunet-transport-profiler.c:404
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "Conectado a %s.\n"
 
-#: src/transport/gnunet-transport-profiler.c:418
+#: src/transport/gnunet-transport-profiler.c:411
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport-profiler.c:480
+#: src/transport/gnunet-transport-profiler.c:473
 #, fuzzy, c-format
 msgid "Denying connection to `%s'\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/transport/gnunet-transport-profiler.c:510
+#: src/transport/gnunet-transport-profiler.c:503
 #, fuzzy
 msgid "Message size too big!\n"
 msgstr "tamaño del mensaje"
 
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport-profiler.c:509
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/transport/gnunet-transport-profiler.c:524
 #, 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:537
+#: src/transport/gnunet-transport-profiler.c:530
 #, fuzzy, c-format
 msgid "Trying to receive messages from peer `%s'\n"
 msgstr ""
@@ -7925,49 +8057,49 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-transport-profiler.c:542
+#: src/transport/gnunet-transport-profiler.c:535
 #, fuzzy
 msgid "No operation given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/transport/gnunet-transport-profiler.c:542
 #, 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
+#: src/transport/gnunet-transport-profiler.c:603
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport-profiler.c:606
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/transport/gnunet-transport-profiler.c:617
+#: src/transport/gnunet-transport-profiler.c:609
 #, fuzzy
 msgid "iterations"
 msgstr "Otras configuraciones"
 
-#: src/transport/gnunet-transport-profiler.c:620
+#: src/transport/gnunet-transport-profiler.c:612
 #, fuzzy
 msgid "number of messages to send"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 #, fuzzy
 msgid "message size to use"
 msgstr "tamaño del mensaje"
 
-#: 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_http_client.c:1473
+#: src/transport/plugin_transport_http_server.c:2237
+#: src/transport/plugin_transport_http_server.c:3427
 #: 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
+#: src/transport/plugin_transport_http_client.c:2114
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -7974,24 +8106,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:2172
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_client.c:2163
+#: src/transport/plugin_transport_http_server.c:3142
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
-#: src/transport/plugin_transport_http_server.c:3218
+#: src/transport/plugin_transport_http_client.c:2180
+#: src/transport/plugin_transport_http_server.c:3212
 #, 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:2223
+#: src/transport/plugin_transport_http_client.c:2214
 #, 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:1733
+#: src/transport/plugin_transport_http_server.c:1721
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -8000,12 +8132,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:1965
+#: src/transport/plugin_transport_http_server.c:1955
 #, 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:1973
+#: src/transport/plugin_transport_http_server.c:1963
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -8013,7 +8145,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:2123
+#: src/transport/plugin_transport_http_server.c:2113
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -8021,7 +8153,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:2146
+#: src/transport/plugin_transport_http_server.c:2136
 #, fuzzy, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
@@ -8028,58 +8160,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:2273
+#: src/transport/plugin_transport_http_server.c:2263
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2582
+#: src/transport/plugin_transport_http_server.c:2572
 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:2616 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2606 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:2634 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2624 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:2747
+#: src/transport/plugin_transport_http_server.c:2737
 #, 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:2825
-#: src/transport/plugin_transport_udp.c:3604
+#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_udp.c:3600
 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:2924
+#: src/transport/plugin_transport_http_server.c:2918
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2933
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2945
+#: src/transport/plugin_transport_http_server.c:2939
 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:2956
+#: src/transport/plugin_transport_http_server.c:2950
 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:2962
+#: src/transport/plugin_transport_http_server.c:2956
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2970
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8086,12 +8218,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:2986
+#: src/transport/plugin_transport_http_server.c:2980
 #, 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:3008
+#: src/transport/plugin_transport_http_server.c:3002
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -8098,27 +8230,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:3018
+#: src/transport/plugin_transport_http_server.c:3012
 #, 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:3081
+#: src/transport/plugin_transport_http_server.c:3075
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3102
+#: src/transport/plugin_transport_http_server.c:3096
 #, 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:3119
+#: src/transport/plugin_transport_http_server.c:3113
 #, 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:3445
+#: src/transport/plugin_transport_http_server.c:3439
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8307,52 +8439,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:3680
-#: src/transport/plugin_transport_udp.c:3779
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
 #, 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:3698
+#: src/transport/plugin_transport_udp.c:3694
 #, 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:3789
+#: src/transport/plugin_transport_udp.c:3785
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3861
-#: src/transport/plugin_transport_udp.c:3875
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3907
+#: src/transport/plugin_transport_udp.c:3903
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3934
+#: src/transport/plugin_transport_udp.c:3930
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:4000
+#: src/transport/plugin_transport_udp.c:3996
 #, 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:1407
+#: src/transport/plugin_transport_unix.c:1403
 #, 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:1420
+#: src/transport/plugin_transport_unix.c:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/transport/plugin_transport_unix.c:1820
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
@@ -8432,7 +8564,7 @@
 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:680
+#: src/transport/transport-testing.c:676
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
@@ -8470,13 +8602,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:890 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:892 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:895 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -8495,12 +8627,12 @@
 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:1040
+#: src/util/client.c:1042
 #, 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:1052
+#: src/util/client.c:1054
 #, 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"
@@ -8586,12 +8718,12 @@
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:429
+#: src/util/connection.c:441
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Acceso denegado a «%s»\n"
 
-#: src/util/connection.c:446
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
@@ -8670,12 +8802,12 @@
 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:1228
+#: src/util/disk.c:1227
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1451 src/util/service.c:1327
+#: src/util/disk.c:1450 src/util/service.c:1322
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -8758,44 +8890,53 @@
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/util/gnunet-config.c:137
 #, c-format
 msgid "--section argument is required\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr "el parámetro --option es necesario para establecer un valor\n"
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 "obtener la opción del valor como un nombre de fichero (con expansión del $)"
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 msgid "name of the option to access"
 msgstr "nombre de la opción a la que acceder"
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr "valor a establecer"
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
@@ -8888,28 +9029,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:234
+#: src/util/gnunet-scrypt.c:242
 #, 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:295
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:301
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:336
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -8925,36 +9066,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:83
+#: src/util/gnunet-uri.c:85
 #, 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:88
+#: src/util/gnunet-uri.c:91
 #, 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:95
+#: src/util/gnunet-uri.c:98
 #, 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:105
+#: src/util/gnunet-uri.c:108
 #, 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:167
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:340
+#: src/util/helper.c:331
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:386
+#: src/util/helper.c:382
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
@@ -8961,7 +9102,7 @@
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:616
+#: src/util/helper.c:601
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -8979,7 +9120,7 @@
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:500
+#: src/util/os_installation.c:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8988,17 +9129,17 @@
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:860
+#: src/util/os_installation.c:861
 #, 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:920
+#: src/util/os_installation.c:921
 #, 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:930
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -9022,17 +9163,17 @@
 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:248 src/util/service.c:1461
+#: src/util/program.c:244 src/util/service.c:1456
 #, 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:260 src/util/service.c:1476
+#: src/util/program.c:256 src/util/service.c:1471
 #, 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:265 src/util/service.c:1471
+#: src/util/program.c:261 src/util/service.c:1466
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -9065,34 +9206,34 @@
 # 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
+#: src/util/resolver_api.c:950
 #, 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
+#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
+#: src/util/resolver_api.c:1061
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/server.c:483
+#: src/util/server.c:478
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/server.c:493
+#: src/util/server.c:488
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/util/server.c:499
+#: src/util/server.c:494
 #, fuzzy, c-format
 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:902
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9163,39 +9304,39 @@
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1174
+#: src/util/service.c:1170
 #, 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:1216
+#: src/util/service.c:1211
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1265
+#: src/util/service.c:1260
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1269
+#: src/util/service.c:1264
 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:1273
+#: src/util/service.c:1268
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1328
+#: src/util/service.c:1323
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1341
+#: src/util/service.c:1336
 #, 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:1411
+#: src/util/service.c:1406
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -9204,12 +9345,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "señal (%d, %p) devolvió %d.\n"
 
-#: src/util/socks.c:597
+#: src/util/socks.c:586
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:610
+#: src/util/socks.c:599
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9459,83 +9600,87 @@
 msgid "Error creating tunnel\n"
 msgstr "Error creando el túnel\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "«%s» no es un identificador de par válido\n"
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv4"
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr "petición cuyo resultado debe ser una dirección IPv6"
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr "IP de destino para el túnel"
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr "par que ofrece el servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr "nombre del servicio al que nos gustaría acceder"
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 msgid "service is offered via TCP"
 msgstr "el servicio es ofrecido vía TCP"
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 msgid "service is offered via UDP"
 msgstr "el servicio es ofrecido vía UDP"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
-#: src/include/gnunet_common.h:655
+#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
+#: src/include/gnunet_common.h:656
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:667
+#: src/include/gnunet_common.h:668
 #, 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:694 src/include/gnunet_common.h:703
+#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
 #, 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"
 
+#, fuzzy
+#~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#~ msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
+
 #~ msgid "timeout in MSECS milliseconds for completing current operation"
 #~ msgstr "plazo en milisegundos (MSECS) para completar la operación actual"
 
@@ -9564,10 +9709,6 @@
 #~ 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"
 
@@ -9884,10 +10025,6 @@
 #~ msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
 #, fuzzy
-#~ msgid "Invalid value for public key\n"
-#~ msgstr "Parámetro no válido «%s»\n"
-
-#, fuzzy
 #~ msgid "Cannot read experiments file `%s'\n"
 #~ msgstr "No se pudo leer la lista de amigos «%s»\n"
 
@@ -11755,10 +11892,6 @@
 #~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
 #, fuzzy
-#~ msgid "Phase 3: sending messages\n"
-#~ msgstr "Falló al entregar el mensaje '%s'.\n"
-
-#, fuzzy
 #~ msgid "Loading HTTPS transport plugin `%s'\n"
 #~ msgstr "Probando transporte(s) %s\n"
 
@@ -14206,9 +14339,6 @@
 #~ msgid "_Quit"
 #~ msgstr "_Salir"
 
-#~ msgid "Show _name"
-#~ msgstr "Mostrar el _nombre"
-
 #~ msgid "Show range (Y/M/N)"
 #~ msgstr "Muestra el rango (Y/M/N)"
 

Modified: gnunet/po/fr.po
===================================================================
--- gnunet/po/fr.po     2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/fr.po     2016-05-19 13:15:51 UTC (rev 37185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+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,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,225 +25,225 @@
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr "API ARM occupé"
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, c-format
 msgid "%s service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, c-format
 msgid "%s service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:261
+#: src/arm/gnunet-arm.c:271
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:380
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:391
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:434
 #, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:444
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:466
+#: src/arm/gnunet-arm.c:482
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:477
+#: src/arm/gnunet-arm.c:493
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:515
+#: src/arm/gnunet-arm.c:533
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:542
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:547
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -255,64 +255,64 @@
 msgid "Could not send list result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:581
+#: src/arm/gnunet-service-arm.c:555
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:592
+#: src/arm/gnunet-service-arm.c:566
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:717
+#: src/arm/gnunet-service-arm.c:687
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:753
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:863
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -342,11 +342,13 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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/gnunet-ats-solver-eval.c:3296 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 ""
@@ -367,7 +369,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -374,18 +376,18 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
@@ -488,11 +490,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:836
 msgid "Stop logging\n"
 msgstr "Arrêter la journalisation\n"
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, c-format
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
@@ -540,8 +542,8 @@
 msgstr ""
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -551,12 +553,12 @@
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
@@ -621,63 +623,63 @@
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, c-format
 msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 msgid "provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 msgid "provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 msgid "provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 msgid "provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 msgid "number of peers in consensus"
 msgstr ""
 
@@ -687,8 +689,8 @@
 msgstr ""
 
 #: 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
+#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
+#: src/set/gnunet-set-profiler.c:383
 msgid "number of values"
 msgstr "nombre de valeurs"
 
@@ -701,12 +703,12 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:389
 msgid "write statistics to file"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:514
-#: src/secretsharing/gnunet-secretsharing-profiler.c:623
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -989,7 +991,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:211
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -996,8 +998,8 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:244
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -1008,64 +1010,64 @@
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:318
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: 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:646
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, 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:659
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: 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:700
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: 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:707
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: 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:783
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1124,20 +1126,20 @@
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:853
+#: src/conversation/gnunet-service-conversation.c:855
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:946
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1360
 #, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr ""
@@ -1198,7 +1200,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
@@ -1207,11 +1209,11 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:186
+#: src/core/gnunet-core.c:185
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -1219,7 +1221,7 @@
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:127
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
@@ -1249,23 +1251,23 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:766
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:796
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:878
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:917
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1272,92 +1274,92 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:928
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1081
+#: src/core/gnunet-service-core_kx.c:1030
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1039
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1091
+#: src/core/gnunet-service-core_kx.c:1092
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1118
+#: src/core/gnunet-service-core_kx.c:1119
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1131
+#: src/core/gnunet-service-core_kx.c:1132
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1202
-#: src/transport/gnunet-service-transport_validation.c:1404
+#: src/core/gnunet-service-core_kx.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1403
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1210
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1214
+#: src/core/gnunet-service-core_kx.c:1215
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1251
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/core/gnunet-service-core_kx.c:1289
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1462
+#: src/core/gnunet-service-core_kx.c:1463
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1470
+#: src/core/gnunet-service-core_kx.c:1471
 #, 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:1473
+#: src/core/gnunet-service-core_kx.c:1474
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1531
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1558
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1544
+#: src/core/gnunet-service-core_kx.c:1545
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1586
+#: src/core/gnunet-service-core_kx.c:1587
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1594
+#: src/core/gnunet-service-core_kx.c:1595
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1628
+#: src/core/gnunet-service-core_kx.c:1629
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1381,11 +1383,11 @@
 
 #: 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/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:863
+#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
+#: src/topology/gnunet-daemon-topology.c:611
+#: src/topology/gnunet-daemon-topology.c:723
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
@@ -1413,7 +1415,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:863
+#: src/datastore/gnunet-service-datastore.c:865
 msgid "# bytes stored"
 msgstr ""
 
@@ -1456,9 +1458,9 @@
 #: 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
+#: 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:53
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:53
@@ -1469,7 +1471,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:676 src/include/gnunet_common.h:685
+#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1576,13 +1578,13 @@
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:245
+#: src/datastore/gnunet-datastore.c:244
 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:254
+#: src/datastore/gnunet-datastore.c:253
 msgid "Manipulate GNUnet datastore"
 msgstr ""
 
@@ -1590,25 +1592,25 @@
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:444
+#: src/datastore/gnunet-service-datastore.c:446
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:502
+#: src/datastore/gnunet-service-datastore.c:504
 #: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:533
+#: src/datastore/gnunet-service-datastore.c:535
 #: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:649
+#: src/datastore/gnunet-service-datastore.c:651
 msgid "# results found"
 msgstr "# résultats introuvables"
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1615,7 +1617,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:707
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1622,129 +1624,129 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:709
+#: src/datastore/gnunet-service-datastore.c:711
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:715
+#: src/datastore/gnunet-service-datastore.c:717
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:723
+#: src/datastore/gnunet-service-datastore.c:778
+#: src/datastore/gnunet-service-datastore.c:1039
+#: src/datastore/gnunet-service-datastore.c:1673
 msgid "# reserved"
 msgstr "# réservé"
 
-#: src/datastore/gnunet-service-datastore.c:790
+#: src/datastore/gnunet-service-datastore.c:792
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:877
+#: src/datastore/gnunet-service-datastore.c:879
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1092
+#: src/datastore/gnunet-service-datastore.c:1094
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1105
+#: src/datastore/gnunet-service-datastore.c:1107
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1153
+#: src/datastore/gnunet-service-datastore.c:1155
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1185
+#: src/datastore/gnunet-service-datastore.c:1187
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1221
+#: src/datastore/gnunet-service-datastore.c:1223
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1267
+#: src/datastore/gnunet-service-datastore.c:1269
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1279
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1311
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1362
+#: src/datastore/gnunet-service-datastore.c:1364
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1367
+#: src/datastore/gnunet-service-datastore.c:1369
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1420
+#: src/datastore/gnunet-service-datastore.c:1423
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1431
+#: src/datastore/gnunet-service-datastore.c:1434
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1500
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1566
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1550
+#: src/datastore/gnunet-service-datastore.c:1553
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1560
+#: src/datastore/gnunet-service-datastore.c:1563
 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
+#: src/datastore/gnunet-service-datastore.c:1704
+#: src/datastore/gnunet-service-datastore.c:1716
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1707
+#: src/datastore/gnunet-service-datastore.c:1710
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1719
+#: src/datastore/gnunet-service-datastore.c:1722
 msgid "# quota"
 msgstr "# quota"
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1724
 msgid "# cache size"
 msgstr "# taille du cache"
 
-#: src/datastore/gnunet-service-datastore.c:1736
+#: src/datastore/gnunet-service-datastore.c:1739
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1754
-#: src/datastore/gnunet-service-datastore.c:1770
+#: src/datastore/gnunet-service-datastore.c:1757
+#: src/datastore/gnunet-service-datastore.c:1773
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1800
+#: src/datastore/gnunet-service-datastore.c:1803
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
@@ -1835,7 +1837,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1844,215 +1846,216 @@
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:181
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
+#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:172
+#: src/dht/gnunet-dht-get.c:195
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:202
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:191
+#: src/dht/gnunet-dht-get.c:215
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
+#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224
+#: src/dht/gnunet-dht-get.c:248
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:267
+#: src/dht/gnunet-dht-monitor.c:295
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-monitor.c:320
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1417
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
 
-#: src/dht/gnunet_dht_profiler.c:1424
+#: src/dht/gnunet_dht_profiler.c:1420
 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
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1426
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1429
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1432
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1435
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1442
+#: src/dht/gnunet_dht_profiler.c:1438
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1460
+#: src/dht/gnunet_dht_profiler.c:1456
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:122
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:125
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:154
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-put.c:164
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:177
+#: src/dht/gnunet-dht-put.c:180
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:196
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:199
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-put.c:208
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:211
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:237
+#: src/dht/gnunet-dht-put.c:240
 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-dht.c:171
 msgid "Failed to connect to transport service!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-wdht_clients.c:857
+#: src/dht/gnunet-service-xdht_clients.c:854
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:509
+#: src/dht/gnunet-service-wdht_clients.c:938
+#: src/dht/gnunet-service-xdht_clients.c:934
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:593
+#: src/dht/gnunet-service-wdht_clients.c:1004
+#: src/dht/gnunet-service-xdht_clients.c:999
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:794
+#: src/dht/gnunet-service-wdht_clients.c:1213
+#: src/dht/gnunet-service-xdht_clients.c:1201
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:686
+#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-xdht_clients.c:684
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1186
+#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/gnunet-service-xdht_clients.c:651
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -2110,58 +2113,59 @@
 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:739
+#: src/dht/gnunet-service-dht_neighbours.c:735
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:904
-#: src/dht/gnunet-service-xdht_neighbours.c:6056
+#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-xdht_neighbours.c:6062
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-dht_neighbours.c:933
 #: 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-dht_neighbours.c:963
 #: src/dht/gnunet-service-xdht_neighbours.c:1018
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1013
+#: src/dht/gnunet-service-dht_neighbours.c:1009
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1043
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1248
+#: src/dht/gnunet-service-dht_neighbours.c:1285
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1263
+#: src/dht/gnunet-service-dht_neighbours.c:1300
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1451
+#: src/dht/gnunet-service-dht_neighbours.c:1447
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1480
+#: src/dht/gnunet-service-dht_neighbours.c:1476
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: 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-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1610
+#: src/dht/gnunet-service-dht_neighbours.c:1717
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2174,55 +2178,55 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1572
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1603
+#: src/dht/gnunet-service-dht_neighbours.c:1599
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1728
+#: src/dht/gnunet-service-dht_neighbours.c:1724
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1815
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1818
+#: src/dht/gnunet-service-dht_neighbours.c:1814
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1990
+#: src/dht/gnunet-service-dht_neighbours.c:1986
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:1994
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2093
+#: src/dht/gnunet-service-dht_neighbours.c:2089
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2096
+#: src/dht/gnunet-service-dht_neighbours.c:2092
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2161
+#: src/dht/gnunet-service-dht_neighbours.c:2157
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2175
+#: src/dht/gnunet-service-dht_neighbours.c:2171
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2261
+#: src/dht/gnunet-service-dht_neighbours.c:2257
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2264
+#: src/dht/gnunet-service-dht_neighbours.c:2260
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2333,22 +2337,22 @@
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3555
+#: src/dht/gnunet-service-xdht_neighbours.c:3557
 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
+#: src/dht/gnunet-service-xdht_neighbours.c:3698
+#: src/dht/gnunet-service-xdht_neighbours.c:3936
+#: src/dht/gnunet-service-xdht_neighbours.c:4088
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5325
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5849
 msgid "# Bytes received from other peers"
 msgstr ""
 
@@ -2435,27 +2439,27 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:238
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2496,20 +2500,20 @@
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1081
+#: src/dns/gnunet-service-dns.c:1080
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:167
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr "sortie verbeuse"
 
-#: src/dv/gnunet-dv.c:176
+#: src/dv/gnunet-dv.c:175
 msgid "Print information about DV state"
 msgstr ""
 
@@ -2655,70 +2659,70 @@
 msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
+#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
+#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334
+#: src/exit/gnunet-daemon-exit.c:3333
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
+#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3371
+#: src/exit/gnunet-daemon-exit.c:3370
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3549
+#: src/exit/gnunet-daemon-exit.c:3548
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3565
+#: src/exit/gnunet-daemon-exit.c:3563
 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:3573
+#: src/exit/gnunet-daemon-exit.c:3571
 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:3580
+#: src/exit/gnunet-daemon-exit.c:3578
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3586
+#: src/exit/gnunet-daemon-exit.c:3584
 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/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
 #: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3704
+#: src/exit/gnunet-daemon-exit.c:3701
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3855
+#: src/exit/gnunet-daemon-exit.c:3852
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2930,17 +2934,17 @@
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2949,61 +2953,61 @@
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: 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
+#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
+#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:707
+#: src/fs/fs_publish.c:708
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:719
+#: src/fs/fs_publish.c:720
 msgid "unknown error"
 msgstr "erreur unconnue."
 
-#: src/fs/fs_publish.c:763
+#: src/fs/fs_publish.c:764
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:783
+#: src/fs/fs_publish.c:784
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:808
+#: src/fs/fs_publish.c:809
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:831
+#: src/fs/fs_publish.c:832
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1008
+#: src/fs/fs_publish.c:1009
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1016
+#: src/fs/fs_publish.c:1017
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1056
+#: src/fs/fs_publish.c:1057
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1296
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/fs_publish.c:1386
+#: src/fs/fs_publish.c:1387
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3166,63 +3170,63 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:413
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:500
+#: src/fs/gnunet-auto-share.c:494
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:510
+#: src/fs/gnunet-auto-share.c:504
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:719
+#: src/fs/gnunet-auto-share.c:713
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:809
+#: src/fs/gnunet-auto-share.c:801
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3286,7 +3290,7 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3309,12 +3313,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3322,7 +3326,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3356,19 +3360,19 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:191
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:194
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:214
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:206
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3490,119 +3494,119 @@
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
+#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:910
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:914
+#: src/fs/gnunet-publish.c:913
 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:918
+#: src/fs/gnunet-publish.c:917
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:926
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:934
+#: src/fs/gnunet-publish.c:933
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:940
+#: src/fs/gnunet-publish.c:939
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:948
+#: src/fs/gnunet-publish.c:947
 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:964
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:123
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:200
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:256
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:280
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:312
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:315
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:322
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:333
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:272
+#: src/fs/gnunet-service-fs.c:273
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
+#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:729
+#: src/fs/gnunet-service-fs.c:730
 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
+#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/topology/gnunet-daemon-topology.c:1245
+#: src/topology/gnunet-daemon-topology.c:1253
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -3637,88 +3641,88 @@
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
 
-#: src/fs/gnunet-service-fs_cp.c:738
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:747
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:780
+#: src/fs/gnunet-service-fs_cp.c:785
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:788
+#: src/fs/gnunet-service-fs_cp.c:793
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
+#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:921
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:977
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:985
+#: src/fs/gnunet-service-fs_cp.c:982
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:999
+#: src/fs/gnunet-service-fs_cp.c:996
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1118
+#: src/fs/gnunet-service-fs_cp.c:1115
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1140
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/fs/gnunet-service-fs_cp.c:1150
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1251
+#: src/fs/gnunet-service-fs_cp.c:1248
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1305
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1337
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1361
+#: src/fs/gnunet-service-fs_cp.c:1358
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1372
+#: src/fs/gnunet-service-fs_cp.c:1369
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1427
+#: src/fs/gnunet-service-fs_cp.c:1424
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1471
+#: src/fs/gnunet-service-fs_cp.c:1468
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1916
+#: src/fs/gnunet-service-fs_cp.c:1913
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3952,23 +3956,23 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:392
+#: src/gns/gns_api.c:393
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
+#: src/gns/gnunet-bcd.c:357
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:362
 #, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
+msgid "Businesscard HTTP server starts on %u\n"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:376
@@ -3976,86 +3980,86 @@
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:532
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:232
+#: src/gns/gnunet-dns2gns.c:238
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:408
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:426
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:704
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:730
+#: src/gns/gnunet-dns2gns.c:737
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:758
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:788
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:798
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
+#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:231
+#: src/gns/gnunet-gns.c:254
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:312
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:460
+#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4062,41 +4066,41 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:403
+#: src/gns/gnunet-gns.c:429
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:479
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456
+#: src/gns/gnunet-gns.c:482
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:459
+#: src/gns/gnunet-gns.c:485
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:462
+#: src/gns/gnunet-gns.c:488
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:465
+#: src/gns/gnunet-gns.c:491
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:468
+#: src/gns/gnunet-gns.c:494
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:508
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
@@ -4113,19 +4117,19 @@
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:483
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: 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/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:805
+#: src/hostlist/gnunet-daemon-hostlist_client.c:814
+#: src/hostlist/gnunet-daemon-hostlist_client.c:925
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4192,7 +4196,7 @@
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
@@ -4215,29 +4219,29 @@
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3003
+#: src/gns/gnunet-gns-proxy.c:2999
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3105
+#: src/gns/gnunet-gns-proxy.c:3101
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3146
+#: src/gns/gnunet-gns-proxy.c:3141
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3144
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3163
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4329,11 +4333,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:423
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:697
+#: src/gns/plugin_rest_gns.c:717
 msgid "GNS REST API initialized\n"
 msgstr ""
 
@@ -4479,25 +4483,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:334
+#: src/hostlist/gnunet-daemon-hostlist.c:333
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:337
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:357
+#: src/hostlist/gnunet-daemon-hostlist.c:356
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4521,7 +4525,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4530,7 +4534,7 @@
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:728
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4537,114 +4541,114 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:866
+#: src/hostlist/gnunet-daemon-hostlist_client.c:856
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:880
+#: src/hostlist/gnunet-daemon-hostlist_client.c:870
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:900
+#: src/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:906
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:914
+#: src/hostlist/gnunet-daemon-hostlist_client.c:904
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:967
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:975
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
-#: src/transport/plugin_transport_http_client.c:2282
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
+#: src/transport/plugin_transport_http_client.c:2273
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4662,7 +4666,7 @@
 #: 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
+#: src/topology/gnunet-daemon-topology.c:866
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4717,41 +4721,46 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:857
+#: src/transport/gnunet-service-transport.c:856
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:755
 #, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:782
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:798
+#: src/hostlist/gnunet-daemon-hostlist_server.c:795
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:811
+#: src/hostlist/gnunet-daemon-hostlist_server.c:808
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:832
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:852
+#: src/hostlist/gnunet-daemon-hostlist_server.c:849
 #, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:892
+#: src/hostlist/gnunet-daemon-hostlist_server.c:889
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4766,33 +4775,33 @@
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:325
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:328
+#: src/identity/gnunet-identity.c:327
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:331
+#: src/identity/gnunet-identity.c:330
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:334
+#: src/identity/gnunet-identity.c:333
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:337
+#: src/identity/gnunet-identity.c:336
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:340
+#: src/identity/gnunet-identity.c:339
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:349
+#: src/identity/gnunet-identity.c:348
 msgid "Maintain egos"
 msgstr ""
 
@@ -4843,7 +4852,7 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:923
+#: src/identity/plugin_rest_identity.c:938
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -4855,7 +4864,7 @@
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1089
+#: src/identity-provider/plugin_rest_identity_provider.c:1126
 msgid "Identity Token REST API initialized\n"
 msgstr ""
 
@@ -4894,15 +4903,15 @@
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:235
+#: src/namecache/gnunet-namecache.c:233
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4945,13 +4954,13 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:532
+#: src/namestore/plugin_rest_namestore.c:547
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:541
+#: src/namestore/plugin_rest_namestore.c:556
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -4969,7 +4978,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:565
+#: src/namestore/plugin_rest_namestore.c:580
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
@@ -4981,9 +4990,9 @@
 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
+#: src/namestore/plugin_rest_namestore.c:954
+#: src/transport/gnunet-transport.c:1769
+#: src/transport/gnunet-transport-profiler.c:497
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr ""
@@ -4995,7 +5004,7 @@
 
 #: src/namestore/gnunet-namestore.c:717
 #: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:954
+#: src/namestore/plugin_rest_namestore.c:963
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
@@ -5012,14 +5021,14 @@
 msgstr "ajouter"
 
 #: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:635
+#: src/namestore/plugin_rest_namestore.c:650
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:653
-#: src/namestore/plugin_rest_namestore.c:693
+#: src/namestore/plugin_rest_namestore.c:668
+#: src/namestore/plugin_rest_namestore.c:708
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
@@ -5038,7 +5047,8 @@
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#: src/namestore/gnunet-namestore.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:819
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
@@ -5049,81 +5059,81 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:984
+#: src/namestore/plugin_rest_namestore.c:999
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1011
+#: src/namestore/plugin_rest_namestore.c:1026
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1066
 #, c-format
 msgid "Identity service is not running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1016
-#: src/namestore/plugin_rest_namestore.c:1092
+#: src/namestore/gnunet-namestore.c:1015
+#: src/namestore/plugin_rest_namestore.c:1107
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1064
+#: src/namestore/gnunet-namestore.c:1063
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1066
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1070
+#: src/namestore/gnunet-namestore.c:1069
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1072
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1076
+#: src/namestore/gnunet-namestore.c:1075
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1079
+#: src/namestore/gnunet-namestore.c:1078
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1085
+#: src/namestore/gnunet-namestore.c:1084
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1088
+#: src/namestore/gnunet-namestore.c:1087
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1091
+#: src/namestore/gnunet-namestore.c:1090
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1094
+#: src/namestore/gnunet-namestore.c:1093
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1097
+#: src/namestore/gnunet-namestore.c:1096
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1100
+#: src/namestore/gnunet-namestore.c:1099
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1103
+#: src/namestore/gnunet-namestore.c:1102
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5181,7 +5191,7 @@
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1018
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5198,7 +5208,7 @@
 msgid "flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1176
+#: src/namestore/plugin_rest_namestore.c:1187
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5215,90 +5225,90 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:392
+#: src/nat/nat_auto.c:388
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:389
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:412
+#: src/nat/nat_auto.c:408
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:444
+#: src/nat/nat_auto.c:440
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:576
+#: src/nat/nat_auto.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:594
+#: src/nat/nat_auto.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:716
+#: src/nat/nat_auto.c:709
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:717
+#: src/nat/nat_auto.c:710
 msgid "upnpc not found\n"
 msgstr "upnpc introuvable\n"
 
-#: src/nat/nat_auto.c:749
+#: src/nat/nat_auto.c:742
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:798
+#: src/nat/nat_auto.c:788
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1024
+#: src/nat/nat.c:1019
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1074
+#: src/nat/nat.c:1070
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat.c:1325
+#: src/nat/nat.c:1321
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1400
+#: src/nat/nat.c:1396
 #, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr ""
 
-#: src/nat/nat.c:1544
+#: src/nat/nat.c:1540
 msgid "malformed"
 msgstr "malformé"
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:1594
 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
+#: src/nat/nat.c:1723 src/nat/nat.c:1736
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5305,96 +5315,96 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1895
+#: src/nat/nat.c:1891
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1911
+#: src/nat/nat.c:1907
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:1998
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2000
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2002
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2004
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2006
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2008
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2010
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2012
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2014
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2016
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2018
 msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2020
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2022
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2024
 msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2026
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2028
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2030
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2032
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2034
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:605
+#: src/nat/nat_mini.c:611
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5403,7 +5413,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:495
+#: src/nat/nat_test.c:497
 msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
@@ -5419,82 +5429,82 @@
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/nse/gnunet-nse-profiler.c:840
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:860
+#: src/nse/gnunet-nse-profiler.c:843
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:869
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:875
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:867
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1533
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
+#: src/nse/gnunet-service-nse.c:1535
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:225
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:382
+#: src/peerinfo/gnunet-service-peerinfo.c:411
 #, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:491
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:529
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:683
 #, c-format
 msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:689
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1056
+#: src/peerinfo/gnunet-service-peerinfo.c:1061
 #, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1375
+#: src/peerinfo/gnunet-service-peerinfo.c:1391
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1388
+#: src/peerinfo/gnunet-service-peerinfo.c:1404
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5520,7 +5530,7 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:267
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
@@ -5570,44 +5580,44 @@
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:844
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:884
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:887
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:890
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:893
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:896
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:902
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:905
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:920
+#: src/peerinfo-tool/gnunet-peerinfo.c:919
 msgid "Print information about peers."
 msgstr ""
 
@@ -5629,35 +5639,35 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
+#: src/peerstore/gnunet-service-peerstore.c:395
 msgid "Malformed iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:391
+#: src/peerstore/gnunet-service-peerstore.c:402
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:451
+#: src/peerstore/gnunet-service-peerstore.c:462
 msgid "Malformed store request from client\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:459
+#: src/peerstore/gnunet-service-peerstore.c:470
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:478
+#: src/peerstore/gnunet-service-peerstore.c:489
 msgid "Failed to store requested value, database error."
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:557
+#: src/peerstore/gnunet-service-peerstore.c:568
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:579
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
@@ -5667,28 +5677,28 @@
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:374
+#: src/peerstore/peerstore_api.c:376
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:677
+#: src/peerstore/peerstore_api.c:679
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:688
+#: src/peerstore/peerstore_api.c:690
 msgid "Error communicating with `PEERSTORE' service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:707
+#: src/peerstore/peerstore_api.c:709
 msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:819
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:831
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -5739,56 +5749,56 @@
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:422
+#: src/psycstore/gnunet-service-psycstore.c:423
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:453
+#: src/psycstore/gnunet-service-psycstore.c:454
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:481
+#: src/psycstore/gnunet-service-psycstore.c:482
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:664
+#: src/psycstore/gnunet-service-psycstore.c:665
 #, 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:674
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:683
 msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:714
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:728
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:745
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:765
+#: src/psycstore/gnunet-service-psycstore.c:784
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:807
+#: src/psycstore/gnunet-service-psycstore.c:858
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:834
+#: src/psycstore/gnunet-service-psycstore.c:873
 msgid "Failed to get state variable!\n"
 msgstr ""
 
@@ -5856,8 +5866,7 @@
 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:656
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
@@ -5866,72 +5875,68 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1284
+#: src/regex/gnunet-regex-profiler.c:1301
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1295
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1324
-#: src/regex/gnunet-regex-simulation-profiler.c:619
+#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1330
-#: src/regex/gnunet-regex-simulation-profiler.c:626
+#: src/regex/gnunet-regex-profiler.c:1348
+#: src/regex/gnunet-regex-simulation-profiler.c:646
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1337
+#: src/regex/gnunet-regex-profiler.c:1355
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1346
+#: src/regex/gnunet-regex-profiler.c:1364
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1384
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1472
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1460
+#: src/regex/gnunet-regex-profiler.c:1478
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1463
+#: src/regex/gnunet-regex-profiler.c:1481
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1493
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:686
+#: src/regex/gnunet-regex-simulation-profiler.c:704
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:702
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -5940,111 +5945,111 @@
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:792
+#: src/rest/gnunet-rest-server.c:784
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:809
+#: src/rest/gnunet-rest-server.c:801
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:124
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:129
+#: src/revocation/gnunet-revocation.c:134
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:140
 msgid "Internal error\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:171
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:292
+#: src/revocation/gnunet-revocation.c:320
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:322
+#: src/revocation/gnunet-revocation.c:350
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:343
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:363
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:405
+#: src/revocation/gnunet-revocation.c:435
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:439
+#: src/revocation/gnunet-revocation.c:468
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:461
+#: src/revocation/gnunet-revocation.c:489
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:486
+#: src/revocation/gnunet-revocation.c:514
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:533
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:536
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
+#: src/revocation/gnunet-revocation.c:539
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6078,7 +6083,7 @@
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:185
+#: src/rps/gnunet-rps.c:177
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6116,29 +6121,29 @@
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:352
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 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:355
+#: src/scalarproduct/gnunet-scalarproduct.c:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6146,23 +6151,23 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:611
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:617
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
 msgstr "threshold"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2015
+#: src/set/gnunet-service-set.c:2008
 msgid "Could not connect to cadet service\n"
 msgstr ""
 
@@ -6186,10 +6191,133 @@
 msgid "ibf size"
 msgstr "taille ibz"
 
-#: src/set/gnunet-set-profiler.c:383
+#: src/set/gnunet-set-profiler.c:386
 msgid "operation to execute"
 msgstr ""
 
+#: src/social/gnunet-social.c:1138
+msgid "--place missing or invalid.\n"
+msgstr ""
+
+#: src/social/gnunet-social.c:1180
+msgid "assign --name in state to --data"
+msgstr ""
+
+#: src/social/gnunet-social.c:1184
+msgid "say good-bye and leave somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1188
+msgid "create a place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1192
+msgid "destroy a place we were hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1196
+msgid "enter somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1200
+msgid "find state matching name prefix"
+msgstr ""
+
+#: src/social/gnunet-social.c:1204
+msgid "replay history of messages up to the given --limit"
+msgstr ""
+
+#: src/social/gnunet-social.c:1208
+msgid "reconnect to a previously created place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1212
+msgid "publish something to a place we are hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1216
+msgid "reconnect to a previously entered place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1220
+msgid "search for state matching exact name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1224
+msgid "submit something to somebody's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1228
+msgid "list of egos and subscribed places"
+msgstr ""
+
+#: src/social/gnunet-social.c:1232
+msgid "extract and replay history between message IDs --start and --until"
+msgstr ""
+
+#: src/social/gnunet-social.c:1239
+msgid "application ID to use when connecting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1243
+msgid "message body or state value"
+msgstr ""
+
+#: src/social/gnunet-social.c:1247
+msgid "name or public key of ego"
+msgstr ""
+
+#: src/social/gnunet-social.c:1251
+msgid "wait for incoming messages"
+msgstr ""
+
+#: src/social/gnunet-social.c:1255
+msgid "GNS name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1259
+msgid "peer ID for --guest-enter"
+msgstr ""
+
+#: src/social/gnunet-social.c:1263
+msgid "name (key) to query from state"
+msgstr ""
+
+#: src/social/gnunet-social.c:1267
+msgid "method name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1271
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "nombre de valeurs"
+
+#: src/social/gnunet-social.c:1275
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1279
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1283
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1287
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1291
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1301
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:323
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6209,11 +6337,11 @@
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:194
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:200
 msgid "Missing argument: name\n"
 msgstr ""
 
@@ -6222,7 +6350,7 @@
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:240
+#: src/statistics/gnunet-statistics.c:241
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
@@ -6332,7 +6460,7 @@
 msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:291
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6360,59 +6488,59 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:322
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
 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/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
 #: 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:475
+#: src/testbed/gnunet-daemon-testbed-underlay.c:468
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:732
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:248
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, c-format
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:297
+#: src/testbed/gnunet-testbed-profiler.c:287
 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 "
@@ -6444,11 +6572,11 @@
 msgid "Adding host %u failed with error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:987
+#: src/testbed/testbed_api_testbed.c:986
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
@@ -6547,34 +6675,34 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 msgid "create unique configuration files"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -6659,54 +6787,54 @@
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:634
+#: src/topology/gnunet-daemon-topology.c:730
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:931
+#: src/topology/gnunet-daemon-topology.c:927
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:964
+#: src/topology/gnunet-daemon-topology.c:960
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:971
+#: src/topology/gnunet-daemon-topology.c:967
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:989
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:992
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1003
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1005
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1043
+#: src/topology/gnunet-daemon-topology.c:1039
 #: src/transport/plugin_transport_wlan.c:1491
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1288
+#: src/topology/gnunet-daemon-topology.c:1283
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -6918,35 +7046,35 @@
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3357
+#: src/transport/gnunet-service-transport_neighbours.c:3353
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3393
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3488
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3528
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3546
+#: src/transport/gnunet-service-transport_neighbours.c:3542
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3680
+#: src/transport/gnunet-service-transport_neighbours.c:3676
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6980,8 +7108,8 @@
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:949
+#: src/transport/gnunet-service-transport_validation.c:1551
 msgid "# validations running"
 msgstr ""
 
@@ -7005,29 +7133,29 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1076
+#: src/transport/gnunet-service-transport_validation.c:1075
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1127
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1140
+#: src/transport/gnunet-service-transport_validation.c:1139
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1143
+#: src/transport/gnunet-service-transport_validation.c:1142
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1151
+#: src/transport/gnunet-service-transport_validation.c:1150
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1163
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7034,28 +7162,28 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1219
+#: src/transport/gnunet-service-transport_validation.c:1218
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1269
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1279
+#: src/transport/gnunet-service-transport_validation.c:1278
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/transport/gnunet-service-transport_validation.c:1441
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1460
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1515
+#: src/transport/gnunet-service-transport_validation.c:1514
 msgid "# validations succeeded"
 msgstr ""
 
@@ -7065,7 +7193,7 @@
 msgstr ""
 
 #: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:282
+#: src/transport/gnunet-transport-profiler.c:277
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
@@ -7075,41 +7203,41 @@
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:621
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:635
+#: src/transport/gnunet-transport.c:633
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
 #, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:667
+#: src/transport/gnunet-transport.c:663
 #, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:672
+#: src/transport/gnunet-transport.c:668
 #, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:677
+#: src/transport/gnunet-transport.c:673
 #, 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
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:807
+#: src/transport/gnunet-transport.c:803
 #, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7118,35 +7246,35 @@
 "\t%s%s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:842
+#: src/transport/gnunet-transport.c:838
 #, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:982
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:996
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1021
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-transport.c:1078
+#: src/transport/gnunet-transport.c:1067
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1107
+#: src/transport/gnunet-transport.c:1096
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7153,42 +7281,42 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1144
-#: src/transport/gnunet-transport-profiler.c:439
+#: src/transport/gnunet-transport.c:1133
+#: src/transport/gnunet-transport-profiler.c:432
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
+#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:1160
 msgid "Connected to"
 msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:1197
+#: src/transport/gnunet-transport.c:1186
 msgid "Disconnected from"
 msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:1221
-#: src/transport/gnunet-transport-profiler.c:464
+#: src/transport/gnunet-transport.c:1210
+#: src/transport/gnunet-transport-profiler.c:457
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1261
+#: src/transport/gnunet-transport.c:1250
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1262
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1809
+#: src/transport/gnunet-transport.c:1792
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7195,109 +7323,109 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1817
+#: src/transport/gnunet-transport.c:1800
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1840
+#: src/transport/gnunet-transport.c:1823
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1846
+#: src/transport/gnunet-transport.c:1829
 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
+#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
+#: src/transport/gnunet-transport.c:1925
+#: src/transport/gnunet-transport-profiler.c:553
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1889
+#: src/transport/gnunet-transport.c:1872
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:1972
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1975
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1978
 msgid "disconnect to a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport.c:1981
 msgid "print information for all pending validations "
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1984
 msgid "print information for all pending validations continuously"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1987
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1993
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2014
+#: src/transport/gnunet-transport.c:1996
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2017
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport-profiler.c:618
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2020
+#: src/transport/gnunet-transport.c:2002
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2023
+#: src/transport/gnunet-transport.c:2005
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2008
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2037
-#: src/transport/gnunet-transport-profiler.c:637
+#: src/transport/gnunet-transport.c:2019
+#: src/transport/gnunet-transport-profiler.c:629
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:226
+#: src/transport/gnunet-transport-profiler.c:221
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:262
+#: src/transport/gnunet-transport-profiler.c:257
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:271
+#: src/transport/gnunet-transport-profiler.c:266
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:288
+#: src/transport/gnunet-transport-profiler.c:283
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:341
+#: src/transport/gnunet-transport-profiler.c:336
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:361
+#: src/transport/gnunet-transport-profiler.c:356
 #, c-format
 msgid ""
 "\n"
@@ -7304,99 +7432,99 @@
 "Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:411
+#: src/transport/gnunet-transport-profiler.c:404
 #, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:418
+#: src/transport/gnunet-transport-profiler.c:411
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:480
+#: src/transport/gnunet-transport-profiler.c:473
 #, c-format
 msgid "Denying connection to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:510
+#: src/transport/gnunet-transport-profiler.c:503
 msgid "Message size too big!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport-profiler.c:509
 msgid "No peer identity given\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/transport/gnunet-transport-profiler.c:524
 #, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:530
 #, 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
+#: src/transport/gnunet-transport-profiler.c:535
 msgid "No operation given\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/transport/gnunet-transport-profiler.c:542
 msgid "Failed to connect to ATS service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:611
+#: src/transport/gnunet-transport-profiler.c:603
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport-profiler.c:606
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:617
+#: src/transport/gnunet-transport-profiler.c:609
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:620
+#: src/transport/gnunet-transport-profiler.c:612
 #, fuzzy
 msgid "number of messages to send"
 msgstr "nombre de valeurs"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 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_http_client.c:1473
+#: src/transport/plugin_transport_http_server.c:2237
+#: src/transport/plugin_transport_http_server.c:3427
 #: 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
+#: src/transport/plugin_transport_http_client.c:2114
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2172
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_client.c:2163
+#: src/transport/plugin_transport_http_server.c:3142
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
-#: src/transport/plugin_transport_http_server.c:3218
+#: src/transport/plugin_transport_http_client.c:2180
+#: src/transport/plugin_transport_http_server.c:3212
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2223
+#: src/transport/plugin_transport_http_client.c:2214
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1733
+#: src/transport/plugin_transport_http_server.c:1721
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7403,115 +7531,115 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1955
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1973
+#: src/transport/plugin_transport_http_server.c:1963
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2123
+#: src/transport/plugin_transport_http_server.c:2113
 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:2146
+#: src/transport/plugin_transport_http_server.c:2136
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2273
+#: src/transport/plugin_transport_http_server.c:2263
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2582
+#: src/transport/plugin_transport_http_server.c:2572
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2606 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:2634 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2747
+#: src/transport/plugin_transport_http_server.c:2737
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
-#: src/transport/plugin_transport_udp.c:3604
+#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2924
+#: src/transport/plugin_transport_http_server.c:2918
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2933
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2945
+#: src/transport/plugin_transport_http_server.c:2939
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2950
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2962
+#: src/transport/plugin_transport_http_server.c:2956
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2970
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2986
+#: src/transport/plugin_transport_http_server.c:2980
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3008
+#: src/transport/plugin_transport_http_server.c:3002
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3018
+#: src/transport/plugin_transport_http_server.c:3012
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3081
+#: src/transport/plugin_transport_http_server.c:3075
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3102
+#: src/transport/plugin_transport_http_server.c:3096
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3119
+#: src/transport/plugin_transport_http_server.c:3113
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3445
+#: src/transport/plugin_transport_http_server.c:3439
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7684,50 +7812,50 @@
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3680
-#: src/transport/plugin_transport_udp.c:3779
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
 #, 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
+#: src/transport/plugin_transport_udp.c:3694
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3789
+#: src/transport/plugin_transport_udp.c:3785
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3861
-#: src/transport/plugin_transport_udp.c:3875
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3907
+#: src/transport/plugin_transport_udp.c:3903
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3934
+#: src/transport/plugin_transport_udp.c:3930
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:4000
+#: src/transport/plugin_transport_udp.c:3996
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1407
+#: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1420
+#: src/transport/plugin_transport_unix.c:1416
 #, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1820
+#: src/transport/plugin_transport_unix.c:1816
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
 
@@ -7794,7 +7922,7 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:680
+#: src/transport/transport-testing.c:676
 msgid "Failed to initialize testing library!\n"
 msgstr ""
 
@@ -7832,12 +7960,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:892 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:895 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -7854,12 +7982,12 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1040
+#: src/util/client.c:1042
 #, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr ""
 
-#: src/util/client.c:1052
+#: src/util/client.c:1054
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
@@ -7941,12 +8069,12 @@
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:429
+#: src/util/connection.c:441
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:446
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
@@ -8016,12 +8144,12 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1228
+#: src/util/disk.c:1227
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1451 src/util/service.c:1327
+#: src/util/disk.c:1450 src/util/service.c:1322
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -8102,42 +8230,51 @@
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/util/gnunet-config.c:137
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
@@ -8230,28 +8367,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:234
+#: src/util/gnunet-scrypt.c:242
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:295
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:301
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:336
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8266,41 +8403,41 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:83
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:91
 #, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:105
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:167
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:340
+#: src/util/helper.c:331
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:386
+#: src/util/helper.c:382
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:616
+#: src/util/helper.c:601
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8316,7 +8453,7 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:500
+#: src/util/os_installation.c:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8323,17 +8460,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:860
+#: src/util/os_installation.c:861
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:920
+#: src/util/os_installation.c:921
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:930
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8357,17 +8494,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:248 src/util/service.c:1461
+#: src/util/program.c:244 src/util/service.c:1456
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:260 src/util/service.c:1476
+#: src/util/program.c:256 src/util/service.c:1471
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/program.c:265 src/util/service.c:1471
+#: src/util/program.c:261 src/util/service.c:1466
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -8394,32 +8531,32 @@
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:952
+#: src/util/resolver_api.c:950
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
-#: src/util/resolver_api.c:1063
+#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
+#: src/util/resolver_api.c:1061
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/server.c:483
+#: src/util/server.c:478
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:493
+#: src/util/server.c:488
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:499
+#: src/util/server.c:494
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:902
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8478,38 +8615,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1174
+#: src/util/service.c:1170
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1216
+#: src/util/service.c:1211
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1265
+#: src/util/service.c:1260
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1264
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1273
+#: src/util/service.c:1268
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1328
+#: src/util/service.c:1323
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/util/service.c:1341
+#: src/util/service.c:1336
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1411
+#: src/util/service.c:1406
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8518,12 +8655,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/socks.c:597
+#: src/util/socks.c:586
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:610
+#: src/util/socks.c:599
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -8754,79 +8891,79 @@
 msgid "Error creating tunnel\n"
 msgstr "Erreur de création du tunnel\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
-#: src/include/gnunet_common.h:655
+#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
+#: src/include/gnunet_common.h:656
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:667
+#: src/include/gnunet_common.h:668
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
+#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/sv.po     2016-05-19 13:15:51 UTC (rev 37185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+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,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,232 +25,232 @@
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:261
+#: src/arm/gnunet-arm.c:271
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:380
 #, 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:377
+#: src/arm/gnunet-arm.c:391
 #, 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:419
+#: src/arm/gnunet-arm.c:434
 #, 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:429
+#: src/arm/gnunet-arm.c:444
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:466
+#: src/arm/gnunet-arm.c:482
 #, 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:477
+#: src/arm/gnunet-arm.c:493
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:515
+#: src/arm/gnunet-arm.c:533
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:542
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:547
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -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:581
+#: src/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:592
+#: src/arm/gnunet-service-arm.c:566
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, 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:717
+#: src/arm/gnunet-service-arm.c:687
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:753
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:863
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -352,11 +352,13 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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:3296 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 ""
@@ -378,7 +380,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -385,18 +387,18 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -500,11 +502,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:836
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -552,8 +554,8 @@
 msgstr ""
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -563,13 +565,13 @@
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -639,68 +641,68 @@
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
@@ -711,8 +713,8 @@
 msgstr ""
 
 #: 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
+#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
+#: src/set/gnunet-set-profiler.c:383
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
@@ -727,12 +729,12 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:389
 msgid "write statistics to file"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:514
-#: src/secretsharing/gnunet-secretsharing-profiler.c:623
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -1019,7 +1021,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:211
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1026,8 +1028,8 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:244
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -1039,68 +1041,68 @@
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:318
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:659
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:707
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:783
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1163,20 +1165,20 @@
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, fuzzy, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:853
+#: src/conversation/gnunet-service-conversation.c:855
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:946
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1360
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
@@ -1242,7 +1244,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
@@ -1252,12 +1254,12 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:186
+#: src/core/gnunet-core.c:185
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1267,7 +1269,7 @@
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:127
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
@@ -1298,25 +1300,25 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:766
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:796
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:878
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:917
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1323,111 +1325,111 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:928
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1081
+#: src/core/gnunet-service-core_kx.c:1030
+#: src/transport/gnunet-service-transport_validation.c:1080
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1039
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1091
+#: src/core/gnunet-service-core_kx.c:1092
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1118
+#: src/core/gnunet-service-core_kx.c:1119
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1131
+#: src/core/gnunet-service-core_kx.c:1132
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1202
-#: src/transport/gnunet-service-transport_validation.c:1404
+#: src/core/gnunet-service-core_kx.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1403
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1210
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1214
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1251
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/core/gnunet-service-core_kx.c:1289
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1462
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1470
+#: src/core/gnunet-service-core_kx.c:1471
 #, 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:1473
+#: src/core/gnunet-service-core_kx.c:1474
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1531
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1558
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1544
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1586
+#: src/core/gnunet-service-core_kx.c:1587
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1594
+#: src/core/gnunet-service-core_kx.c:1595
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1628
+#: src/core/gnunet-service-core_kx.c:1629
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1453,11 +1455,11 @@
 
 #: 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/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:863
+#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
+#: src/topology/gnunet-daemon-topology.c:611
+#: src/topology/gnunet-daemon-topology.c:723
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 #, fuzzy
@@ -1489,7 +1491,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:863
+#: src/datastore/gnunet-service-datastore.c:865
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -1537,9 +1539,9 @@
 #: 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
+#: 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:53
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:53
@@ -1550,7 +1552,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:676 src/include/gnunet_common.h:685
+#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1666,13 +1668,13 @@
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:245
+#: src/datastore/gnunet-datastore.c:244
 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:254
+#: src/datastore/gnunet-datastore.c:253
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -1682,25 +1684,25 @@
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:444
+#: src/datastore/gnunet-service-datastore.c:446
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:502
+#: src/datastore/gnunet-service-datastore.c:504
 #: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:533
+#: src/datastore/gnunet-service-datastore.c:535
 #: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:649
+#: src/datastore/gnunet-service-datastore.c:651
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1707,7 +1709,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:707
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1714,133 +1716,133 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:709
+#: src/datastore/gnunet-service-datastore.c:711
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:715
+#: src/datastore/gnunet-service-datastore.c:717
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:723
+#: src/datastore/gnunet-service-datastore.c:778
+#: src/datastore/gnunet-service-datastore.c:1039
+#: src/datastore/gnunet-service-datastore.c:1673
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:790
+#: src/datastore/gnunet-service-datastore.c:792
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:877
+#: src/datastore/gnunet-service-datastore.c:879
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1092
+#: src/datastore/gnunet-service-datastore.c:1094
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1105
+#: src/datastore/gnunet-service-datastore.c:1107
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1153
+#: src/datastore/gnunet-service-datastore.c:1155
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1185
+#: src/datastore/gnunet-service-datastore.c:1187
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1221
+#: src/datastore/gnunet-service-datastore.c:1223
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1267
+#: src/datastore/gnunet-service-datastore.c:1269
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1279
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1311
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1362
+#: src/datastore/gnunet-service-datastore.c:1364
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1367
+#: src/datastore/gnunet-service-datastore.c:1369
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1420
+#: src/datastore/gnunet-service-datastore.c:1423
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1431
+#: src/datastore/gnunet-service-datastore.c:1434
 #, 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:1500
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1566
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1550
+#: src/datastore/gnunet-service-datastore.c:1553
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1560
+#: src/datastore/gnunet-service-datastore.c:1563
 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
+#: src/datastore/gnunet-service-datastore.c:1704
+#: src/datastore/gnunet-service-datastore.c:1716
 #, 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:1707
+#: src/datastore/gnunet-service-datastore.c:1710
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1719
+#: src/datastore/gnunet-service-datastore.c:1722
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1724
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1736
+#: src/datastore/gnunet-service-datastore.c:1739
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1754
-#: src/datastore/gnunet-service-datastore.c:1770
+#: src/datastore/gnunet-service-datastore.c:1757
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1800
+#: src/datastore/gnunet-service-datastore.c:1803
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -1935,7 +1937,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1942,225 +1944,226 @@
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:181
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
+#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:172
+#: src/dht/gnunet-dht-get.c:195
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:202
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:191
+#: src/dht/gnunet-dht-get.c:215
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
+#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224
+#: src/dht/gnunet-dht-get.c:248
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:267
+#: src/dht/gnunet-dht-monitor.c:295
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-monitor.c:320
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:255
 #, 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:1421
+#: src/dht/gnunet_dht_profiler.c:1417
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/dht/gnunet_dht_profiler.c:1424
+#: src/dht/gnunet_dht_profiler.c:1420
 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
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1426
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1429
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1432
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1435
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1442
+#: src/dht/gnunet_dht_profiler.c:1438
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1460
+#: src/dht/gnunet_dht_profiler.c:1456
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/dht/gnunet-dht-put.c:120
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:122
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:125
+#: src/dht/gnunet-dht-put.c:126
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:154
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-put.c:164
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:177
+#: src/dht/gnunet-dht-put.c:180
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:196
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:199
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-put.c:208
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:211
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:237
+#: src/dht/gnunet-dht-put.c:240
 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-dht.c:171
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-wdht_clients.c:857
+#: src/dht/gnunet-service-xdht_clients.c:854
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:509
+#: src/dht/gnunet-service-wdht_clients.c:938
+#: src/dht/gnunet-service-xdht_clients.c:934
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:593
+#: src/dht/gnunet-service-wdht_clients.c:1004
+#: src/dht/gnunet-service-xdht_clients.c:999
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:794
+#: src/dht/gnunet-service-wdht_clients.c:1213
+#: src/dht/gnunet-service-xdht_clients.c:1201
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-xdht_clients.c:587
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:686
+#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-xdht_clients.c:684
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1186
+#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/gnunet-service-xdht_clients.c:651
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -2220,66 +2223,67 @@
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
-#: 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
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:735
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:904
-#: src/dht/gnunet-service-xdht_neighbours.c:6056
+#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-xdht_neighbours.c:6062
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-dht_neighbours.c:933
 #: 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:967
+#: src/dht/gnunet-service-dht_neighbours.c:963
 #: 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:1013
+#: src/dht/gnunet-service-dht_neighbours.c:1009
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1043
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1248
+#: src/dht/gnunet-service-dht_neighbours.c:1285
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1263
+#: src/dht/gnunet-service-dht_neighbours.c:1300
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1451
+#: src/dht/gnunet-service-dht_neighbours.c:1447
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1480
+#: src/dht/gnunet-service-dht_neighbours.c:1476
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: 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-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1610
+#: src/dht/gnunet-service-dht_neighbours.c:1717
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2293,65 +2297,65 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1572
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1603
+#: src/dht/gnunet-service-dht_neighbours.c:1599
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1728
+#: src/dht/gnunet-service-dht_neighbours.c:1724
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1815
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1818
+#: src/dht/gnunet-service-dht_neighbours.c:1814
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1990
+#: src/dht/gnunet-service-dht_neighbours.c:1986
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:1994
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2093
+#: src/dht/gnunet-service-dht_neighbours.c:2089
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2096
+#: src/dht/gnunet-service-dht_neighbours.c:2092
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2161
+#: src/dht/gnunet-service-dht_neighbours.c:2157
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2175
+#: src/dht/gnunet-service-dht_neighbours.c:2171
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2261
+#: src/dht/gnunet-service-dht_neighbours.c:2257
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2264
+#: src/dht/gnunet-service-dht_neighbours.c:2260
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2456,22 +2460,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3555
+#: src/dht/gnunet-service-xdht_neighbours.c:3557
 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
+#: src/dht/gnunet-service-xdht_neighbours.c:3698
+#: src/dht/gnunet-service-xdht_neighbours.c:3936
+#: src/dht/gnunet-service-xdht_neighbours.c:4088
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5325
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5849
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# byte mottagna av typen %d"
@@ -2553,27 +2557,27 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:238
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2615,21 +2619,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dns/gnunet-service-dns.c:1081
+#: src/dns/gnunet-service-dns.c:1080
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:167
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:176
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -2794,70 +2798,70 @@
 msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
+#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
+#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334
+#: src/exit/gnunet-daemon-exit.c:3333
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
+#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3371
+#: src/exit/gnunet-daemon-exit.c:3370
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3549
+#: src/exit/gnunet-daemon-exit.c:3548
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3565
+#: src/exit/gnunet-daemon-exit.c:3563
 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:3573
+#: src/exit/gnunet-daemon-exit.c:3571
 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:3580
+#: src/exit/gnunet-daemon-exit.c:3578
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3586
+#: src/exit/gnunet-daemon-exit.c:3584
 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/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
 #: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3704
+#: src/exit/gnunet-daemon-exit.c:3701
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3855
+#: src/exit/gnunet-daemon-exit.c:3852
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3078,17 +3082,17 @@
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3100,49 +3104,49 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: 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
+#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
+#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:707
+#: src/fs/fs_publish.c:708
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:719
+#: src/fs/fs_publish.c:720
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:763
+#: src/fs/fs_publish.c:764
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:783
+#: src/fs/fs_publish.c:784
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:808
+#: src/fs/fs_publish.c:809
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:831
+#: src/fs/fs_publish.c:832
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1008
+#: src/fs/fs_publish.c:1009
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:1016
+#: src/fs/fs_publish.c:1017
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
@@ -3149,16 +3153,16 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1056
+#: src/fs/fs_publish.c:1057
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1296
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1386
+#: src/fs/fs_publish.c:1387
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3333,23 +3337,23 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-auto-share.c:413
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:500
+#: src/fs/gnunet-auto-share.c:494
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
@@ -3356,42 +3360,42 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-auto-share.c:510
+#: src/fs/gnunet-auto-share.c:504
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:719
+#: src/fs/gnunet-auto-share.c:713
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:809
+#: src/fs/gnunet-auto-share.c:801
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3458,7 +3462,7 @@
 msgstr "Uppladdning vägrades!"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -3482,12 +3486,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
@@ -3495,7 +3499,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3530,19 +3534,19 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-fs-profiler.c:191
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:194
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:214
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:206
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3671,122 +3675,122 @@
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
+#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:910
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:914
+#: src/fs/gnunet-publish.c:913
 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:918
+#: src/fs/gnunet-publish.c:917
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:926
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:934
+#: src/fs/gnunet-publish.c:933
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:940
+#: src/fs/gnunet-publish.c:939
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:948
+#: src/fs/gnunet-publish.c:947
 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:964
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:123
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:200
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:256
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:280
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:312
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:315
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:322
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:333
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:272
+#: src/fs/gnunet-service-fs.c:273
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
+#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:729
+#: src/fs/gnunet-service-fs.c:730
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: 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
+#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/topology/gnunet-daemon-topology.c:1245
+#: src/topology/gnunet-daemon-topology.c:1253
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -3827,94 +3831,94 @@
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:738
+#: src/fs/gnunet-service-fs_cp.c:743
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:747
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:780
+#: src/fs/gnunet-service-fs_cp.c:785
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:788
+#: src/fs/gnunet-service-fs_cp.c:793
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
+#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:921
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:977
+#: src/fs/gnunet-service-fs_cp.c:974
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:985
+#: src/fs/gnunet-service-fs_cp.c:982
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:999
+#: src/fs/gnunet-service-fs_cp.c:996
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1118
+#: src/fs/gnunet-service-fs_cp.c:1115
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1140
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/fs/gnunet-service-fs_cp.c:1150
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1251
+#: src/fs/gnunet-service-fs_cp.c:1248
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1305
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1337
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1361
+#: src/fs/gnunet-service-fs_cp.c:1358
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1372
+#: src/fs/gnunet-service-fs_cp.c:1369
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1427
+#: src/fs/gnunet-service-fs_cp.c:1424
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1471
+#: src/fs/gnunet-service-fs_cp.c:1468
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1916
+#: src/fs/gnunet-service-fs_cp.c:1913
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4167,25 +4171,25 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:392
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
+#: src/gns/gnunet-bcd.c:357
 #, fuzzy, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
 #: src/gns/gnunet-bcd.c:362
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %u\n"
+msgstr "Misslyckades att starta samling.\n"
 
 #: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
@@ -4192,89 +4196,89 @@
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:532
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:232
+#: src/gns/gnunet-dns2gns.c:238
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:408
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:424
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:426
+#: src/gns/gnunet-dns2gns.c:432
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:704
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:730
+#: src/gns/gnunet-dns2gns.c:737
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:758
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:788
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:798
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
+#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:231
+#: src/gns/gnunet-gns.c:254
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:312
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:460
+#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4281,45 +4285,45 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:403
+#: src/gns/gnunet-gns.c:429
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:479
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456
+#: src/gns/gnunet-gns.c:482
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:459
+#: src/gns/gnunet-gns.c:485
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:462
+#: src/gns/gnunet-gns.c:488
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:465
+#: src/gns/gnunet-gns.c:491
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:468
+#: src/gns/gnunet-gns.c:494
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:508
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -4337,19 +4341,19 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:483
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: 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/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:805
+#: src/hostlist/gnunet-daemon-hostlist_client.c:814
+#: src/hostlist/gnunet-daemon-hostlist_client.c:925
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, fuzzy, c-format
@@ -4416,7 +4420,7 @@
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -4440,29 +4444,29 @@
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3003
+#: src/gns/gnunet-gns-proxy.c:2999
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3105
+#: src/gns/gnunet-gns-proxy.c:3101
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3146
+#: src/gns/gnunet-gns-proxy.c:3141
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3144
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3163
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4559,11 +4563,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_rest_gns.c:423
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:697
+#: src/gns/plugin_rest_gns.c:717
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -4714,25 +4718,25 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:334
+#: src/hostlist/gnunet-daemon-hostlist.c:333
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:337
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:357
+#: src/hostlist/gnunet-daemon-hostlist.c:356
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4756,7 +4760,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4765,7 +4769,7 @@
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:728
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4772,117 +4776,117 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:866
+#: src/hostlist/gnunet-daemon-hostlist_client.c:856
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:880
+#: src/hostlist/gnunet-daemon-hostlist_client.c:870
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:900
+#: src/hostlist/gnunet-daemon-hostlist_client.c:890
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:906
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:914
+#: src/hostlist/gnunet-daemon-hostlist_client.c:904
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:967
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:975
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
-#: src/transport/plugin_transport_http_client.c:2282
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
+#: src/transport/plugin_transport_http_client.c:2273
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4901,7 +4905,7 @@
 #: 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
+#: src/topology/gnunet-daemon-topology.c:866
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4956,44 +4960,49 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:857
+#: src/transport/gnunet-service-transport.c:856
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:755
+#, fuzzy, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:782
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:798
+#: src/hostlist/gnunet-daemon-hostlist_server.c:795
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:811
+#: src/hostlist/gnunet-daemon-hostlist_server.c:808
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:832
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:852
+#: src/hostlist/gnunet-daemon-hostlist_server.c:849
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:892
+#: src/hostlist/gnunet-daemon-hostlist_server.c:889
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5008,33 +5017,33 @@
 msgid "Failed to set default ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:325
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:328
+#: src/identity/gnunet-identity.c:327
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:331
+#: src/identity/gnunet-identity.c:330
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:334
+#: src/identity/gnunet-identity.c:333
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:337
+#: src/identity/gnunet-identity.c:336
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:340
+#: src/identity/gnunet-identity.c:339
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:349
+#: src/identity/gnunet-identity.c:348
 msgid "Maintain egos"
 msgstr ""
 
@@ -5085,7 +5094,7 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/plugin_rest_identity.c:923
+#: src/identity/plugin_rest_identity.c:938
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5098,7 +5107,7 @@
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1089
+#: src/identity-provider/plugin_rest_identity_provider.c:1126
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5138,16 +5147,16 @@
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:235
+#: src/namecache/gnunet-namecache.c:233
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5194,7 +5203,7 @@
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:532
+#: src/namestore/plugin_rest_namestore.c:547
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
@@ -5202,7 +5211,7 @@
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:541
+#: src/namestore/plugin_rest_namestore.c:556
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -5222,7 +5231,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:565
+#: src/namestore/plugin_rest_namestore.c:580
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
@@ -5234,9 +5243,9 @@
 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
+#: src/namestore/plugin_rest_namestore.c:954
+#: src/transport/gnunet-transport.c:1769
+#: src/transport/gnunet-transport-profiler.c:497
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -5248,7 +5257,7 @@
 
 #: src/namestore/gnunet-namestore.c:717
 #: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:954
+#: src/namestore/plugin_rest_namestore.c:963
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -5266,14 +5275,14 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:635
+#: src/namestore/plugin_rest_namestore.c:650
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
 #: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:653
-#: src/namestore/plugin_rest_namestore.c:693
+#: src/namestore/plugin_rest_namestore.c:668
+#: src/namestore/plugin_rest_namestore.c:708
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
@@ -5292,7 +5301,8 @@
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#: src/namestore/gnunet-namestore.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:819
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -5303,84 +5313,84 @@
 msgstr "Ogiltiga argument: "
 
 #: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:984
+#: src/namestore/plugin_rest_namestore.c:999
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
 #: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1011
+#: src/namestore/plugin_rest_namestore.c:1026
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
 #: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1066
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:1016
-#: src/namestore/plugin_rest_namestore.c:1092
+#: src/namestore/gnunet-namestore.c:1015
+#: src/namestore/plugin_rest_namestore.c:1107
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1064
+#: src/namestore/gnunet-namestore.c:1063
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1066
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1070
+#: src/namestore/gnunet-namestore.c:1069
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1072
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1076
+#: src/namestore/gnunet-namestore.c:1075
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1079
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1085
+#: src/namestore/gnunet-namestore.c:1084
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1088
+#: src/namestore/gnunet-namestore.c:1087
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1091
+#: src/namestore/gnunet-namestore.c:1090
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1094
+#: src/namestore/gnunet-namestore.c:1093
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1097
+#: src/namestore/gnunet-namestore.c:1096
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1100
+#: src/namestore/gnunet-namestore.c:1099
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1103
+#: src/namestore/gnunet-namestore.c:1102
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5441,7 +5451,7 @@
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1018
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5458,7 +5468,7 @@
 msgid "flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1176
+#: src/namestore/plugin_rest_namestore.c:1187
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5476,93 +5486,93 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:392
+#: src/nat/nat_auto.c:388
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:389
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:412
+#: src/nat/nat_auto.c:408
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:444
+#: src/nat/nat_auto.c:440
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:576
+#: src/nat/nat_auto.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:594
+#: src/nat/nat_auto.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_auto.c:716
+#: src/nat/nat_auto.c:709
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:717
+#: src/nat/nat_auto.c:710
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:749
+#: src/nat/nat_auto.c:742
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:798
+#: src/nat/nat_auto.c:788
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1024
+#: src/nat/nat.c:1019
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1074
+#: src/nat/nat.c:1070
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1325
+#: src/nat/nat.c:1321
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1400
+#: src/nat/nat.c:1396
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/nat/nat.c:1544
+#: src/nat/nat.c:1540
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:1594
 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
+#: src/nat/nat.c:1723 src/nat/nat.c:1736
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5569,102 +5579,102 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1895
+#: src/nat/nat.c:1891
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1911
+#: src/nat/nat.c:1907
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:1998
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2000
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2002
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2004
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2006
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2008
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2010
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2012
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2014
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2016
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2018
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2020
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2022
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2026
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2028
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2030
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2032
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2034
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:605
+#: src/nat/nat_mini.c:611
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5673,7 +5683,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:495
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -5692,84 +5702,84 @@
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/nse/gnunet-nse-profiler.c:840
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:860
+#: src/nse/gnunet-nse-profiler.c:843
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:869
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:875
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:867
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1533
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
+#: src/nse/gnunet-service-nse.c:1535
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:225
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:382
+#: src/peerinfo/gnunet-service-peerinfo.c:411
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:491
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:529
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:683
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:689
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1056
+#: src/peerinfo/gnunet-service-peerinfo.c:1061
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1375
+#: src/peerinfo/gnunet-service-peerinfo.c:1391
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1388
+#: src/peerinfo/gnunet-service-peerinfo.c:1404
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5799,7 +5809,7 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:267
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -5849,44 +5859,44 @@
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:844
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:884
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:887
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:890
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:893
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:896
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:902
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:905
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:920
+#: src/peerinfo-tool/gnunet-peerinfo.c:919
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5909,38 +5919,38 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
+#: src/peerstore/gnunet-service-peerstore.c:395
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/peerstore/gnunet-service-peerstore.c:391
+#: src/peerstore/gnunet-service-peerstore.c:402
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:451
+#: src/peerstore/gnunet-service-peerstore.c:462
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:459
+#: src/peerstore/gnunet-service-peerstore.c:470
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:478
+#: src/peerstore/gnunet-service-peerstore.c:489
 #, fuzzy
 msgid "Failed to store requested value, database error."
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:557
+#: src/peerstore/gnunet-service-peerstore.c:568
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:579
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5950,31 +5960,31 @@
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:374
+#: src/peerstore/peerstore_api.c:376
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:677
+#: src/peerstore/peerstore_api.c:679
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/peerstore/peerstore_api.c:688
+#: src/peerstore/peerstore_api.c:690
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/peerstore/peerstore_api.c:707
+#: src/peerstore/peerstore_api.c:709
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:819
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:831
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6029,63 +6039,63 @@
 msgid "Failed to get fragment!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:422
+#: src/psycstore/gnunet-service-psycstore.c:423
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:453
+#: src/psycstore/gnunet-service-psycstore.c:454
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:481
+#: src/psycstore/gnunet-service-psycstore.c:482
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:664
+#: src/psycstore/gnunet-service-psycstore.c:665
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:674
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:714
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:745
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:765
+#: src/psycstore/gnunet-service-psycstore.c:784
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:807
+#: src/psycstore/gnunet-service-psycstore.c:858
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:834
+#: src/psycstore/gnunet-service-psycstore.c:873
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
@@ -6163,8 +6173,7 @@
 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:656
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -6173,79 +6182,74 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1284
+#: src/regex/gnunet-regex-profiler.c:1301
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1295
-#, fuzzy
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1324
-#: src/regex/gnunet-regex-simulation-profiler.c:619
+#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1330
-#: src/regex/gnunet-regex-simulation-profiler.c:626
+#: src/regex/gnunet-regex-profiler.c:1348
+#: src/regex/gnunet-regex-simulation-profiler.c:646
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1337
+#: src/regex/gnunet-regex-profiler.c:1355
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1346
+#: src/regex/gnunet-regex-profiler.c:1364
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1384
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1469
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1472
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1460
+#: src/regex/gnunet-regex-profiler.c:1478
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1463
+#: src/regex/gnunet-regex-profiler.c:1481
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1493
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:686
+#: src/regex/gnunet-regex-simulation-profiler.c:704
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:702
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6254,116 +6258,116 @@
 msgid "Regex `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:792
+#: src/rest/gnunet-rest-server.c:784
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:809
+#: src/rest/gnunet-rest-server.c:801
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/revocation/gnunet-revocation.c:124
+#: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/revocation/gnunet-revocation.c:129
+#: src/revocation/gnunet-revocation.c:134
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:140
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Okänt fel.\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:171
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:292
+#: src/revocation/gnunet-revocation.c:320
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:322
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/revocation/gnunet-revocation.c:343
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:363
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:405
+#: src/revocation/gnunet-revocation.c:435
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:439
+#: src/revocation/gnunet-revocation.c:468
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:461
+#: src/revocation/gnunet-revocation.c:489
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:486
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:533
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:536
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
+#: src/revocation/gnunet-revocation.c:539
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6402,7 +6406,7 @@
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps.c:185
+#: src/rps/gnunet-rps.c:177
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6441,29 +6445,29 @@
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:352
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 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:355
+#: src/scalarproduct/gnunet-scalarproduct.c:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -6472,23 +6476,23 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:611
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:617
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2015
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6515,10 +6519,138 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:383
+#: src/set/gnunet-set-profiler.c:386
 msgid "operation to execute"
 msgstr ""
 
+#: src/social/gnunet-social.c:1138
+#, fuzzy
+msgid "--place missing or invalid.\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/social/gnunet-social.c:1180
+msgid "assign --name in state to --data"
+msgstr ""
+
+#: src/social/gnunet-social.c:1184
+msgid "say good-bye and leave somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1188
+msgid "create a place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1192
+msgid "destroy a place we were hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1196
+msgid "enter somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1200
+msgid "find state matching name prefix"
+msgstr ""
+
+#: src/social/gnunet-social.c:1204
+msgid "replay history of messages up to the given --limit"
+msgstr ""
+
+#: src/social/gnunet-social.c:1208
+msgid "reconnect to a previously created place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1212
+msgid "publish something to a place we are hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1216
+msgid "reconnect to a previously entered place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1220
+msgid "search for state matching exact name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1224
+msgid "submit something to somebody's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1228
+msgid "list of egos and subscribed places"
+msgstr ""
+
+#: src/social/gnunet-social.c:1232
+msgid "extract and replay history between message IDs --start and --until"
+msgstr ""
+
+#: src/social/gnunet-social.c:1239
+msgid "application ID to use when connecting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1243
+msgid "message body or state value"
+msgstr ""
+
+#: src/social/gnunet-social.c:1247
+#, fuzzy
+msgid "name or public key of ego"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/social/gnunet-social.c:1251
+#, fuzzy
+msgid "wait for incoming messages"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/social/gnunet-social.c:1255
+#, fuzzy
+msgid "GNS name"
+msgstr "Visa _namn"
+
+#: src/social/gnunet-social.c:1259
+msgid "peer ID for --guest-enter"
+msgstr ""
+
+#: src/social/gnunet-social.c:1263
+msgid "name (key) to query from state"
+msgstr ""
+
+#: src/social/gnunet-social.c:1267
+#, fuzzy
+msgid "method name"
+msgstr "Visa _namn"
+
+#: src/social/gnunet-social.c:1271
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/social/gnunet-social.c:1275
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1279
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1283
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1287
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1291
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1301
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6539,11 +6671,11 @@
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:194
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:200
 msgid "Missing argument: name\n"
 msgstr ""
 
@@ -6552,7 +6684,7 @@
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:240
+#: src/statistics/gnunet-statistics.c:241
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -6664,7 +6796,7 @@
 msgstr "Ogiltigt argument: \"%s\"\n"
 
 #: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:291
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6692,61 +6824,61 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:322
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
 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/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
 #: 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:475
+#: src/testbed/gnunet-daemon-testbed-underlay.c:468
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:732
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
 msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:248
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:297
+#: src/testbed/gnunet-testbed-profiler.c:287
 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 "
@@ -6778,11 +6910,11 @@
 msgid "Adding host %u failed with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:987
+#: src/testbed/testbed_api_testbed.c:986
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
@@ -6881,21 +7013,21 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -6902,16 +7034,16 @@
 "extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -6999,57 +7131,57 @@
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:634
+#: src/topology/gnunet-daemon-topology.c:730
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:931
+#: src/topology/gnunet-daemon-topology.c:927
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:964
+#: src/topology/gnunet-daemon-topology.c:960
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:971
+#: src/topology/gnunet-daemon-topology.c:967
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:989
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:992
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1003
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1005
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1043
+#: src/topology/gnunet-daemon-topology.c:1039
 #: src/transport/plugin_transport_wlan.c:1491
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1288
+#: src/topology/gnunet-daemon-topology.c:1283
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7287,40 +7419,40 @@
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3357
+#: src/transport/gnunet-service-transport_neighbours.c:3353
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3393
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3488
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3528
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3546
+#: src/transport/gnunet-service-transport_neighbours.c:3542
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3680
+#: src/transport/gnunet-service-transport_neighbours.c:3676
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7355,8 +7487,8 @@
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:949
+#: src/transport/gnunet-service-transport_validation.c:1551
 msgid "# validations running"
 msgstr ""
 
@@ -7381,30 +7513,30 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1076
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:1127
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1140
+#: src/transport/gnunet-service-transport_validation.c:1139
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1143
+#: src/transport/gnunet-service-transport_validation.c:1142
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1151
+#: src/transport/gnunet-service-transport_validation.c:1150
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1163
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7411,28 +7543,28 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1219
+#: src/transport/gnunet-service-transport_validation.c:1218
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1269
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1279
+#: src/transport/gnunet-service-transport_validation.c:1278
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/transport/gnunet-service-transport_validation.c:1441
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1460
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1515
+#: src/transport/gnunet-service-transport_validation.c:1514
 msgid "# validations succeeded"
 msgstr ""
 
@@ -7442,7 +7574,7 @@
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:282
+#: src/transport/gnunet-transport-profiler.c:277
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
@@ -7452,42 +7584,42 @@
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:621
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:635
+#: src/transport/gnunet-transport.c:633
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:667
+#: src/transport/gnunet-transport.c:663
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:672
+#: src/transport/gnunet-transport.c:668
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/transport/gnunet-transport.c:677
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:682
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:807
+#: src/transport/gnunet-transport.c:803
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7496,36 +7628,36 @@
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:842
+#: src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:982
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:996
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1021
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:1078
+#: src/transport/gnunet-transport.c:1067
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1107
+#: src/transport/gnunet-transport.c:1096
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7532,44 +7664,44 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1144
-#: src/transport/gnunet-transport-profiler.c:439
+#: src/transport/gnunet-transport.c:1133
+#: src/transport/gnunet-transport-profiler.c:432
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
+#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:1160
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1197
+#: src/transport/gnunet-transport.c:1186
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1221
-#: src/transport/gnunet-transport-profiler.c:464
+#: src/transport/gnunet-transport.c:1210
+#: src/transport/gnunet-transport-profiler.c:457
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1261
+#: src/transport/gnunet-transport.c:1250
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1262
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1809
+#: src/transport/gnunet-transport.c:1792
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7576,119 +7708,119 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1817
+#: src/transport/gnunet-transport.c:1800
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1840
+#: src/transport/gnunet-transport.c:1823
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1846
+#: src/transport/gnunet-transport.c:1829
 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
+#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
+#: src/transport/gnunet-transport.c:1925
+#: src/transport/gnunet-transport-profiler.c:553
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1889
+#: src/transport/gnunet-transport.c:1872
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:1972
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1975
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1978
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport.c:1981
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1984
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1987
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1993
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:2014
+#: src/transport/gnunet-transport.c:1996
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:2017
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport-profiler.c:618
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2020
+#: src/transport/gnunet-transport.c:2002
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2023
+#: src/transport/gnunet-transport.c:2005
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2008
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2037
-#: src/transport/gnunet-transport-profiler.c:637
+#: src/transport/gnunet-transport.c:2019
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:226
+#: src/transport/gnunet-transport-profiler.c:221
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:262
+#: src/transport/gnunet-transport-profiler.c:257
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:271
+#: src/transport/gnunet-transport-profiler.c:266
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:288
+#: src/transport/gnunet-transport-profiler.c:283
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:341
+#: src/transport/gnunet-transport-profiler.c:336
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:361
+#: src/transport/gnunet-transport-profiler.c:356
 #, c-format
 msgid ""
 "\n"
@@ -7695,107 +7827,107 @@
 "Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:411
+#: src/transport/gnunet-transport-profiler.c:404
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport-profiler.c:418
+#: src/transport/gnunet-transport-profiler.c:411
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport-profiler.c:480
+#: src/transport/gnunet-transport-profiler.c:473
 #, fuzzy, c-format
 msgid "Denying connection to `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/transport/gnunet-transport-profiler.c:510
+#: src/transport/gnunet-transport-profiler.c:503
 #, fuzzy
 msgid "Message size too big!\n"
 msgstr "meddelandestorlek"
 
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport-profiler.c:509
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/transport/gnunet-transport-profiler.c:524
 #, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:530
 #, fuzzy, c-format
 msgid "Trying to receive messages from peer `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport-profiler.c:542
+#: src/transport/gnunet-transport-profiler.c:535
 #, fuzzy
 msgid "No operation given\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/transport/gnunet-transport-profiler.c:542
 #, fuzzy
 msgid "Failed to connect to ATS service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:611
+#: src/transport/gnunet-transport-profiler.c:603
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport-profiler.c:606
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# byte mottagna av typen %d"
 
-#: src/transport/gnunet-transport-profiler.c:617
+#: src/transport/gnunet-transport-profiler.c:609
 #, fuzzy
 msgid "iterations"
 msgstr "Visa alla alternativ"
 
-#: src/transport/gnunet-transport-profiler.c:620
+#: src/transport/gnunet-transport-profiler.c:612
 #, fuzzy
 msgid "number of messages to send"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 #, fuzzy
 msgid "message size to use"
 msgstr "meddelandestorlek"
 
-#: 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_http_client.c:1473
+#: src/transport/plugin_transport_http_server.c:2237
+#: src/transport/plugin_transport_http_server.c:3427
 #: 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
+#: src/transport/plugin_transport_http_client.c:2114
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2172
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_client.c:2163
+#: src/transport/plugin_transport_http_server.c:3142
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
-#: src/transport/plugin_transport_http_server.c:3218
+#: src/transport/plugin_transport_http_client.c:2180
+#: src/transport/plugin_transport_http_server.c:3212
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:2223
+#: src/transport/plugin_transport_http_client.c:2214
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1733
+#: src/transport/plugin_transport_http_server.c:1721
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7802,82 +7934,82 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1955
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1973
+#: src/transport/plugin_transport_http_server.c:1963
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2123
+#: src/transport/plugin_transport_http_server.c:2113
 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:2146
+#: src/transport/plugin_transport_http_server.c:2136
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2273
+#: src/transport/plugin_transport_http_server.c:2263
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2582
+#: src/transport/plugin_transport_http_server.c:2572
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2606 src/util/service.c:704
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2747
+#: src/transport/plugin_transport_http_server.c:2737
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
-#: src/transport/plugin_transport_udp.c:3604
+#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2924
+#: src/transport/plugin_transport_http_server.c:2918
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2933
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2945
+#: src/transport/plugin_transport_http_server.c:2939
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2950
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2962
+#: src/transport/plugin_transport_http_server.c:2956
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2970
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -7884,12 +8016,12 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2986
+#: src/transport/plugin_transport_http_server.c:2980
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3008
+#: src/transport/plugin_transport_http_server.c:3002
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
@@ -7896,27 +8028,27 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3018
+#: src/transport/plugin_transport_http_server.c:3012
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3081
+#: src/transport/plugin_transport_http_server.c:3075
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3102
+#: src/transport/plugin_transport_http_server.c:3096
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/plugin_transport_http_server.c:3119
+#: src/transport/plugin_transport_http_server.c:3113
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:3445
+#: src/transport/plugin_transport_http_server.c:3439
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -8105,52 +8237,52 @@
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3680
-#: src/transport/plugin_transport_udp.c:3779
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3698
+#: src/transport/plugin_transport_udp.c:3694
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3789
+#: src/transport/plugin_transport_udp.c:3785
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3861
-#: src/transport/plugin_transport_udp.c:3875
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3907
+#: src/transport/plugin_transport_udp.c:3903
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3934
+#: src/transport/plugin_transport_udp.c:3930
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:4000
+#: src/transport/plugin_transport_udp.c:3996
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1407
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1420
+#: src/transport/plugin_transport_unix.c:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1820
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -8227,7 +8359,7 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transport/transport-testing.c:680
+#: src/transport/transport-testing.c:676
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -8267,12 +8399,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:892 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:895 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -8289,12 +8421,12 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1040
+#: src/util/client.c:1042
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:1052
+#: src/util/client.c:1054
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
@@ -8376,12 +8508,12 @@
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:429
+#: src/util/connection.c:441
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:446
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
@@ -8453,12 +8585,12 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:1228
+#: src/util/disk.c:1227
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1451 src/util/service.c:1327
+#: src/util/disk.c:1450 src/util/service.c:1322
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8541,44 +8673,53 @@
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/util/gnunet-config.c:137
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet-konfiguration"
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8671,28 +8812,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:234
+#: src/util/gnunet-scrypt.c:242
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/util/gnunet-scrypt.c:295
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:301
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:336
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8708,41 +8849,41 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:83
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:91
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:105
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:167
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:340
+#: src/util/helper.c:331
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:386
+#: src/util/helper.c:382
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:616
+#: src/util/helper.c:601
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -8758,7 +8899,7 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:500
+#: src/util/os_installation.c:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8765,18 +8906,18 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:860
+#: src/util/os_installation.c:861
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
 # drive = hard drive ?
-#: src/util/os_installation.c:920
+#: src/util/os_installation.c:921
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/os_installation.c:930
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8801,17 +8942,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:248 src/util/service.c:1461
+#: src/util/program.c:244 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:260 src/util/service.c:1476
+#: src/util/program.c:256 src/util/service.c:1471
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/program.c:265 src/util/service.c:1471
+#: src/util/program.c:261 src/util/service.c:1466
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8841,33 +8982,33 @@
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:952
+#: src/util/resolver_api.c:950
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
-#: src/util/resolver_api.c:1063
+#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
+#: src/util/resolver_api.c:1061
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 # drive = hard drive ?
-#: src/util/server.c:483
+#: src/util/server.c:478
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:493
+#: src/util/server.c:488
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:499
+#: src/util/server.c:494
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:902
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8926,38 +9067,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1174
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1216
+#: src/util/service.c:1211
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1265
+#: src/util/service.c:1260
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1264
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1273
+#: src/util/service.c:1268
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1328
+#: src/util/service.c:1323
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1341
+#: src/util/service.c:1336
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1411
+#: src/util/service.c:1406
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -8966,12 +9107,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/socks.c:597
+#: src/util/socks.c:586
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:610
+#: src/util/socks.c:599
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9217,86 +9358,90 @@
 msgid "Error creating tunnel\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
-#: src/include/gnunet_common.h:655
+#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
+#: src/include/gnunet_common.h:656
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:667
+#: src/include/gnunet_common.h:668
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
+#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
 #~ msgid "Error trying to send a message to peer `%s'.\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -9309,10 +9454,6 @@
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
 #, fuzzy
-#~ msgid "Missing or invalid topology file.\n"
-#~ msgstr "Ogiltigt argument: \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Number of peers to run"
 #~ msgstr "antal iterationer"
 
@@ -9568,10 +9709,6 @@
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Invalid value for public key\n"
-#~ msgstr "Ogiltigt argument: \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Cannot read experiments file `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -10480,10 +10617,6 @@
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Phase 3: sending messages\n"
-#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#, fuzzy
 #~ msgid "Loading HTTPS transport plugin `%s'\n"
 #~ msgstr "Testar transport(er) %s\n"
 
@@ -11462,9 +11595,6 @@
 #~ msgid "_Quit"
 #~ msgstr "_Avsluta"
 
-#~ msgid "Show _name"
-#~ msgstr "Visa _namn"
-
 #~ msgid "Show _range"
 #~ msgstr "Visa _omfång"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/vi.po     2016-05-19 13:15:51 UTC (rev 37185)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -28,235 +28,235 @@
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 #, fuzzy
 msgid "Request timed out"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:261
+#: src/arm/gnunet-arm.c:271
 #, fuzzy, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:380
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:391
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:434
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:444
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:466
+#: src/arm/gnunet-arm.c:482
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:477
+#: src/arm/gnunet-arm.c:493
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/arm/gnunet-arm.c:515
+#: src/arm/gnunet-arm.c:533
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:542
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:547
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -269,65 +269,65 @@
 msgid "Could not send list result to client\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:581
+#: src/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:592
+#: src/arm/gnunet-service-arm.c:566
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:717
+#: src/arm/gnunet-service-arm.c:687
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:753
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:863
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -357,11 +357,13 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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:3296 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 ""
@@ -383,7 +385,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -390,18 +392,18 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -505,12 +507,12 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:836
 #, fuzzy
 msgid "Stop logging\n"
 msgstr "Theo dõi"
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -558,8 +560,8 @@
 msgstr ""
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -569,13 +571,13 @@
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -646,68 +648,68 @@
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
@@ -718,8 +720,8 @@
 msgstr ""
 
 #: 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
+#: src/set/gnunet-set-profiler.c:377 src/set/gnunet-set-profiler.c:380
+#: src/set/gnunet-set-profiler.c:383
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
@@ -734,12 +736,12 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:511
-#: src/set/gnunet-set-profiler.c:386
+#: src/set/gnunet-set-profiler.c:389
 msgid "write statistics to file"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:514
-#: src/secretsharing/gnunet-secretsharing-profiler.c:623
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -1026,7 +1028,7 @@
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:211
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -1033,8 +1035,8 @@
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:244
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:520
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:548
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -1045,68 +1047,68 @@
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:318
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:602
+#: src/conversation/gnunet-helper-audio-playback.c:608
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:627
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:638
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-playback.c:652
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:659
+#: src/conversation/gnunet-helper-audio-playback.c:665
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:680
+#: src/conversation/gnunet-helper-audio-playback.c:686
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:692
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-playback.c:706
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:707
+#: src/conversation/gnunet-helper-audio-playback.c:713
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:719
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:783
+#: src/conversation/gnunet-helper-audio-playback.c:789
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1167,20 +1169,20 @@
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, fuzzy, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:853
+#: src/conversation/gnunet-service-conversation.c:855
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:944
+#: src/conversation/gnunet-service-conversation.c:946
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1351
+#: src/conversation/gnunet-service-conversation.c:1360
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
@@ -1246,7 +1248,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:790
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -1256,12 +1258,12 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:2008
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1990
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:186
+#: src/core/gnunet-core.c:185
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1271,7 +1273,7 @@
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:128
+#: src/core/gnunet-service-core.c:127
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
@@ -1303,25 +1305,25 @@
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:766
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:795
+#: src/core/gnunet-service-core_kx.c:796
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:870
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:877
+#: src/core/gnunet-service-core_kx.c:878
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:916
+#: src/core/gnunet-service-core_kx.c:917
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
@@ -1328,111 +1330,111 @@
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:927
+#: src/core/gnunet-service-core_kx.c:928
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:1029
-#: src/transport/gnunet-service-transport_validation.c:1081
+#: src/core/gnunet-service-core_kx.c:1030
+#: src/transport/gnunet-service-transport_validation.c:1080
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1039
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1091
+#: src/core/gnunet-service-core_kx.c:1092
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1118
+#: src/core/gnunet-service-core_kx.c:1119
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1131
+#: src/core/gnunet-service-core_kx.c:1132
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1202
-#: src/transport/gnunet-service-transport_validation.c:1404
+#: src/core/gnunet-service-core_kx.c:1203
+#: src/transport/gnunet-service-transport_validation.c:1403
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1210
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1214
+#: src/core/gnunet-service-core_kx.c:1215
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1250
+#: src/core/gnunet-service-core_kx.c:1251
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/core/gnunet-service-core_kx.c:1289
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1300
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1307
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1462
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1470
+#: src/core/gnunet-service-core_kx.c:1471
 #, 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:1473
+#: src/core/gnunet-service-core_kx.c:1474
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1531
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1558
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1544
+#: src/core/gnunet-service-core_kx.c:1545
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1586
+#: src/core/gnunet-service-core_kx.c:1587
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1594
+#: src/core/gnunet-service-core_kx.c:1595
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1628
+#: src/core/gnunet-service-core_kx.c:1629
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1458,11 +1460,11 @@
 
 #: 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/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:863
+#: src/fs/gnunet-service-fs_cp.c:662 src/fs/gnunet-service-fs_cp.c:1715
+#: src/topology/gnunet-daemon-topology.c:611
+#: src/topology/gnunet-daemon-topology.c:723
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 #, fuzzy
@@ -1495,7 +1497,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:863
+#: src/datastore/gnunet-service-datastore.c:865
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -1544,9 +1546,9 @@
 #: 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/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:74 src/my/my.c:84
+#: 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:53
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:53
@@ -1557,7 +1559,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:676 src/include/gnunet_common.h:685
+#: src/include/gnunet_common.h:677 src/include/gnunet_common.h:686
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1680,13 +1682,13 @@
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:245
+#: src/datastore/gnunet-datastore.c:244
 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:254
+#: src/datastore/gnunet-datastore.c:253
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -1696,25 +1698,25 @@
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:444
+#: src/datastore/gnunet-service-datastore.c:446
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:502
+#: src/datastore/gnunet-service-datastore.c:504
 #: src/gns/gnunet-gns-helper-service-w32.c:221
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:533
+#: src/datastore/gnunet-service-datastore.c:535
 #: src/gns/gnunet-gns-helper-service-w32.c:260
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:649
+#: src/datastore/gnunet-service-datastore.c:651
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1721,7 +1723,7 @@
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:707
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1728,135 +1730,135 @@
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:709
+#: src/datastore/gnunet-service-datastore.c:711
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:715
+#: src/datastore/gnunet-service-datastore.c:717
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: 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
+#: src/datastore/gnunet-service-datastore.c:723
+#: src/datastore/gnunet-service-datastore.c:778
+#: src/datastore/gnunet-service-datastore.c:1039
+#: src/datastore/gnunet-service-datastore.c:1673
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:790
+#: src/datastore/gnunet-service-datastore.c:792
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:877
+#: src/datastore/gnunet-service-datastore.c:879
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1092
+#: src/datastore/gnunet-service-datastore.c:1094
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1105
+#: src/datastore/gnunet-service-datastore.c:1107
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1153
+#: src/datastore/gnunet-service-datastore.c:1155
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1185
+#: src/datastore/gnunet-service-datastore.c:1187
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1221
+#: src/datastore/gnunet-service-datastore.c:1223
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1267
+#: src/datastore/gnunet-service-datastore.c:1269
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1279
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1309
+#: src/datastore/gnunet-service-datastore.c:1311
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1362
+#: src/datastore/gnunet-service-datastore.c:1364
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1367
+#: src/datastore/gnunet-service-datastore.c:1369
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1420
+#: src/datastore/gnunet-service-datastore.c:1423
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1431
+#: src/datastore/gnunet-service-datastore.c:1434
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1500
-#: src/datastore/gnunet-service-datastore.c:1563
+#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1566
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1550
+#: src/datastore/gnunet-service-datastore.c:1553
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1560
+#: src/datastore/gnunet-service-datastore.c:1563
 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
+#: src/datastore/gnunet-service-datastore.c:1704
+#: src/datastore/gnunet-service-datastore.c:1716
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1707
+#: src/datastore/gnunet-service-datastore.c:1710
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1719
+#: src/datastore/gnunet-service-datastore.c:1722
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1721
+#: src/datastore/gnunet-service-datastore.c:1724
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1736
+#: src/datastore/gnunet-service-datastore.c:1739
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1754
-#: src/datastore/gnunet-service-datastore.c:1770
+#: src/datastore/gnunet-service-datastore.c:1757
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1800
+#: src/datastore/gnunet-service-datastore.c:1803
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -1956,7 +1958,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:155
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1963,224 +1965,225 @@
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:158
+#: src/dht/gnunet-dht-get.c:181
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:164 src/dht/gnunet-dht-monitor.c:224
+#: src/dht/gnunet-dht-get.c:187 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:172
+#: src/dht/gnunet-dht-get.c:195
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:188 src/dht/gnunet-dht-monitor.c:261
-#: src/dht/gnunet-dht-put.c:199
+#: src/dht/gnunet-dht-get.c:212 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-put.c:202
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:191
+#: src/dht/gnunet-dht-get.c:215
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:194 src/dht/gnunet-dht-monitor.c:264
+#: src/dht/gnunet-dht-get.c:218 src/dht/gnunet-dht-monitor.c:292
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:197 src/dht/gnunet-dht-put.c:211
+#: src/dht/gnunet-dht-get.c:221 src/dht/gnunet-dht-put.c:214
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:200 src/dht/gnunet-dht-put.c:202
+#: src/dht/gnunet-dht-get.c:224 src/dht/gnunet-dht-put.c:205
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-dht-get.c:227 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:217 src/fs/gnunet-auto-share.c:780
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-search.c:318 src/fs/gnunet-unindex.c:167
+#: src/nse/gnunet-nse-profiler.c:855
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:224
+#: src/dht/gnunet-dht-get.c:248
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:267
+#: src/dht/gnunet-dht-monitor.c:295
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-monitor.c:320
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1396 src/testbed/gnunet-testbed-profiler.c:265
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/dht/gnunet_dht_profiler.c:1421
+#: src/dht/gnunet_dht_profiler.c:1417
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
 
-#: src/dht/gnunet_dht_profiler.c:1424
+#: src/dht/gnunet_dht_profiler.c:1420
 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
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:846
+#: src/testbed/gnunet-testbed-profiler.c:294
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1430
+#: src/dht/gnunet_dht_profiler.c:1426
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1433
+#: src/dht/gnunet_dht_profiler.c:1429
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1436
+#: src/dht/gnunet_dht_profiler.c:1432
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1439
+#: src/dht/gnunet_dht_profiler.c:1435
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1442
+#: src/dht/gnunet_dht_profiler.c:1438
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1460
+#: src/dht/gnunet_dht_profiler.c:1456
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/dht/gnunet-dht-put.c:120
 #, fuzzy
 msgid "PUT request sent with key"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:122
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:125
+#: src/dht/gnunet-dht-put.c:126
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:154
+#: src/dht/gnunet-dht-put.c:157
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-put.c:164
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:177
+#: src/dht/gnunet-dht-put.c:180
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:193
+#: src/dht/gnunet-dht-put.c:196
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:196
+#: src/dht/gnunet-dht-put.c:199
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:205
+#: src/dht/gnunet-dht-put.c:208
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:208
+#: src/dht/gnunet-dht-put.c:211
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:237
+#: src/dht/gnunet-dht-put.c:240
 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-dht.c:171
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-wdht_clients.c:852
-#: src/dht/gnunet-service-xdht_clients.c:849
+#: src/dht/gnunet-service-wdht_clients.c:857
+#: src/dht/gnunet-service-xdht_clients.c:854
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-wdht_clients.c:937
-#: src/dht/gnunet-service-xdht_clients.c:933
+#: src/dht/gnunet-service-dht_clients.c:509
+#: src/dht/gnunet-service-wdht_clients.c:938
+#: src/dht/gnunet-service-xdht_clients.c:934
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-wdht_clients.c:1003
-#: src/dht/gnunet-service-xdht_clients.c:998
+#: src/dht/gnunet-service-dht_clients.c:593
+#: src/dht/gnunet-service-wdht_clients.c:1004
+#: src/dht/gnunet-service-xdht_clients.c:999
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-wdht_clients.c:1212
-#: src/dht/gnunet-service-xdht_clients.c:1200
+#: src/dht/gnunet-service-dht_clients.c:794
+#: src/dht/gnunet-service-wdht_clients.c:1213
+#: src/dht/gnunet-service-xdht_clients.c:1201
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-wdht_clients.c:505
-#: src/dht/gnunet-service-xdht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-xdht_clients.c:508
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-wdht_clients.c:519
-#: src/dht/gnunet-service-xdht_clients.c:517
+#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-xdht_clients.c:522
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1098
-#: src/dht/gnunet-service-wdht_clients.c:561
-#: src/dht/gnunet-service-xdht_clients.c:559
+#: src/dht/gnunet-service-dht_clients.c:1099
+#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-xdht_clients.c:564
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1121
-#: src/dht/gnunet-service-wdht_clients.c:584
-#: src/dht/gnunet-service-xdht_clients.c:582
+#: src/dht/gnunet-service-dht_clients.c:1122
+#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-xdht_clients.c:587
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: 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
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: src/dht/gnunet-service-dht_clients.c:1219
+#: src/dht/gnunet-service-wdht_clients.c:643
+#: src/dht/gnunet-service-wdht_clients.c:686
+#: src/dht/gnunet-service-xdht_clients.c:641
+#: src/dht/gnunet-service-xdht_clients.c:684
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1185
-#: src/dht/gnunet-service-wdht_clients.c:648
-#: src/dht/gnunet-service-xdht_clients.c:646
+#: src/dht/gnunet-service-dht_clients.c:1186
+#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/gnunet-service-xdht_clients.c:651
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -2239,68 +2242,69 @@
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: 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
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:735
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:904
-#: src/dht/gnunet-service-xdht_neighbours.c:6056
+#: src/dht/gnunet-service-dht_neighbours.c:900
+#: src/dht/gnunet-service-xdht_neighbours.c:6062
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:937
+#: src/dht/gnunet-service-dht_neighbours.c:933
 #: src/dht/gnunet-service-xdht_neighbours.c:986
 #, fuzzy
 msgid "# Messages dropped (CORE timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:967
+#: src/dht/gnunet-service-dht_neighbours.c:963
 #: src/dht/gnunet-service-xdht_neighbours.c:1018
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:1013
+#: src/dht/gnunet-service-dht_neighbours.c:1009
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1043
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1289
+#: src/dht/gnunet-service-dht_neighbours.c:1248
+#: src/dht/gnunet-service-dht_neighbours.c:1285
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1267
-#: src/dht/gnunet-service-dht_neighbours.c:1304
+#: src/dht/gnunet-service-dht_neighbours.c:1263
+#: src/dht/gnunet-service-dht_neighbours.c:1300
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1451
+#: src/dht/gnunet-service-dht_neighbours.c:1447
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1480
+#: src/dht/gnunet-service-dht_neighbours.c:1476
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1490
-#: src/dht/gnunet-service-dht_neighbours.c:1614
-#: src/dht/gnunet-service-dht_neighbours.c:1721
+#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1610
+#: src/dht/gnunet-service-dht_neighbours.c:1717
 #: src/dht/gnunet-service-xdht_neighbours.c:1128
 #: src/dht/gnunet-service-xdht_neighbours.c:1197
 #: src/dht/gnunet-service-xdht_neighbours.c:1247
@@ -2314,66 +2318,66 @@
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1572
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1603
+#: src/dht/gnunet-service-dht_neighbours.c:1599
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1728
+#: src/dht/gnunet-service-dht_neighbours.c:1724
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1815
+#: src/dht/gnunet-service-dht_neighbours.c:1811
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1818
+#: src/dht/gnunet-service-dht_neighbours.c:1814
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1990
+#: src/dht/gnunet-service-dht_neighbours.c:1986
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1998
+#: src/dht/gnunet-service-dht_neighbours.c:1994
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2093
+#: src/dht/gnunet-service-dht_neighbours.c:2089
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2096
+#: src/dht/gnunet-service-dht_neighbours.c:2092
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2161
+#: src/dht/gnunet-service-dht_neighbours.c:2157
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2175
+#: src/dht/gnunet-service-dht_neighbours.c:2171
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2261
+#: src/dht/gnunet-service-dht_neighbours.c:2257
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2264
+#: src/dht/gnunet-service-dht_neighbours.c:2260
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2478,22 +2482,22 @@
 "SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:3555
+#: src/dht/gnunet-service-xdht_neighbours.c:3557
 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
+#: src/dht/gnunet-service-xdht_neighbours.c:3698
+#: src/dht/gnunet-service-xdht_neighbours.c:3936
+#: src/dht/gnunet-service-xdht_neighbours.c:4088
+#: src/dht/gnunet-service-xdht_neighbours.c:4240
+#: src/dht/gnunet-service-xdht_neighbours.c:4421
+#: src/dht/gnunet-service-xdht_neighbours.c:4934
+#: src/dht/gnunet-service-xdht_neighbours.c:5325
+#: src/dht/gnunet-service-xdht_neighbours.c:5420
+#: src/dht/gnunet-service-xdht_neighbours.c:5510
+#: src/dht/gnunet-service-xdht_neighbours.c:5614
+#: src/dht/gnunet-service-xdht_neighbours.c:5758
+#: src/dht/gnunet-service-xdht_neighbours.c:5849
 #, fuzzy
 msgid "# Bytes received from other peers"
 msgstr "# các byte kiểu %d được nhận"
@@ -2575,27 +2579,27 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:352
+#: src/dns/gnunet-dns-monitor.c:351
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:354
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:366
+#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:238
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:250
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2637,21 +2641,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1063 src/exit/gnunet-daemon-exit.c:3609
+#: src/dns/gnunet-service-dns.c:1062 src/exit/gnunet-daemon-exit.c:3607
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dns/gnunet-service-dns.c:1081
+#: src/dns/gnunet-service-dns.c:1080
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:167
+#: src/dv/gnunet-dv.c:166
 msgid "verbose output"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:176
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -2816,70 +2820,70 @@
 msgid "# Inbound CADET channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3279
+#: src/exit/gnunet-daemon-exit.c:3268 src/exit/gnunet-daemon-exit.c:3278
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3293 src/exit/gnunet-daemon-exit.c:3301
+#: src/exit/gnunet-daemon-exit.c:3292 src/exit/gnunet-daemon-exit.c:3300
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3334
+#: src/exit/gnunet-daemon-exit.c:3333
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3348 src/exit/gnunet-daemon-exit.c:3360
+#: src/exit/gnunet-daemon-exit.c:3347 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3371
+#: src/exit/gnunet-daemon-exit.c:3370
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3549
+#: src/exit/gnunet-daemon-exit.c:3548
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3565
+#: src/exit/gnunet-daemon-exit.c:3563
 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:3573
+#: src/exit/gnunet-daemon-exit.c:3571
 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:3580
+#: src/exit/gnunet-daemon-exit.c:3578
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3586
+#: src/exit/gnunet-daemon-exit.c:3584
 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/exit/gnunet-daemon-exit.c:3590 src/exit/gnunet-daemon-exit.c:3754
 #: src/pt/gnunet-daemon-pt.c:1243
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3704
+#: src/exit/gnunet-daemon-exit.c:3701
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3855
+#: src/exit/gnunet-daemon-exit.c:3852
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -3103,17 +3107,17 @@
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -3123,63 +3127,63 @@
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: 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
+#: src/fs/fs_publish.c:706 src/fs/fs_publish.c:723 src/fs/fs_publish.c:762
+#: src/fs/fs_publish.c:783 src/fs/fs_publish.c:807 src/fs/fs_publish.c:1055
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:707
+#: src/fs/fs_publish.c:708
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:719
+#: src/fs/fs_publish.c:720
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:763
+#: src/fs/fs_publish.c:764
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:783
+#: src/fs/fs_publish.c:784
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:808
+#: src/fs/fs_publish.c:809
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:831
+#: src/fs/fs_publish.c:832
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:895 src/fs/fs_publish.c:936
+#: src/fs/fs_publish.c:896 src/fs/fs_publish.c:937
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1008
+#: src/fs/fs_publish.c:1009
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:1016
+#: src/fs/fs_publish.c:1017
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1056
+#: src/fs/fs_publish.c:1057
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1296
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1386
+#: src/fs/fs_publish.c:1387
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3351,64 +3355,64 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-auto-share.c:237
+#: src/fs/gnunet-auto-share.c:232
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:290 src/fs/gnunet-auto-share.c:300
-#: src/fs/gnunet-auto-share.c:310
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:413
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:500
+#: src/fs/gnunet-auto-share.c:494
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/gnunet-auto-share.c:510
+#: src/fs/gnunet-auto-share.c:504
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:719
+#: src/fs/gnunet-auto-share.c:713
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:899
+#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:776 src/fs/gnunet-publish.c:903
+#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:779 src/fs/gnunet-publish.c:906
+#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:782 src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:785 src/fs/gnunet-publish.c:937
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:809
+#: src/fs/gnunet-auto-share.c:801
 #, fuzzy
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -3475,7 +3479,7 @@
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
 #: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
-#: src/fs/gnunet-search.c:205 src/fs/gnunet-unindex.c:107
+#: src/fs/gnunet-search.c:208 src/fs/gnunet-unindex.c:107
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -3499,12 +3503,12 @@
 msgstr ""
 
 #: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-search.c:255 src/fs/gnunet-unindex.c:139
+#: src/fs/gnunet-search.c:266 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:294
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:306
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
@@ -3513,7 +3517,7 @@
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:309
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
@@ -3550,19 +3554,19 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-fs-profiler.c:191
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:194
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:214
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:206
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3690,18 +3694,18 @@
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1828 src/transport/gnunet-transport.c:1852
+#: src/transport/gnunet-transport.c:1811 src/transport/gnunet-transport.c:1835
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:910
+#: src/fs/gnunet-publish.c:909
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3709,7 +3713,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:914
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3717,11 +3721,11 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:918
+#: src/fs/gnunet-publish.c:917
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-publish.c:921
+#: src/fs/gnunet-publish.c:920
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3729,7 +3733,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:926
+#: src/fs/gnunet-publish.c:925
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3737,12 +3741,12 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:934
+#: src/fs/gnunet-publish.c:933
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:940
+#: src/fs/gnunet-publish.c:939
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3750,13 +3754,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:944
+#: src/fs/gnunet-publish.c:943
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:948
+#: src/fs/gnunet-publish.c:947
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3764,64 +3768,64 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:964
+#: src/fs/gnunet-publish.c:963
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:120
+#: src/fs/gnunet-search.c:123
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:197
+#: src/fs/gnunet-search.c:200
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:245
+#: src/fs/gnunet-search.c:256
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:269
+#: src/fs/gnunet-search.c:280
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:300
+#: src/fs/gnunet-search.c:312
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:303
+#: src/fs/gnunet-search.c:315
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:310
+#: src/fs/gnunet-search.c:322
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:321
+#: src/fs/gnunet-search.c:333
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
 
-#: src/fs/gnunet-service-fs.c:272
+#: src/fs/gnunet-service-fs.c:273
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:330 src/fs/gnunet-service-fs.c:602
+#: src/fs/gnunet-service-fs.c:331 src/fs/gnunet-service-fs.c:603
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:729
+#: src/fs/gnunet-service-fs.c:730
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: 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
+#: src/fs/gnunet-service-fs.c:756 src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/topology/gnunet-daemon-topology.c:1245
+#: src/topology/gnunet-daemon-topology.c:1253
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -3862,101 +3866,101 @@
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:738
+#: src/fs/gnunet-service-fs_cp.c:743
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:747
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:780
+#: src/fs/gnunet-service-fs_cp.c:785
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:788
+#: src/fs/gnunet-service-fs_cp.c:793
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:815 src/fs/gnunet-service-fs_cp.c:1475
+#: src/fs/gnunet-service-fs_cp.c:820 src/fs/gnunet-service-fs_cp.c:1472
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:921
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:977
+#: src/fs/gnunet-service-fs_cp.c:974
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:985
+#: src/fs/gnunet-service-fs_cp.c:982
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:999
+#: src/fs/gnunet-service-fs_cp.c:996
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1044
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1118
+#: src/fs/gnunet-service-fs_cp.c:1115
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1143
+#: src/fs/gnunet-service-fs_cp.c:1140
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/fs/gnunet-service-fs_cp.c:1150
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1251
+#: src/fs/gnunet-service-fs_cp.c:1248
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1305
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1340
+#: src/fs/gnunet-service-fs_cp.c:1337
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1361
+#: src/fs/gnunet-service-fs_cp.c:1358
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1372
+#: src/fs/gnunet-service-fs_cp.c:1369
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1427
+#: src/fs/gnunet-service-fs_cp.c:1424
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1471
+#: src/fs/gnunet-service-fs_cp.c:1468
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1916
+#: src/fs/gnunet-service-fs_cp.c:1913
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -4212,7 +4216,7 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:392
+#: src/gns/gns_api.c:393
 #, fuzzy
 msgid "Failed to deserialize lookup reply from GNS service!\n"
 msgstr ""
@@ -4219,20 +4223,20 @@
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:357 src/hostlist/gnunet-daemon-hostlist_server.c:758
+#: src/gns/gnunet-bcd.c:357
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:362
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %u\n"
+msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
 #: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
@@ -4239,89 +4243,89 @@
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:519
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:532
+#: src/gns/gnunet-bcd.c:531
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:232
+#: src/gns/gnunet-dns2gns.c:238
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:408
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:424
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:426
+#: src/gns/gnunet-dns2gns.c:432
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:704
+#: src/gns/gnunet-dns2gns.c:709
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:730
+#: src/gns/gnunet-dns2gns.c:737
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:758
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:779
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:782
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:788
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:791
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:798
+#: src/gns/gnunet-dns2gns.c:804
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:213 src/gns/plugin_rest_gns.c:335
+#: src/gns/gnunet-gns.c:236 src/gns/plugin_rest_gns.c:347
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:231
+#: src/gns/gnunet-gns.c:254
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:312
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:460
+#: src/gns/gnunet-gns.c:374 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/plugin_rest_gns.c:472
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
@@ -4328,45 +4332,45 @@
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:390 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:826
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:403
+#: src/gns/gnunet-gns.c:429
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:479
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456
+#: src/gns/gnunet-gns.c:482
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:459
+#: src/gns/gnunet-gns.c:485
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:462
+#: src/gns/gnunet-gns.c:488
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:465
+#: src/gns/gnunet-gns.c:491
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:468
+#: src/gns/gnunet-gns.c:494
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:482
+#: src/gns/gnunet-gns.c:508
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
@@ -4384,19 +4388,19 @@
 msgid "Failed to connect to identity service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-import.c:483
+#: src/gns/gnunet-gns-import.c:482
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 #: 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/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:805
+#: src/hostlist/gnunet-daemon-hostlist_client.c:814
+#: src/hostlist/gnunet-daemon-hostlist_client.c:925
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1020
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1025
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
@@ -4463,7 +4467,7 @@
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:536
+#: src/gns/gnunet-gns-proxy.c:2218 src/rest/gnunet-rest-server.c:529
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -4487,29 +4491,29 @@
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3003
+#: src/gns/gnunet-gns-proxy.c:2999
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3043 src/gns/gnunet-service-gns.c:887
+#: src/gns/gnunet-gns-proxy.c:3039 src/gns/gnunet-service-gns.c:887
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3105
+#: src/gns/gnunet-gns-proxy.c:3101
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3146
+#: src/gns/gnunet-gns-proxy.c:3141
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3149
+#: src/gns/gnunet-gns-proxy.c:3144
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3163
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4607,11 +4611,11 @@
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_rest_gns.c:423
+#: src/gns/plugin_rest_gns.c:435
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:697
+#: src/gns/plugin_rest_gns.c:717
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -4762,28 +4766,28 @@
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:334
+#: src/hostlist/gnunet-daemon-hostlist.c:333
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:337
+#: src/hostlist/gnunet-daemon-hostlist.c:336
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:357
+#: src/hostlist/gnunet-daemon-hostlist.c:356
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4810,7 +4814,7 @@
 msgstr "# các HELLO tải xuống qua HTTP"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:655
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1386
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4819,7 +4823,7 @@
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:727
+#: src/hostlist/gnunet-daemon-hostlist_client.c:728
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4826,117 +4830,117 @@
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:866
+#: src/hostlist/gnunet-daemon-hostlist_client.c:856
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:880
+#: src/hostlist/gnunet-daemon-hostlist_client.c:870
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:900
+#: src/hostlist/gnunet-daemon-hostlist_client.c:890
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:906
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:914
+#: src/hostlist/gnunet-daemon-hostlist_client.c:904
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:967
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:975
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1111
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1666
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1092
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1120
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1101
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1183
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1199
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1156
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1359
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1332
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1337
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1346
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1410
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1383
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1429
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1463
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1487
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1504
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1477
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1472
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1599
-#: src/transport/plugin_transport_http_client.c:2282
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1572
+#: src/transport/plugin_transport_http_client.c:2273
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1601
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1641
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1614
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1652
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1625
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4955,7 +4959,7 @@
 #: 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
+#: src/topology/gnunet-daemon-topology.c:866
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -5016,44 +5020,49 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #: src/peerinfo-tool/gnunet-peerinfo.c:741
-#: src/transport/gnunet-service-transport.c:857
+#: src/transport/gnunet-service-transport.c:856
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#: src/hostlist/gnunet-daemon-hostlist_server.c:755
 #, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:782
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:798
+#: src/hostlist/gnunet-daemon-hostlist_server.c:795
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:811
+#: src/hostlist/gnunet-daemon-hostlist_server.c:808
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:832
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:852
+#: src/hostlist/gnunet-daemon-hostlist_server.c:849
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:892
+#: src/hostlist/gnunet-daemon-hostlist_server.c:889
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
@@ -5068,33 +5077,33 @@
 msgid "Failed to set default ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:325
+#: src/identity/gnunet-identity.c:324
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:328
+#: src/identity/gnunet-identity.c:327
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:331
+#: src/identity/gnunet-identity.c:330
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:334
+#: src/identity/gnunet-identity.c:333
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:337
+#: src/identity/gnunet-identity.c:336
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:340
+#: src/identity/gnunet-identity.c:339
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:349
+#: src/identity/gnunet-identity.c:348
 msgid "Maintain egos"
 msgstr ""
 
@@ -5145,7 +5154,7 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:923
+#: src/identity/plugin_rest_identity.c:938
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5158,7 +5167,7 @@
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1089
+#: src/identity-provider/plugin_rest_identity_provider.c:1126
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5198,16 +5207,16 @@
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1082
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1081
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:235
+#: src/namecache/gnunet-namecache.c:233
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:246 src/namestore/gnunet-namestore.c:1114
+#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1113
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5253,13 +5262,13 @@
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
 #: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:532
+#: src/namestore/plugin_rest_namestore.c:547
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
 #: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:541
+#: src/namestore/plugin_rest_namestore.c:556
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
@@ -5277,7 +5286,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:626
-#: src/namestore/plugin_rest_namestore.c:565
+#: src/namestore/plugin_rest_namestore.c:580
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
@@ -5289,9 +5298,9 @@
 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
+#: src/namestore/plugin_rest_namestore.c:954
+#: src/transport/gnunet-transport.c:1769
+#: src/transport/gnunet-transport-profiler.c:497
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
@@ -5303,7 +5312,7 @@
 
 #: src/namestore/gnunet-namestore.c:717
 #: src/namestore/gnunet-namestore-fcfsd.c:978
-#: src/namestore/plugin_rest_namestore.c:954
+#: src/namestore/plugin_rest_namestore.c:963
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -5321,14 +5330,14 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:743
-#: src/namestore/plugin_rest_namestore.c:635
+#: src/namestore/plugin_rest_namestore.c:650
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
 #: src/namestore/gnunet-namestore.c:763
-#: src/namestore/plugin_rest_namestore.c:653
-#: src/namestore/plugin_rest_namestore.c:693
+#: src/namestore/plugin_rest_namestore.c:668
+#: src/namestore/plugin_rest_namestore.c:708
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
@@ -5347,7 +5356,8 @@
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:866 src/peerinfo-tool/gnunet-peerinfo.c:820
+#: src/namestore/gnunet-namestore.c:866
+#: src/peerinfo-tool/gnunet-peerinfo.c:819
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -5358,84 +5368,84 @@
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
 #: src/namestore/gnunet-namestore.c:941
-#: src/namestore/plugin_rest_namestore.c:984
+#: src/namestore/plugin_rest_namestore.c:999
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:968
-#: src/namestore/plugin_rest_namestore.c:1011
+#: src/namestore/plugin_rest_namestore.c:1026
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1004
-#: src/namestore/plugin_rest_namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1066
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/namestore/gnunet-namestore.c:1016
-#: src/namestore/plugin_rest_namestore.c:1092
+#: src/namestore/gnunet-namestore.c:1015
+#: src/namestore/plugin_rest_namestore.c:1107
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1064
+#: src/namestore/gnunet-namestore.c:1063
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1066
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1070
+#: src/namestore/gnunet-namestore.c:1069
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1072
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1076
+#: src/namestore/gnunet-namestore.c:1075
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1079
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:1085
+#: src/namestore/gnunet-namestore.c:1084
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1088
+#: src/namestore/gnunet-namestore.c:1087
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1091
+#: src/namestore/gnunet-namestore.c:1090
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1094
+#: src/namestore/gnunet-namestore.c:1093
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1097
+#: src/namestore/gnunet-namestore.c:1096
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1100
+#: src/namestore/gnunet-namestore.c:1099
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1103
+#: src/namestore/gnunet-namestore.c:1102
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5495,7 +5505,7 @@
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
+#: src/namestore/gnunet-namestore-fcfsd.c:1018
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5513,7 +5523,7 @@
 msgid "flat file database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:1176
+#: src/namestore/plugin_rest_namestore.c:1187
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5531,92 +5541,92 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:392
+#: src/nat/nat_auto.c:388
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:393
+#: src/nat/nat_auto.c:389
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:412
+#: src/nat/nat_auto.c:408
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat/nat_auto.c:444
+#: src/nat/nat_auto.c:440
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:576
+#: src/nat/nat_auto.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:594
+#: src/nat/nat_auto.c:592
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat/nat_auto.c:666 src/nat/nat_test.c:360
+#: src/nat/nat_auto.c:662 src/nat/nat_test.c:360
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat/nat_auto.c:716
+#: src/nat/nat_auto.c:709
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:717
+#: src/nat/nat_auto.c:710
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:749
+#: src/nat/nat_auto.c:742
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:757 src/nat/nat_auto.c:805
+#: src/nat/nat_auto.c:750 src/nat/nat_auto.c:796
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:765 src/nat/nat_auto.c:813
+#: src/nat/nat_auto.c:758 src/nat/nat_auto.c:805
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:798
+#: src/nat/nat_auto.c:788
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1024
+#: src/nat/nat.c:1019
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1074
+#: src/nat/nat.c:1070
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1325
+#: src/nat/nat.c:1321
 msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/nat/nat.c:1400
+#: src/nat/nat.c:1396
 #, fuzzy, c-format
 msgid "Failed to run upnp client for port %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/nat/nat.c:1544
+#: src/nat/nat.c:1540
 msgid "malformed"
 msgstr ""
 
-#: src/nat/nat.c:1598
+#: src/nat/nat.c:1594
 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
+#: src/nat/nat.c:1723 src/nat/nat.c:1736
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
@@ -5623,99 +5633,99 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1895
+#: src/nat/nat.c:1891
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1911
+#: src/nat/nat.c:1907
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2002
+#: src/nat/nat.c:1998
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:2004
+#: src/nat/nat.c:2000
 msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/nat/nat.c:2006
+#: src/nat/nat.c:2002
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat.c:2008
+#: src/nat/nat.c:2004
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat.c:2010
+#: src/nat/nat.c:2006
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat.c:2012
+#: src/nat/nat.c:2008
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat.c:2014
+#: src/nat/nat.c:2010
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:2016
+#: src/nat/nat.c:2012
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat.c:2018
+#: src/nat/nat.c:2014
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat.c:2020
+#: src/nat/nat.c:2016
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat.c:2022
+#: src/nat/nat.c:2018
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:2024
+#: src/nat/nat.c:2020
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat.c:2026
+#: src/nat/nat.c:2022
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat.c:2028
+#: src/nat/nat.c:2024
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nat/nat.c:2030
+#: src/nat/nat.c:2026
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat.c:2032
+#: src/nat/nat.c:2028
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat.c:2034
+#: src/nat/nat.c:2030
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat.c:2036
+#: src/nat/nat.c:2032
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat.c:2038
+#: src/nat/nat.c:2034
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
+#: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:605
+#: src/nat/nat_mini.c:611
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5724,7 +5734,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:495
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -5743,59 +5753,59 @@
 msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/nse/gnunet-nse-profiler.c:840
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:860
+#: src/nse/gnunet-nse-profiler.c:843
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:869
+#: src/nse/gnunet-nse-profiler.c:852
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:875
+#: src/nse/gnunet-nse-profiler.c:858
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:867
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1533
-#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:261
+#: src/nse/gnunet-service-nse.c:1535
+#: src/revocation/gnunet-service-revocation.c:844 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:225
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
-#: src/peerinfo/gnunet-service-peerinfo.c:401
+#: src/peerinfo/gnunet-service-peerinfo.c:382
+#: src/peerinfo/gnunet-service-peerinfo.c:411
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:491
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:519
+#: src/peerinfo/gnunet-service-peerinfo.c:529
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5803,27 +5813,27 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:675
+#: src/peerinfo/gnunet-service-peerinfo.c:683
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:681
+#: src/peerinfo/gnunet-service-peerinfo.c:689
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1056
+#: src/peerinfo/gnunet-service-peerinfo.c:1061
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1375
+#: src/peerinfo/gnunet-service-peerinfo.c:1391
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1388
+#: src/peerinfo/gnunet-service-peerinfo.c:1404
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
@@ -5857,7 +5867,7 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:267
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -5907,45 +5917,45 @@
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:844
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:885
+#: src/peerinfo-tool/gnunet-peerinfo.c:884
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:888
+#: src/peerinfo-tool/gnunet-peerinfo.c:887
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:891
+#: src/peerinfo-tool/gnunet-peerinfo.c:890
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:894
+#: src/peerinfo-tool/gnunet-peerinfo.c:893
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:897
+#: src/peerinfo-tool/gnunet-peerinfo.c:896
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:903
+#: src/peerinfo-tool/gnunet-peerinfo.c:902
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:906
+#: src/peerinfo-tool/gnunet-peerinfo.c:905
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:920
+#: src/peerinfo-tool/gnunet-peerinfo.c:919
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -5968,29 +5978,29 @@
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:384
+#: src/peerstore/gnunet-service-peerstore.c:395
 #, fuzzy
 msgid "Malformed iterate request.\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/peerstore/gnunet-service-peerstore.c:391
+#: src/peerstore/gnunet-service-peerstore.c:402
 msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:451
+#: src/peerstore/gnunet-service-peerstore.c:462
 #, fuzzy
 msgid "Malformed store request from client\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:459
+#: src/peerstore/gnunet-service-peerstore.c:470
 msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:478
+#: src/peerstore/gnunet-service-peerstore.c:489
 #, fuzzy
 msgid "Failed to store requested value, database error."
 msgstr ""
@@ -5997,11 +6007,11 @@
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:557
+#: src/peerstore/gnunet-service-peerstore.c:568
 msgid "No database backend configured\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:568
+#: src/peerstore/gnunet-service-peerstore.c:579
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
@@ -6011,31 +6021,31 @@
 msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:374
+#: src/peerstore/peerstore_api.c:376
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:677
+#: src/peerstore/peerstore_api.c:679
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
 
-#: src/peerstore/peerstore_api.c:688
+#: src/peerstore/peerstore_api.c:690
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/peerstore/peerstore_api.c:707
+#: src/peerstore/peerstore_api.c:709
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:819
+#: src/peerstore/peerstore_api.c:821
 msgid ""
 "Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:831
+#: src/peerstore/peerstore_api.c:833
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
@@ -6090,63 +6100,63 @@
 msgid "Failed to get fragment!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:422
+#: src/psycstore/gnunet-service-psycstore.c:423
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:453
+#: src/psycstore/gnunet-service-psycstore.c:454
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:481
+#: src/psycstore/gnunet-service-psycstore.c:482
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:664
+#: src/psycstore/gnunet-service-psycstore.c:665
 #, fuzzy, c-format
 msgid "Failed to begin modifying state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:674
+#: src/psycstore/gnunet-service-psycstore.c:675
 #, fuzzy, c-format
 msgid "Failed to modify state: %d\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:682
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:713
+#: src/psycstore/gnunet-service-psycstore.c:714
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:727
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:744
+#: src/psycstore/gnunet-service-psycstore.c:745
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:764
-#: src/psycstore/gnunet-service-psycstore.c:783
+#: src/psycstore/gnunet-service-psycstore.c:765
+#: src/psycstore/gnunet-service-psycstore.c:784
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:806
-#: src/psycstore/gnunet-service-psycstore.c:857
+#: src/psycstore/gnunet-service-psycstore.c:807
+#: src/psycstore/gnunet-service-psycstore.c:858
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:833
-#: src/psycstore/gnunet-service-psycstore.c:872
+#: src/psycstore/gnunet-service-psycstore.c:834
+#: src/psycstore/gnunet-service-psycstore.c:873
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
@@ -6224,8 +6234,7 @@
 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:656
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -6234,78 +6243,73 @@
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1284
+#: src/regex/gnunet-regex-profiler.c:1301
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1295
-#, fuzzy
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/regex/gnunet-regex-profiler.c:1324
-#: src/regex/gnunet-regex-simulation-profiler.c:619
+#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1330
-#: src/regex/gnunet-regex-simulation-profiler.c:626
+#: src/regex/gnunet-regex-profiler.c:1348
+#: src/regex/gnunet-regex-simulation-profiler.c:646
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1337
+#: src/regex/gnunet-regex-profiler.c:1355
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1346
+#: src/regex/gnunet-regex-profiler.c:1364
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1366
+#: src/regex/gnunet-regex-profiler.c:1384
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1469
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1472
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1475
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1460
+#: src/regex/gnunet-regex-profiler.c:1478
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1463
+#: src/regex/gnunet-regex-profiler.c:1481
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1475
+#: src/regex/gnunet-regex-profiler.c:1493
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:686
+#: src/regex/gnunet-regex-simulation-profiler.c:704
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:702
+#: src/regex/gnunet-regex-simulation-profiler.c:720
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -6314,116 +6318,116 @@
 msgid "Regex `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:792
+#: src/rest/gnunet-rest-server.c:784
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:809
+#: src/rest/gnunet-rest-server.c:801
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/revocation/gnunet-revocation.c:124
+#: src/revocation/gnunet-revocation.c:129
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/revocation/gnunet-revocation.c:129
+#: src/revocation/gnunet-revocation.c:134
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:140
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Lỗi VR."
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:166
+#: src/revocation/gnunet-revocation.c:171
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/revocation/gnunet-revocation.c:171
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:176
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:181
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:292
+#: src/revocation/gnunet-revocation.c:320
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:322
+#: src/revocation/gnunet-revocation.c:350
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/revocation/gnunet-revocation.c:343
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:363
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:373
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:405
+#: src/revocation/gnunet-revocation.c:435
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:448
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:439
+#: src/revocation/gnunet-revocation.c:468
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:461
+#: src/revocation/gnunet-revocation.c:489
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:486
+#: src/revocation/gnunet-revocation.c:514
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
 
-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:530
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:533
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:536
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
+#: src/revocation/gnunet-revocation.c:539
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
@@ -6462,7 +6466,7 @@
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps.c:185
+#: src/rps/gnunet-rps.c:177
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6501,29 +6505,29 @@
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:348
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:352
+#: src/scalarproduct/gnunet-scalarproduct.c:351
 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:355
+#: src/scalarproduct/gnunet-scalarproduct.c:354
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1417
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1547
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1546
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1192
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1250
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1249
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -6532,23 +6536,23 @@
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:611
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:617
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2015
+#: src/set/gnunet-service-set.c:2008
 #, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6575,10 +6579,136 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:383
+#: src/set/gnunet-set-profiler.c:386
 msgid "operation to execute"
 msgstr ""
 
+#: src/social/gnunet-social.c:1138
+#, fuzzy
+msgid "--place missing or invalid.\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/social/gnunet-social.c:1180
+msgid "assign --name in state to --data"
+msgstr ""
+
+#: src/social/gnunet-social.c:1184
+msgid "say good-bye and leave somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1188
+msgid "create a place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1192
+msgid "destroy a place we were hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1196
+msgid "enter somebody else's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1200
+msgid "find state matching name prefix"
+msgstr ""
+
+#: src/social/gnunet-social.c:1204
+msgid "replay history of messages up to the given --limit"
+msgstr ""
+
+#: src/social/gnunet-social.c:1208
+msgid "reconnect to a previously created place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1212
+msgid "publish something to a place we are hosting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1216
+msgid "reconnect to a previously entered place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1220
+msgid "search for state matching exact name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1224
+msgid "submit something to somebody's place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1228
+msgid "list of egos and subscribed places"
+msgstr ""
+
+#: src/social/gnunet-social.c:1232
+msgid "extract and replay history between message IDs --start and --until"
+msgstr ""
+
+#: src/social/gnunet-social.c:1239
+msgid "application ID to use when connecting"
+msgstr ""
+
+#: src/social/gnunet-social.c:1243
+msgid "message body or state value"
+msgstr ""
+
+#: src/social/gnunet-social.c:1247
+#, fuzzy
+msgid "name or public key of ego"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/social/gnunet-social.c:1251
+#, fuzzy
+msgid "wait for incoming messages"
+msgstr "Lỗi gửi tin nhẳn.\n"
+
+#: src/social/gnunet-social.c:1255
+msgid "GNS name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1259
+msgid "peer ID for --guest-enter"
+msgstr ""
+
+#: src/social/gnunet-social.c:1263
+msgid "name (key) to query from state"
+msgstr ""
+
+#: src/social/gnunet-social.c:1267
+msgid "method name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1271
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "số tin nhắn cần dùng mỗi lần lặp"
+
+#: src/social/gnunet-social.c:1275
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1279
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1283
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1287
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1291
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1301
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:323
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -6599,11 +6729,11 @@
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:194
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:200
 msgid "Missing argument: name\n"
 msgstr ""
 
@@ -6612,7 +6742,7 @@
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:240
+#: src/statistics/gnunet-statistics.c:241
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -6724,7 +6854,7 @@
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/testbed/generate-underlay-topology.c:338
-#: src/testbed/gnunet-testbed-profiler.c:291
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
@@ -6752,61 +6882,61 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:322
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:269
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:248
 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/testbed/gnunet-daemon-testbed-underlay.c:230 src/testing/list-keys.c:50
 #: 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:475
+#: src/testbed/gnunet-daemon-testbed-underlay.c:468
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:732
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/testbed/gnunet-service-testbed_peers.c:1021
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1057
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
 msgstr "Đang đợi các đồng đẳng kết nối"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:248
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:297
+#: src/testbed/gnunet-testbed-profiler.c:287
 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 "
@@ -6838,11 +6968,11 @@
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:987
+#: src/testbed/testbed_api_testbed.c:986
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
@@ -6941,21 +7071,21 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:354
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: src/testing/gnunet-testing.c:356
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -6962,16 +7092,16 @@
 "extract"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:358
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:360
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:373
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -7059,22 +7189,22 @@
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:634
+#: src/topology/gnunet-daemon-topology.c:730
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:931
+#: src/topology/gnunet-daemon-topology.c:927
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:964
+#: src/topology/gnunet-daemon-topology.c:960
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:971
+#: src/topology/gnunet-daemon-topology.c:967
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
@@ -7081,11 +7211,11 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:989
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:992
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
@@ -7092,7 +7222,7 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1003
+#: src/topology/gnunet-daemon-topology.c:999
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7099,23 +7229,23 @@
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1005
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1043
+#: src/topology/gnunet-daemon-topology.c:1039
 #: src/transport/plugin_transport_wlan.c:1491
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1288
+#: src/topology/gnunet-daemon-topology.c:1283
 msgid "GNUnet topology control"
 msgstr ""
 
@@ -7356,40 +7486,40 @@
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3357
+#: src/transport/gnunet-service-transport_neighbours.c:3353
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3393
+#: src/transport/gnunet-service-transport_neighbours.c:3389
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3481
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3488
+#: src/transport/gnunet-service-transport_neighbours.c:3484
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3528
+#: src/transport/gnunet-service-transport_neighbours.c:3524
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3535
+#: src/transport/gnunet-service-transport_neighbours.c:3531
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3546
+#: src/transport/gnunet-service-transport_neighbours.c:3542
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3680
+#: src/transport/gnunet-service-transport_neighbours.c:3676
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -7424,8 +7554,8 @@
 
 #: 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
+#: src/transport/gnunet-service-transport_validation.c:949
+#: src/transport/gnunet-service-transport_validation.c:1551
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
@@ -7451,30 +7581,30 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1076
+#: src/transport/gnunet-service-transport_validation.c:1075
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:1127
+#: src/transport/gnunet-service-transport_validation.c:1126
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1140
+#: src/transport/gnunet-service-transport_validation.c:1139
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1143
+#: src/transport/gnunet-service-transport_validation.c:1142
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1151
+#: src/transport/gnunet-service-transport_validation.c:1150
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1163
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
@@ -7481,28 +7611,28 @@
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1219
+#: src/transport/gnunet-service-transport_validation.c:1218
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1269
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1279
+#: src/transport/gnunet-service-transport_validation.c:1278
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1442
+#: src/transport/gnunet-service-transport_validation.c:1441
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1460
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1515
+#: src/transport/gnunet-service-transport_validation.c:1514
 msgid "# validations succeeded"
 msgstr ""
 
@@ -7512,7 +7642,7 @@
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
 #: src/transport/gnunet-transport.c:567
-#: src/transport/gnunet-transport-profiler.c:282
+#: src/transport/gnunet-transport-profiler.c:277
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
@@ -7522,42 +7652,42 @@
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:621
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:635
+#: src/transport/gnunet-transport.c:633
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:662 src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:658 src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:667
+#: src/transport/gnunet-transport.c:663
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:672
+#: src/transport/gnunet-transport.c:668
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/transport/gnunet-transport.c:677
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:682
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:807
+#: src/transport/gnunet-transport.c:803
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
@@ -7566,36 +7696,36 @@
 "\t%s%s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:842
+#: src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:936 src/transport/gnunet-transport.c:1690
+#: src/transport/gnunet-transport.c:927 src/transport/gnunet-transport.c:1673
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:982
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:996
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1021
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:1078
+#: src/transport/gnunet-transport.c:1067
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:1107
+#: src/transport/gnunet-transport.c:1096
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7602,44 +7732,44 @@
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1144
-#: src/transport/gnunet-transport-profiler.c:439
+#: src/transport/gnunet-transport.c:1133
+#: src/transport/gnunet-transport-profiler.c:432
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1169 src/transport/gnunet-transport.c:1195
+#: src/transport/gnunet-transport.c:1158 src/transport/gnunet-transport.c:1184
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1171
+#: src/transport/gnunet-transport.c:1160
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1197
+#: src/transport/gnunet-transport.c:1186
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1221
-#: src/transport/gnunet-transport-profiler.c:464
+#: src/transport/gnunet-transport.c:1210
+#: src/transport/gnunet-transport-profiler.c:457
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:1261
+#: src/transport/gnunet-transport.c:1250
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1262
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1809
+#: src/transport/gnunet-transport.c:1792
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7646,119 +7776,119 @@
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1817
+#: src/transport/gnunet-transport.c:1800
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1840
+#: src/transport/gnunet-transport.c:1823
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1846
+#: src/transport/gnunet-transport.c:1829
 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
+#: src/transport/gnunet-transport.c:1848 src/transport/gnunet-transport.c:1867
+#: src/transport/gnunet-transport.c:1925
+#: src/transport/gnunet-transport-profiler.c:553
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1889
+#: src/transport/gnunet-transport.c:1872
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:1972
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1993
+#: src/transport/gnunet-transport.c:1975
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1996
+#: src/transport/gnunet-transport.c:1978
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport.c:1981
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:2002
+#: src/transport/gnunet-transport.c:1984
 #, fuzzy
 msgid "print information for all pending validations continuously"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:2005
+#: src/transport/gnunet-transport.c:1987
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:2011
+#: src/transport/gnunet-transport.c:1993
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:2014
+#: src/transport/gnunet-transport.c:1996
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:2017
-#: src/transport/gnunet-transport-profiler.c:626
+#: src/transport/gnunet-transport.c:1999
+#: src/transport/gnunet-transport-profiler.c:618
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2020
+#: src/transport/gnunet-transport.c:2002
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2023
+#: src/transport/gnunet-transport.c:2005
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2026
+#: src/transport/gnunet-transport.c:2008
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:2037
-#: src/transport/gnunet-transport-profiler.c:637
+#: src/transport/gnunet-transport.c:2019
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:226
+#: src/transport/gnunet-transport-profiler.c:221
 #, c-format
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:262
+#: src/transport/gnunet-transport-profiler.c:257
 #, c-format
 msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:271
+#: src/transport/gnunet-transport-profiler.c:266
 #, c-format
 msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:288
+#: src/transport/gnunet-transport-profiler.c:283
 msgid "\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:341
+#: src/transport/gnunet-transport-profiler.c:336
 msgid "."
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:361
+#: src/transport/gnunet-transport-profiler.c:356
 #, c-format
 msgid ""
 "\n"
@@ -7765,106 +7895,106 @@
 "Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:411
+#: src/transport/gnunet-transport-profiler.c:404
 #, fuzzy, c-format
 msgid "Connected to different peer `%s'\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport-profiler.c:418
+#: src/transport/gnunet-transport-profiler.c:411
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport-profiler.c:480
+#: src/transport/gnunet-transport-profiler.c:473
 #, fuzzy, c-format
 msgid "Denying connection to `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/transport/gnunet-transport-profiler.c:510
+#: src/transport/gnunet-transport-profiler.c:503
 #, fuzzy
 msgid "Message size too big!\n"
 msgstr "kích cỡ tin nhắn"
 
-#: src/transport/gnunet-transport-profiler.c:516
+#: src/transport/gnunet-transport-profiler.c:509
 #, fuzzy
 msgid "No peer identity given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/transport/gnunet-transport-profiler.c:531
+#: src/transport/gnunet-transport-profiler.c:524
 #, fuzzy, c-format
 msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr "Sử dụng %u thông báo với kích cỡ %u trong %u lần.\n"
 
-#: src/transport/gnunet-transport-profiler.c:537
+#: src/transport/gnunet-transport-profiler.c:530
 #, fuzzy, c-format
 msgid "Trying to receive messages from peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-transport-profiler.c:542
+#: src/transport/gnunet-transport-profiler.c:535
 #, fuzzy
 msgid "No operation given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/transport/gnunet-transport-profiler.c:549
+#: src/transport/gnunet-transport-profiler.c:542
 #, fuzzy
 msgid "Failed to connect to ATS service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport-profiler.c:611
+#: src/transport/gnunet-transport-profiler.c:603
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:614
+#: src/transport/gnunet-transport-profiler.c:606
 #, fuzzy
 msgid "receive data from peer"
 msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
 
-#: src/transport/gnunet-transport-profiler.c:617
+#: src/transport/gnunet-transport-profiler.c:609
 #, fuzzy
 msgid "iterations"
 msgstr "Tùy chọn chung"
 
-#: src/transport/gnunet-transport-profiler.c:620
+#: src/transport/gnunet-transport-profiler.c:612
 #, fuzzy
 msgid "number of messages to send"
 msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
-#: src/transport/gnunet-transport-profiler.c:623
+#: src/transport/gnunet-transport-profiler.c:615
 #, fuzzy
 msgid "message size to use"
 msgstr "kích cỡ tin nhắn"
 
-#: 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_http_client.c:1473
+#: src/transport/plugin_transport_http_server.c:2237
+#: src/transport/plugin_transport_http_server.c:3427
 #: 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
+#: src/transport/plugin_transport_http_client.c:2114
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2172
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_client.c:2163
+#: src/transport/plugin_transport_http_server.c:3142
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
-#: src/transport/plugin_transport_http_server.c:3218
+#: src/transport/plugin_transport_http_client.c:2180
+#: src/transport/plugin_transport_http_server.c:3212
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:2223
+#: src/transport/plugin_transport_http_client.c:2214
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:1733
+#: src/transport/plugin_transport_http_server.c:1721
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7871,72 +8001,72 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1955
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1973
+#: src/transport/plugin_transport_http_server.c:1963
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2123
+#: src/transport/plugin_transport_http_server.c:2113
 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:2146
+#: src/transport/plugin_transport_http_server.c:2136
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2273
+#: src/transport/plugin_transport_http_server.c:2263
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2582
+#: src/transport/plugin_transport_http_server.c:2572
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http_server.c:2616 src/util/service.c:704
+#: src/transport/plugin_transport_http_server.c:2606 src/util/service.c:704
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2634 src/util/service.c:723
+#: src/transport/plugin_transport_http_server.c:2624 src/util/service.c:723
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2747
+#: src/transport/plugin_transport_http_server.c:2737
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
-#: src/transport/plugin_transport_udp.c:3604
+#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_udp.c:3600
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2924
+#: src/transport/plugin_transport_http_server.c:2918
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2939
+#: src/transport/plugin_transport_http_server.c:2933
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2945
+#: src/transport/plugin_transport_http_server.c:2939
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2956
+#: src/transport/plugin_transport_http_server.c:2950
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -7943,47 +8073,47 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http_server.c:2962
+#: src/transport/plugin_transport_http_server.c:2956
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2970
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2986
+#: src/transport/plugin_transport_http_server.c:2980
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:3008
+#: src/transport/plugin_transport_http_server.c:3002
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3018
+#: src/transport/plugin_transport_http_server.c:3012
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:3081
+#: src/transport/plugin_transport_http_server.c:3075
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http_server.c:3102
+#: src/transport/plugin_transport_http_server.c:3096
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_http_server.c:3119
+#: src/transport/plugin_transport_http_server.c:3113
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:3445
+#: src/transport/plugin_transport_http_server.c:3439
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -8166,52 +8296,52 @@
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3680
-#: src/transport/plugin_transport_udp.c:3779
+#: src/transport/plugin_transport_udp.c:3676
+#: src/transport/plugin_transport_udp.c:3775
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3698
+#: src/transport/plugin_transport_udp.c:3694
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3789
+#: src/transport/plugin_transport_udp.c:3785
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3861
-#: src/transport/plugin_transport_udp.c:3875
+#: src/transport/plugin_transport_udp.c:3857
+#: src/transport/plugin_transport_udp.c:3871
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3907
+#: src/transport/plugin_transport_udp.c:3903
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3934
+#: src/transport/plugin_transport_udp.c:3930
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:4000
+#: src/transport/plugin_transport_udp.c:3996
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1407
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1420
+#: src/transport/plugin_transport_unix.c:1416
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
 msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1820
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -8288,7 +8418,7 @@
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/transport/transport-testing.c:680
+#: src/transport/transport-testing.c:676
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -8327,12 +8457,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:264 src/util/client.c:890 src/util/service.c:621
+#: src/util/client.c:264 src/util/client.c:892 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:895 src/util/service.c:625
+#: src/util/client.c:268 src/util/client.c:897 src/util/service.c:625
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -8349,12 +8479,12 @@
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1040
+#: src/util/client.c:1042
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/client.c:1052
+#: src/util/client.c:1054
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -8440,12 +8570,12 @@
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:429
+#: src/util/connection.c:441
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:446
+#: src/util/connection.c:458
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
@@ -8517,12 +8647,12 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:1228
+#: src/util/disk.c:1227
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1451 src/util/service.c:1327
+#: src/util/disk.c:1450 src/util/service.c:1322
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
@@ -8606,43 +8736,52 @@
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/gnunet-config.c:111
+#: src/util/gnunet-config.c:124
 #, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/util/gnunet-config.c:137
+#, fuzzy, c-format
 msgid "--section argument is required\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/util/gnunet-config.c:113
+#: src/util/gnunet-config.c:140
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:157
+#: src/util/gnunet-config.c:191
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:184
+#: src/util/gnunet-config.c:228
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:187
+#: src/util/gnunet-config.c:231
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:190
+#: src/util/gnunet-config.c:234
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:193
+#: src/util/gnunet-config.c:237
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:196
+#: src/util/gnunet-config.c:240
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/util/gnunet-config.c:205
+#: src/util/gnunet-config.c:243
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:252
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8735,28 +8874,28 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:234
+#: src/util/gnunet-scrypt.c:242
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:295
+#: src/util/gnunet-scrypt.c:314
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:298
+#: src/util/gnunet-scrypt.c:317
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:301
+#: src/util/gnunet-scrypt.c:320
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:304
+#: src/util/gnunet-scrypt.c:323
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:336
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8772,41 +8911,41 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/gnunet-uri.c:83
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:88
+#: src/util/gnunet-uri.c:91
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:105
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:167
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:340
+#: src/util/helper.c:331
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:386
+#: src/util/helper.c:382
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:616
+#: src/util/helper.c:601
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -8822,7 +8961,7 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:500
+#: src/util/os_installation.c:501
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8829,17 +8968,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:860
+#: src/util/os_installation.c:861
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:920
+#: src/util/os_installation.c:921
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/os_installation.c:930
+#: src/util/os_installation.c:931
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8864,17 +9003,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:248 src/util/service.c:1461
+#: src/util/program.c:244 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:260 src/util/service.c:1476
+#: src/util/program.c:256 src/util/service.c:1471
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/program.c:265 src/util/service.c:1471
+#: src/util/program.c:261 src/util/service.c:1466
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8902,32 +9041,32 @@
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:952
+#: src/util/resolver_api.c:950
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1028 src/util/resolver_api.c:1049
-#: src/util/resolver_api.c:1063
+#: src/util/resolver_api.c:1026 src/util/resolver_api.c:1047
+#: src/util/resolver_api.c:1061
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/server.c:483
+#: src/util/server.c:478
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:493
+#: src/util/server.c:488
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:499
+#: src/util/server.c:494
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:902
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8986,38 +9125,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1174
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1216
+#: src/util/service.c:1211
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1265
+#: src/util/service.c:1260
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1269
+#: src/util/service.c:1264
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1273
+#: src/util/service.c:1268
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1328
+#: src/util/service.c:1323
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1341
+#: src/util/service.c:1336
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1411
+#: src/util/service.c:1406
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -9026,12 +9165,12 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/socks.c:597
+#: src/util/socks.c:586
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:610
+#: src/util/socks.c:599
 #, c-format
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
 msgstr ""
@@ -9278,86 +9417,91 @@
 msgid "Error creating tunnel\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:204
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:216
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:236
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:256
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-vpn.c:290
+#: src/vpn/gnunet-vpn.c:291
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:294
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:297
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:300
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:303
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:306
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:309
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:312
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:324
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:647
-#: src/include/gnunet_common.h:655
+#: src/include/gnunet_common.h:641 src/include/gnunet_common.h:648
+#: src/include/gnunet_common.h:656
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:667
+#: src/include/gnunet_common.h:668
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:694 src/include/gnunet_common.h:703
+#: src/include/gnunet_common.h:695 src/include/gnunet_common.h:704
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
 #~ msgid "timeout in MSECS milliseconds for completing current operation"
 #~ msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
@@ -9374,10 +9518,6 @@
 #~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #, fuzzy
-#~ msgid "Missing or invalid topology file.\n"
-#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#, fuzzy
 #~ msgid "Number of peers to run"
 #~ msgstr "số lần lặp lại"
 
@@ -9641,10 +9781,6 @@
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
 #, fuzzy
-#~ msgid "Invalid value for public key\n"
-#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#, fuzzy
 #~ msgid "Cannot read experiments file `%s'\n"
 #~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
@@ -10774,10 +10910,6 @@
 #~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
 #, fuzzy
-#~ msgid "Phase 3: sending messages\n"
-#~ msgstr "Lỗi gửi tin nhẳn.\n"
-
-#, fuzzy
 #~ msgid "Loading HTTPS transport plugin `%s'\n"
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2016-05-19 13:08:53 UTC (rev 37184)
+++ gnunet/po/zh_CN.po  2016-05-19 13:15:51 UTC (rev 37185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2016-04-18 17:19+0200\n"
+"POT-Creation-Date: 2016-05-19 13:54+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:336
+#: src/arm/arm_api.c:338
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,231 +25,231 @@
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:215 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:217
+#: src/arm/gnunet-arm.c:227
 #, fuzzy
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:229 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:231 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:223
+#: src/arm/gnunet-arm.c:233
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1021
+#: src/arm/gnunet-arm.c:235 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1023
+#: src/arm/gnunet-arm.c:237 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:243 src/testbed/gnunet-service-testbed_peers.c:1039
+#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:245 src/testbed/gnunet-service-testbed_peers.c:1041
+#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247 src/testbed/gnunet-service-testbed_peers.c:1043
+#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249 src/testbed/gnunet-service-testbed_peers.c:1045
+#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:251 src/testbed/gnunet-service-testbed_peers.c:1047
+#: src/arm/gnunet-arm.c:261 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253 src/testbed/gnunet-service-testbed_peers.c:1049
+#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:255 src/testbed/gnunet-service-testbed_peers.c:1051
+#: src/arm/gnunet-arm.c:265 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/testbed/gnunet-service-testbed_peers.c:1053
+#: src/arm/gnunet-arm.c:267 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:259 src/testbed/gnunet-service-testbed_peers.c:1055
+#: src/arm/gnunet-arm.c:269 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:261
+#: src/arm/gnunet-arm.c:271
 #, c-format
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/arm/gnunet-arm.c:273 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:305
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:335 src/arm/gnunet-arm.c:344
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:380
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:391
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:434
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:444
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:466
+#: src/arm/gnunet-arm.c:482
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:477
+#: src/arm/gnunet-arm.c:493
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:515
+#: src/arm/gnunet-arm.c:533
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:542
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:547
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:633
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:665
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:671
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:682
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:745
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:747
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:749
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:751
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:754
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:757
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:760
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:762
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
+#: src/arm/gnunet-arm.c:765
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:767
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:769
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:771
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:782
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -262,65 +262,65 @@
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:581
+#: src/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:592
+#: src/arm/gnunet-service-arm.c:566
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:693
+#: src/arm/gnunet-service-arm.c:663
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:717
+#: src/arm/gnunet-service-arm.c:687
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:753
+#: src/arm/gnunet-service-arm.c:723
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:863
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1160
+#: src/arm/gnunet-service-arm.c:1145
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1324
+#: src/arm/gnunet-service-arm.c:1299
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1329
+#: src/arm/gnunet-service-arm.c:1304
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1334
+#: src/arm/gnunet-service-arm.c:1309
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1340
+#: src/arm/gnunet-service-arm.c:1315
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1367
+#: src/arm/gnunet-service-arm.c:1342
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1384
+#: src/arm/gnunet-service-arm.c:1358
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -350,11 +350,13 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:921
+#: 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:3296 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 ""
@@ -376,7 +378,7 @@
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:305
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -383,18 +385,18 @@
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:315
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:360
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:452
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -498,11 +500,11 @@
 msgid "Initialization failed, shutdown\n"
 msgstr "插件机构初始化失败:%s!\n"
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats-tests/ats-testing-log.c:836
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:888
+#: src/ats-tests/ats-testing-log.c:887
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
@@ -550,8 +552,8 @@
 msgstr ""
 
 #: 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
+#: src/transport/gnunet-transport.c:1780
+#: src/transport/gnunet-transport-profiler.c:516
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -561,13 +563,13 @@
 msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:821
-#: src/ats-tool/gnunet-ats.c:850 src/ats-tool/gnunet-ats.c:896
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
 #, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:833
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
 #, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -637,68 +639,68 @@
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:458
+#: src/cadet/gnunet-cadet.c:476
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:736
+#: src/cadet/gnunet-cadet.c:751
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:780
+#: src/cadet/gnunet-cadet.c:789
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:844
+#: src/cadet/gnunet-cadet.c:857
 msgid "You must NOT give a TARGET when using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:952
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:955
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:958
 msgid "dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:953
+#: src/cadet/gnunet-cadet.c:964
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:967
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:959
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:973
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:965
+#: src/cadet/gnunet-cadet.c:976
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:561
+#: src/cadet/gnunet-service-cadet_peer.c:562
 msgid "Wrong CORE service\n"
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:496
-#: src/secretsharing/gnunet-secretsharing-profiler.c:608
+#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
@@ -709,8 +711,8 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:502
-#: src/set/gnunet-set-profiler.c:374 src/set/gnunet-set-profiler.c:377
-#: src/set/gnune