33 files changed, 10667 insertions, 10480 deletions
diff --git a/doc/man/gnunet-datastore.1 b/doc/man/gnunet-datastore.1
index 14372a49b..1605006b3 100644
--- a/doc/man/gnunet-datastore.1
+++ b/doc/man/gnunet-datastore.1
@@ -1,6 +1,6 @@
-.TH gnunet\-datastore "1" "30 May 2013" "GNUnet"
+.TH gnunet\-datastore "1" "13 April 2017" "GNUnet"
 .SH NAME
-gnunet\-datastore \- merge or convert GNUnet datastore databases
+gnunet\-datastore \- dump or insert (restore) GNUnet datastore databases
 .SH SYNOPSIS
 .B gnunet\-datastore
@@ -8,26 +8,32 @@ gnunet\-datastore \- merge or convert GNUnet datastore databases
 .SH DESCRIPTION
 .PP
-gnunet\-datastore can be used to convert or merge GNUnet datastores.  This is useful if a datastore is to be migrated between SQL databases, i.e. from sqlite to postgres or vice versa.  gnunet\-datastore basically takes two configuration files (which must specify different databases) and reads in all of the data from the datasource (\-s option) and copies it to the destination (\-c option).  Note that replication level information is lost in the process at this time.
+gnunet\-datastore can be used to backup and restore or merge GNUnet datastores.  This is useful if a datastore is to be migrated between SQL databases, i.e. from sqlite to postgres or vice versa.  gnunet\-datastore will dump the entire contents of the database or insert a dump file into the database.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
-configuration file to use for the destination database
+configuration file to use
+.TP
+\fB\-d\fR, \fB\-\-dump\fR
+dump all records to a file
+.TP
+\fB\-f \fIFILENAME\fR, \fB\-\-file=FILENAME\fR
+file to dump to or insert from.  Otherwise stdin/stdout are used.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page
 .TP
+\fB\-i\fR, \fB\-\-insert\fR
+insert from dump file
+.TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
 Change the loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
 .TP
-\fB\-s \fIFILENAME\fR, \fB\-\-sourcecfg=FILENAME\fR
+\fB\-l \fIFILENAME\fR, \fB\-\-logfile=FILENAME\fR
-configuration file to use for the source database
+configure logging to write logs to FILENAME
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
-be verbose
 .SH NOTES
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 47784cc90..82208bb67 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -479,10 +479,7 @@ src/util/plugin.c
 src/util/program.c
 src/util/resolver_api.c
 src/util/scheduler.c
-src/util/server_mst.c
+src/util/service.c
-src/util/server_nc.c
-src/util/server_tc.c
-src/util/service_new.c
 src/util/signal.c
 src/util/socks.c
 src/util/speedup.c
diff --git a/po/de.po b/po/de.po
index bcaabb164..fde327308 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -35,330 +35,316 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 msgid "Message was sent successfully"
 msgstr ""
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr ""
-"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
-"ausführen!\n"
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr "ARM-API ist belegt"
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-msgid "Request timed out"
-msgstr "Zeitüberschreitung der Anfrage"
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
 msgstr "%s wurde gestoppt"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, c-format
+#, fuzzy
-msgid "%s is starting"
+msgid "is starting"
 msgstr "%s startet"
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+#, fuzzy
-msgid "%s is stopping"
+msgid "is stopping"
 msgstr "%s wird gestoppt"
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, c-format
+#, fuzzy
-msgid "%s is starting already"
+msgid "is starting already"
 msgstr "%s ist bereits gestartet"
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+#, fuzzy
-msgid "%s is stopping already"
+msgid "is stopping already"
 msgstr "%s wird bereits gestoppt"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+#, fuzzy
-msgid "%s is started already"
+msgid "is started already"
 msgstr "%s ist bereits gestartet"
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+#, fuzzy
-msgid "%s is stopped already"
+msgid "is stopped already"
 msgstr "%s ist bereits gestoppt"
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, c-format
+msgid "service is not known to ARM"
-msgid "%s service is not known to ARM"
 msgstr ""
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
-#: src/arm/gnunet-arm.c:266
+#: src/arm/gnunet-arm.c:260
-#, c-format
+msgid "service cannot be manipulated because ARM is shutting down"
-msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
-msgstr ""
+msgstr "Unbekannter Anfragestatus"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, 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:371
+#: src/arm/gnunet-arm.c:365
 #, 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:382
+#: src/arm/gnunet-arm.c:376
 #, 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:422
+#: src/arm/gnunet-arm.c:415
 #, 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:432
+#: src/arm/gnunet-arm.c:425
 #, 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:469
+#: src/arm/gnunet-arm.c:462
 #, 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:480
+#: src/arm/gnunet-arm.c:473
 #, 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:521
+#: src/arm/gnunet-arm.c:513
 #, 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:530
+#: src/arm/gnunet-arm.c:522
 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:536
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, 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:943
+#: src/arm/gnunet-service-arm.c:944
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, 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:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr "Signal"
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 msgid "unknown"
 msgstr "Unbekannt"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, 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:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, 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:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -388,30 +374,26 @@ msgid ""
 "%llu\n"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3293
+#: src/ats/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
-msgid "experiment to use"
-msgstr ""
 #: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 msgid "print logging"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -518,7 +500,7 @@ msgstr "Protokollierung stoppen\n"
 msgid "Start logging `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -561,7 +543,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
@@ -593,192 +574,193 @@ msgstr "Kein Knoten angegeben!\n"
 msgid "Valid type required\n"
 msgstr "Gültiger Typ ist erforderlich\n"
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr "Liste aller derzeit genutzten aktiven Adressen holen"
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr "Liste aller aktiven Adressen holen"
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Mit einem Knoten verbinden"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 msgid "do not resolve IP addresses to hostnames"
 msgstr "IP-Adressen nicht zu Rechnernamen auflösen"
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr "Überwachungsmodus"
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 msgid "set preference for the given peer"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr "Knoten-ID"
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 msgid "public auction outcome"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "Hilfetext"
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 #, fuzzy
 msgid "No action requested\n"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
-msgid "provide information about a particular connection"
+#, fuzzy
-msgstr ""
+msgid "Provide information about a particular connection"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:933
-msgid "activate echo mode"
+msgid "Activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:938
-msgid "dump debug information to STDERR"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:938
+#: src/cadet/gnunet-cadet.c:944
-msgid "port to listen to"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
-msgid "provide information about a particular tunnel"
-msgstr ""
-#: src/cadet/gnunet-cadet.c:950
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/cadet/gnunet-service-cadet_peer.c:687
+#: src/cadet/gnunet-cadet.c:969
-msgid "Wrong CORE service\n"
+#, fuzzy
-msgstr ""
+msgid "Provide information about all tunnels"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/consensus/gnunet-consensus-profiler.c:499
+#: src/consensus/gnunet-consensus-profiler.c:523
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 msgid "number of values"
 msgstr "Anzahl der Werte"
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
@@ -1032,15 +1014,15 @@ msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1066,8 +1048,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -1077,60 +1059,60 @@ msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() fehlgeschlagen: %s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 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:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/conversation/gnunet-helper-audio-playback.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: 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:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, 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:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: 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:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: 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:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: 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:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: 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:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %s\n"
@@ -1192,7 +1174,7 @@ msgstr "ogg_stream_init() fehlgeschlagen.\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 msgid "Could not start record audio helper\n"
 msgstr ""
@@ -1263,37 +1245,42 @@ msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 msgid "provide information about all current connections (continuously)"
 msgstr ""
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 msgid "# messages discarded (session disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, fuzzy, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr "# Bytes Rauschen empfangen"
+#: src/core/gnunet-service-core.c:985
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
@@ -1306,143 +1293,143 @@ msgstr "# Bytes verschlüsselt"
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1158
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 msgid "# sessions terminated by timeout"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 msgid "# DATA message dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "# sessions terminated by key expiration"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
-#: src/core/gnunet-service-core_kx.c:1681
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1477,7 +1464,7 @@ msgid "# updates to my type map"
 msgstr ""
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
@@ -1517,17 +1504,17 @@ msgstr "# Klartext PONG Nachrichten empfangen"
 msgid "Heap datacache running\n"
 msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1540,72 +1527,72 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "# verbundener Freunde"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "# verbundener Knoten"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING Nachrichten erstellt"
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 msgid "# status messages received"
 msgstr "# empfangene Statusmeldungen"
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr "# empfangene Ergebnisse"
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 msgid "# datastore connections (re)created"
 msgstr ""
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
@@ -1614,214 +1601,214 @@ msgstr "# ausgeführte GET-Anfragen"
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Objekt konnte nicht gespeichert werden: %s, Abbruch\n"
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "sqlite Datenspeicher"
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr "# abgelaufene Bytes"
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr "# gefundene Ergebnisse"
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, 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:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr "# Kontingent"
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, 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:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr "PostgreSQL-Datenbank läuft\n"
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1829,38 +1816,33 @@ msgstr "PostgreSQL-Datenbank läuft\n"
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
-#: src/datastore/plugin_datastore_sqlite.c:692
+#: src/datastore/plugin_datastore_sqlite.c:1234
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
-#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
@@ -1883,44 +1865,41 @@ msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 msgid "Issueing DHT GET with key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
@@ -1930,43 +1909,43 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
@@ -1982,92 +1961,82 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
-#: src/dht/gnunet-service-dht_clients.c:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 #, 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:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 #, 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:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 #, 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:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
@@ -2110,110 +2079,100 @@ msgid "# GET requests given to datacache"
 msgstr ""
 #: src/dht/gnunet-service-dht_hello.c:86
-#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2223,158 +2182,49 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# Network size estimates received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# Bytes des Typs %d empfangen"
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2414,27 +2264,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr ""
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
@@ -2454,257 +2300,253 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 msgid "# DNS requests received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr "Ausführliche Ausgabe"
 #: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
 #, fuzzy
-msgid "# Inbound CADET channels created"
+msgid "# TCP packets sent via TUN"
-msgstr "# PING Nachrichten erstellt"
+msgstr "# Bytes gesendet über TCP"
-#: src/exit/gnunet-daemon-exit.c:860
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1062
 #, fuzzy
-msgid "# Bytes transmitted via cadet channels"
+msgid "# ICMP packets sent via TUN"
-msgstr "# Bytes des Typs %d übertragen"
+msgstr "# Bytes gesendet über TCP"
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv4 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1117
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1125
-msgid "ICMP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1202
-msgid "UDP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
-msgid "TCP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1341
 #, fuzzy
-msgid "# Packets received from TUN"
+msgid "# UDP packets sent via TUN"
-msgstr "# Bytes empfangen über TCP"
+msgstr "# Bytes gesendet über TCP"
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
+#: src/exit/gnunet-daemon-exit.c:2208
 #, fuzzy
-msgid "# Bytes received from TUN"
+msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:1468
-msgid "IPv4 packet options received.  Ignored.\n"
-msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
-#: src/exit/gnunet-daemon-exit.c:1397
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1443
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1451
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1852
-#, fuzzy
-msgid "# TCP packets sent via TUN"
-msgstr "# Bytes gesendet über TCP"
-#: src/exit/gnunet-daemon-exit.c:1976
 #, fuzzy
-msgid "# TCP service creation requests received via cadet"
+msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:1576
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
-msgid "# Bytes received from CADET"
+msgid "# UDP service requests received via cadet"
-msgstr "# Bytes empfangen über TCP"
+msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2062
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via cadet"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2169
+#: src/exit/gnunet-daemon-exit.c:1705
 #, fuzzy
-msgid "# TCP data requests received via cadet"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2183
+#: src/exit/gnunet-daemon-exit.c:1789
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/exit/gnunet-daemon-exit.c:2245
+#: src/exit/gnunet-daemon-exit.c:1826
 #, fuzzy
-msgid "# ICMP packets sent via TUN"
+msgid "# TCP data requests received via cadet"
-msgstr "# Bytes gesendet über TCP"
+msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2419
+#: src/exit/gnunet-daemon-exit.c:1957
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2669
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2211
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
-#: src/vpn/gnunet-service-vpn.c:2002
+#: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
 #, fuzzy
-msgid "# UDP packets sent via TUN"
+msgid "# Inbound CADET channels created"
-msgstr "# Bytes gesendet über TCP"
+msgstr "# PING Nachrichten erstellt"
+#: src/exit/gnunet-daemon-exit.c:2523
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:2542
 #, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
+msgid "# Messages transmitted via cadet channels"
-msgstr "# Client Trace-Anfragen empfangen"
+msgstr "# Bytes des Typs %d übertragen"
+#: src/exit/gnunet-daemon-exit.c:2720
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:2728
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2802
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2874
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2922
 #, fuzzy
-msgid "# UDP service requests received via cadet"
+msgid "# Packets received from TUN"
-msgstr "# Client Trace-Anfragen empfangen"
+msgstr "# Bytes empfangen über TCP"
+#: src/exit/gnunet-daemon-exit.c:2936
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# Bytes empfangen über TCP"
+#: src/exit/gnunet-daemon-exit.c:2962
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
+#: src/exit/gnunet-daemon-exit.c:2989
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3035
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3043
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, 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:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
@@ -2713,7 +2555,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
@@ -2833,68 +2675,74 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -3037,37 +2885,37 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 msgid "Error communicating with `fs' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -3092,76 +2940,76 @@ msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr ""
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
@@ -3197,27 +3045,27 @@ 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:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
@@ -3317,62 +3165,62 @@ msgstr ""
 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:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr "Die Datei in DATEINAME schreiben"
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen"
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
@@ -3507,12 +3355,12 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, 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:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3520,7 +3368,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3528,13 +3376,13 @@ msgstr ""
 "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:917
+#: src/fs/gnunet-publish.c:930
 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:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3542,7 +3390,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet-Datenbank)"
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3550,32 +3398,32 @@ msgstr ""
 "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:933
+#: src/fs/gnunet-publish.c:955
 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:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namensräume)"
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
@@ -3598,59 +3446,59 @@ msgstr ""
 msgid "Could not start searching.\n"
 msgstr "Fehler beim Starten der Collection.\n"
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 #, fuzzy
 msgid "# client searches received"
 msgstr "# Klartext PONG Nachrichten empfangen"
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3666,27 +3514,27 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 msgid "# Blocks transferred via cadet"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -3787,26 +3635,26 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n"
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3844,119 +3692,118 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "# query plan entries"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 #, fuzzy
 msgid "# irrelevant replies discarded"
 msgstr "# verworfener Nachrichten"
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
@@ -4011,11 +3858,11 @@ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -4038,139 +3885,117 @@ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, 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:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 msgid "Specify timeout for the lookup"
 msgstr ""
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:563
+#: src/gns/gnunet-gns.c:457
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:566
+#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr "Die Priorität des Inhalts angeben"
-#: src/gns/gnunet-gns.c:580
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:260
+#: src/gns/gnunet-gns-helper-service-w32.c:739
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4189,129 +4014,118 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, 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:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
@@ -4322,51 +4136,51 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4391,21 +4205,21 @@ msgstr ""
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -4555,25 +4369,25 @@ msgid ""
 "reason to run!\n"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
@@ -4712,7 +4526,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4841,43 +4655,43 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -4942,19 +4756,24 @@ msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 msgid "Token `%s' is malformed\n"
 msgstr "Schlüssel »%s« ist gültig\n"
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -4999,16 +4818,16 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5027,7 +4846,7 @@ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -5099,7 +4918,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
@@ -5111,7 +4930,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -5167,69 +4986,69 @@ msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, 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:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 msgid "set the desired nick name for the zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 msgid "monitor changes in the namestore"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1176
 msgid "determine our name for the given PKEY"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -5307,23 +5126,23 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
@@ -5333,23 +5152,23 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 msgid "run autoconfiguration"
 msgstr "# Freunde in Konfiguration"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
@@ -5371,15 +5190,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
@@ -5529,58 +5339,58 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5591,7 +5401,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -5610,32 +5420,32 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n"
 msgid "Show network size estimates from NSE service."
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5731,39 +5541,39 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Knoten »%s«.\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 msgid "list all known peers"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -5790,34 +5600,29 @@ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, c-format
 msgid ""
@@ -5825,7 +5630,7 @@ msgid ""
 "  %s\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
@@ -5834,7 +5639,7 @@ msgid ""
 "  %s\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -5955,66 +5760,66 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 msgid "SQLite database running\n"
 msgstr "SQL Datenbank beschädigt, Ergebnis wird ignoriert.\n"
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# Bytes empfangen über TCP"
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# dht Anfragen weitergeleitet"
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Bytes empfangen über TCP"
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 "Es konnte keine Verbindung mit dem %s-Dienst hergestellt werden. Abbruch\n"
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
@@ -6056,39 +5861,39 @@ msgstr ""
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "name of the file for writing statistics"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 msgid "name of file with input strings"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 msgid "name of file with hosts' names"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
@@ -6102,11 +5907,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -6170,7 +5975,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -6194,59 +5999,59 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Kommandos angegeben.\n"
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 msgid "# unsupported revocations received via set union"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6285,29 +6090,30 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6316,184 +6122,215 @@ msgstr " Verbindung fehlgeschlagen\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "Anzahl an Durchläufen"
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "Anzahl an Durchläufen"
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr ""
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ungültiger Parameter: `%s'\n"
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 msgid "wait for incoming messages"
 msgstr ""
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 msgid "GNS name"
 msgstr ""
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 msgid "method name"
 msgstr ""
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "Anzahl an Durchläufen"
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr ""
+"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
@@ -6541,35 +6378,35 @@ msgstr ""
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
@@ -6620,12 +6457,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6659,7 +6496,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6675,15 +6512,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-msgid "Misconfiguration (can't connect to the ARM service)"
+#, c-format
+msgid "%s is stopped"
+msgstr "%s wurde gestoppt"
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr "%s startet"
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr "%s wird gestoppt"
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is starting already"
+msgstr "%s ist bereits gestartet"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr "%s wird bereits gestoppt"
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr "%s ist bereits gestartet"
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr "%s ist bereits gestoppt"
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, c-format
+msgid "%s service is not known to ARM"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, c-format
+msgid "%s service failed to start"
+msgstr "%s-Dienst konnte nicht gestartet werden"
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6696,11 +6579,11 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -6841,42 +6724,38 @@ msgstr ""
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 msgid "configuration template"
 msgstr "Konfigurationsvorlage"
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6887,57 +6766,57 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -6995,7 +6874,7 @@ msgid ""
 msgstr ""
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
@@ -7064,198 +6943,198 @@ msgstr " Verbindung fehlgeschlagen\n"
 msgid "# DISCONNECT messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
@@ -7372,144 +7251,144 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, 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:499
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 msgid "Connected to"
 msgstr "Verbunden mit"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 msgid "Disconnected from"
 msgstr ""
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, 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:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7518,7 +7397,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
@@ -7527,155 +7406,155 @@ msgstr "Direkter Zugriff auf den Transportdienst"
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# Bytes des Typs %d empfangen"
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "iterations"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "Anzahl an Durchläufen"
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 msgid "message size to use"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
-#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, 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:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 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:2975
+#: src/transport/plugin_transport_http_server.c:2976
 msgid "Port is required! Fix in configuration\n"
 msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n"
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, c-format
 msgid "Using port %u\n"
 msgstr "Port %u wird verwendet\n"
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Teste Transport(e) %s\n"
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, 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:3474
+#: src/transport/plugin_transport_http_server.c:3475
 msgid "Unable to compile URL regex\n"
 msgstr ""
@@ -7725,160 +7604,160 @@ msgstr "# Bytes gesendet über SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# Bytes empfangen über TCP"
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, fuzzy, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, 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:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
-#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
@@ -7898,72 +7777,198 @@ msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# defragmentierter Nachrichten"
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentierter Nachrichten"
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# defragmentierter Nachrichten"
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# Bytes empfangen über TCP"
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# Bytes gesendet über TCP"
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# PING Nachrichten erstellt"
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/transport/tcp_connection_legacy.c:452
+#, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Zugriff verweigert auf »%s«\n"
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, 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/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, 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/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1161
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr "Dienst »%s« läuft auf %s\n"
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "GNUnet Konfiguration"
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -7998,7 +8003,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8093,16 +8098,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: src/util/connection.c:441
-#, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Zugriff verweigert auf »%s«\n"
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8176,16 +8171,11 @@ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 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:1245
+#: src/util/disk.c:1247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8241,12 +8231,21 @@ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Unbekannte Operation `%s'\n"
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr ""
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8254,16 +8253,48 @@ msgstr ""
 "Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr ""
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr ""
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+#: src/util/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8284,32 +8315,32 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet Konfiguration"
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
@@ -8372,35 +8403,35 @@ msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 msgid "No hostkey file specified on command line\n"
 msgstr ""
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
@@ -8409,23 +8440,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
@@ -8464,17 +8495,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Lesen von »%s«: %s\n"
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -8484,7 +8515,7 @@ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8497,17 +8528,22 @@ msgid ""
 "variable.\n"
 msgstr ""
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, 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:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+#: src/util/os_installation.c:944
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8533,21 +8569,6 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "GNUnet Konfiguration"
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8584,103 +8605,12 @@ msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-#: src/util/server.c:478 src/util/service_new.c:1111
+#: src/util/service.c:1306
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, 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:494 src/util/service_new.c:1127
-#, 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:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-#: 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:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "Dienst »%s« läuft auf %s\n"
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr ""
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, 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:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8692,240 +8622,236 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr "µs"
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 msgid "day"
 msgstr "Tag"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 msgid "days"
 msgstr "Tage"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 msgid "# Active channels"
 msgstr "# aktive Kanäle"
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
-msgid "# Bytes given to cadet for transmission"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:667
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+msgid "# ICMP packets received from cadet"
+msgstr "# Bytes empfangen über TCP"
+#: src/vpn/gnunet-service-vpn.c:1096
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "# Bytes empfangen über TCP"
+#: src/vpn/gnunet-service-vpn.c:1255
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "# Bytes empfangen über TCP"
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING Nachrichten erstellt"
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr ""
 "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
 "schlug fehl."
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-#, fuzzy
-msgid "# ICMP packets received from cadet"
-msgstr "# Bytes empfangen über TCP"
-#: src/vpn/gnunet-service-vpn.c:2093
-#, fuzzy
-msgid "# UDP packets received from cadet"
-msgstr "# Bytes empfangen über TCP"
-#: src/vpn/gnunet-service-vpn.c:2248
-#, fuzzy
-msgid "# TCP packets received from cadet"
-msgstr "# Bytes empfangen über TCP"
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 msgid "# Active destinations"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 msgid "Must specify valid IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
@@ -8958,42 +8884,47 @@ msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n"
 msgid "`%s' is not a valid IP address.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr "Ziel-IP des Tunnels"
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr "Name des Dienstes, auf den zugegriffen werden soll"
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr "Dienst wird über TCP angeboten"
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr "Dienst wird über UDP angeboten"
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
@@ -9011,6 +8942,37 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #, fuzzy
+#~ msgid "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr ""
+#~ "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+#~ "ausführen!\n"
+#~ msgid "ARM API is busy"
+#~ msgstr "ARM-API ist belegt"
+#~ msgid "Request timed out"
+#~ msgstr "Zeitüberschreitung der Anfrage"
+#, fuzzy
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
+#, fuzzy
+#~ msgid "Could not pass reply to client, message too big!\n"
+#~ msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# Bytes des Typs %d empfangen"
+#~ msgid "verbose output"
+#~ msgstr "Ausführliche Ausgabe"
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "Die Priorität des Inhalts angeben"
+#, fuzzy
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# dht Anfragen weitergeleitet"
diff --git a/po/es.po b/po/es.po
index 5a49f5b0d..090f097d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -32,224 +32,208 @@ msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-#, 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:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, 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:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr ""
-# Miguel: "timeout" lo he traducido como plazo, pero no se
-# si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-#, fuzzy
-msgid "Request timed out"
-msgstr "plazo de consenso"
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
 msgstr "# elementos almacenados"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is starting"
+msgid "is starting"
 msgstr "'%s' comenzando\n"
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+#, fuzzy
-msgid "%s is stopping"
+msgid "is stopping"
-msgstr ""
+msgstr "# elementos almacenados"
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is starting already"
+msgid "is starting already"
 msgstr "'%s' comenzando\n"
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+#, fuzzy
-msgid "%s is stopping already"
+msgid "is stopping already"
-msgstr ""
+msgstr "'%s' comenzando\n"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+#, fuzzy
-msgid "%s is started already"
+msgid "is started already"
-msgstr ""
+msgstr "'%s' comenzando\n"
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+#, fuzzy
-msgid "%s is stopped already"
+msgid "is stopped already"
-msgstr ""
+msgstr "'%s' comenzando\n"
 # 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:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service is not known to ARM"
+msgid "service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "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:266
+#: src/arm/gnunet-arm.c:260
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service cannot be started because ARM is shutting down"
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, fuzzy, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, 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:371
+#: src/arm/gnunet-arm.c:365
 #, 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:382
+#: src/arm/gnunet-arm.c:376
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:415
 #, 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:432
+#: src/arm/gnunet-arm.c:425
 #, 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:469
+#: src/arm/gnunet-arm.c:462
 #, 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:480
+#: src/arm/gnunet-arm.c:473
 #, 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:521
+#: src/arm/gnunet-arm.c:513
 #, 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:530
+#: src/arm/gnunet-arm.c:522
 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:536
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 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:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 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:800
+#: src/arm/gnunet-arm.c:826
 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:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -258,32 +242,35 @@ msgstr ""
 "fallo al crear un «socket» IPv6: %s\n"
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, 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/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -292,8 +279,8 @@ msgstr ""
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -301,38 +288,38 @@ msgstr ""
 "uno es necesario\n"
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, 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:943
+#: src/arm/gnunet-service-arm.c:944
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, 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:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -343,44 +330,44 @@ msgstr ""
 # 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:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, 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:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr "salida"
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr "señal"
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 msgid "unknown"
 msgstr "desconocido"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, 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:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, 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:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, 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"
@@ -416,32 +403,28 @@ msgstr ""
 "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/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
-msgid "experiment to use"
-msgstr ""
 #: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 #, fuzzy
 msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -559,7 +542,7 @@ msgstr ""
 msgid "Start logging `%s'\n"
 msgstr "Iniciando descarga «%s».\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -610,7 +593,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -644,204 +626,204 @@ msgstr "No se han proporcionado opciones\n"
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "conectar a un par"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 msgid "do not resolve IP addresses to hostnames"
 msgstr "no resuelve direcciones IP a nombres de máquina"
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr "modo de monitorización"
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr "imprime todas las cuotas configuradas"
 # Miguel: He preferido extender id a identificación por claridad.
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr "identificación del par"
 # Miguel: No me he encontrado esta opción todavía,
 # pero creo que son palabras clave.
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
 "banda)"
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr "valor de preferencia"
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 #, fuzzy
 msgid "public auction outcome"
 msgstr "_Opciones"
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr "texto de ayuda"
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Colección detenida.\n"
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:933
-msgid "activate echo mode"
+msgid "Activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:938
-msgid "dump debug information to STDERR"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:938
+#: src/cadet/gnunet-cadet.c:944
-msgid "port to listen to"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
-msgid "provide information about a particular tunnel"
+#, fuzzy
+msgid "Provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:969
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
-#: src/cadet/gnunet-service-cadet_peer.c:687
+#: src/consensus/gnunet-consensus-profiler.c:523
-msgid "Wrong CORE service\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
-msgstr "Servicio principal (CORE) erróneo\n"
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 #, fuzzy
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 msgid "number of values"
 msgstr "número de valores"
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr "plazo de consenso"
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 #, fuzzy
 msgid "write statistics to file"
 msgstr "imprime el valor de las estadísticas"
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
@@ -1098,15 +1080,15 @@ msgstr "Debes especificar un fichero a inspeccionar.\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1132,8 +1114,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1143,64 +1125,64 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: 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:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: 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:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: 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:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: 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:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: 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:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: 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:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: 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:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1265,7 +1247,7 @@ 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/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "No se pudo empezar la operación de desindexado.\n"
@@ -1341,39 +1323,44 @@ msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 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:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, fuzzy, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr "# bytes de mensajes del tipo %u recibidos"
+#: src/core/gnunet-service-core.c:985
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1386,136 +1373,136 @@ msgstr "# bytes cifrados"
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# bytes omitidos (fuera de secuencia)"
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 #, 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:1106
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 #, 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:1256
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
-#: src/core/gnunet-service-core_kx.c:1681
-#, fuzzy
-msgid "# PAYLOAD dropped (out of order)"
-msgstr "# bytes omitidos (fuera de secuencia)"
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1548,7 +1535,7 @@ msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
@@ -1589,17 +1576,17 @@ msgstr "# búsquedas de clientes recibidas"
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1612,69 +1599,69 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "Desconectado de"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "# reconexiones al almacén de datos (DATASTORE)"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr "# desbordamientos de la cola"
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr "# entradas creadas en la cola"
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 msgid "# status messages received"
 msgstr "# mensajes de estado recibidos"
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr "# Resultados recibidos"
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
@@ -1683,35 +1670,35 @@ msgstr "# peticiones «GET» ejecutadas"
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr "# bytes expirados"
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr "# resultados encontrados"
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, fuzzy, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
@@ -1720,7 +1707,7 @@ msgstr ""
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1729,7 +1716,7 @@ msgstr ""
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1737,62 +1724,62 @@ msgstr ""
 "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:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr "# reservado"
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, 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:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# peticiones «GET» recibidas"
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr "Contenido no encontrado"
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1800,106 +1787,106 @@ msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, 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:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, 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:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 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:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, 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:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr "# cuota"
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr "# tamaño de la caché"
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, 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:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1907,28 +1894,23 @@ msgstr "Base de datos Postgres ejecutándose\n"
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
-#: src/datastore/plugin_datastore_sqlite.c:692
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr ""
-"Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1189
+#: src/datastore/plugin_datastore_sqlite.c:1234
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1937,13 +1919,13 @@ msgstr ""
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
@@ -1968,45 +1950,42 @@ msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 msgid "Issueing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr "la clave de búsqueda"
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 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:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 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:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr "ser prolijo (imprime información de progreso)"
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
@@ -2016,44 +1995,44 @@ msgstr "Imprime todos los paquetes que pasan por la DHT."
 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:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 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:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
@@ -2070,94 +2049,84 @@ msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
 msgid "PUT request not confirmed!\n"
 msgstr "¡Petición «PUT» no confirmada!\n"
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 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:164
+#: src/dht/gnunet-dht-put.c:163
 #, 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:175
+#: src/dht/gnunet-dht-put.c:174
 #, 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:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 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:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 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_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
-#: src/dht/gnunet-service-dht_clients.c:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
-#: src/dht/gnunet-service-dht_clients.c:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
-#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
-#: src/dht/gnunet-service-dht_clients.c:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 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:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, 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:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
@@ -2201,103 +2170,93 @@ msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 #: src/dht/gnunet-service-dht_hello.c:86
-#: 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:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 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:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 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:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2306,163 +2265,54 @@ msgstr "# Resultados (RESULTS) P2P recibidos"
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-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"
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# respuestas recibidas de otros pares"
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -2506,27 +2356,23 @@ msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
 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:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr "sólo monitorizar respuestas DNS"
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr "Monitorizar consultas DNS."
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr "establece registros de clase A"
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr "establece registros de clase AAAA"
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
@@ -2546,220 +2392,216 @@ msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n"
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n"
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n"
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 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:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, 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:166
-msgid "verbose output"
-msgstr ""
 #: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
+msgid "# TCP packets sent via TUN"
+msgstr "# Paquetes TCP enviados vía TUN"
+#: src/exit/gnunet-daemon-exit.c:1062
+msgid "# ICMP packets sent via TUN"
+msgstr "# Paquetes ICMP enviados vía TUN"
+#: src/exit/gnunet-daemon-exit.c:1341
+msgid "# UDP packets sent via TUN"
+msgstr "# Paquetes UDP enviados vía TUN"
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
+#: src/exit/gnunet-daemon-exit.c:2208
 #, fuzzy
-msgid "# Inbound CADET channels created"
+msgid "# Bytes received from CADET"
-msgstr "# Túneles interiores MESH creados"
+msgstr "# Bytes recibidos de TUN"
-#: src/exit/gnunet-daemon-exit.c:860
+#: src/exit/gnunet-daemon-exit.c:1468
-#, c-format
+#, fuzzy
-msgid "Got duplicate service records for `%s:%u'\n"
+msgid "# UDP IP-exit requests received via cadet"
-msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
+msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1576
 #, fuzzy
-msgid "# Bytes transmitted via cadet channels"
+msgid "# UDP service requests received via cadet"
-msgstr "# Bytes transmitidos vía túneles MESH"
+msgstr "# Peticiones de servicio UDP recibidas vía mesh"
+#: src/exit/gnunet-daemon-exit.c:1616
+#, fuzzy
+msgid "# TCP service creation requests received via cadet"
+msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
+#: src/exit/gnunet-daemon-exit.c:1705
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via cadet"
+msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
+#: src/exit/gnunet-daemon-exit.c:1789
+msgid "# TCP DATA requests dropped (no session)"
+msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
+#: src/exit/gnunet-daemon-exit.c:1826
+#, fuzzy
+msgid "# TCP data requests received via cadet"
+msgstr "# Peticiones de datos TCP recibidas vía mesh"
+#: src/exit/gnunet-daemon-exit.c:1957
+#, fuzzy
+msgid "# ICMP IP-exit requests received via cadet"
+msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
-#: src/exit/gnunet-daemon-exit.c:1117
+#: src/exit/gnunet-daemon-exit.c:2211
+#, fuzzy
+msgid "# ICMP service requests received via cadet"
+msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/vpn/gnunet-service-vpn.c:2096
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# Túneles interiores MESH creados"
+#: src/exit/gnunet-daemon-exit.c:2523
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
+#: src/exit/gnunet-daemon-exit.c:2542
+#, fuzzy
+msgid "# Messages transmitted via cadet channels"
+msgstr "# Bytes transmitidos vía túneles MESH"
+#: src/exit/gnunet-daemon-exit.c:2720
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
-#: src/exit/gnunet-daemon-exit.c:1125
+#: src/exit/gnunet-daemon-exit.c:2728
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n"
-#: src/exit/gnunet-daemon-exit.c:1202
+#: src/exit/gnunet-daemon-exit.c:2802
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n"
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:2874
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n"
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:2922
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:2936
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:2962
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
-#: src/exit/gnunet-daemon-exit.c:1397
+#: src/exit/gnunet-daemon-exit.c:2989
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
-#: src/exit/gnunet-daemon-exit.c:1443
+#: src/exit/gnunet-daemon-exit.c:3035
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
-#: src/exit/gnunet-daemon-exit.c:1451
+#: src/exit/gnunet-daemon-exit.c:3043
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
-#: src/exit/gnunet-daemon-exit.c:1852
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
-msgid "# TCP packets sent via TUN"
-msgstr "# Paquetes TCP enviados vía TUN"
-#: src/exit/gnunet-daemon-exit.c:1976
-#, fuzzy
-msgid "# TCP service creation requests received via cadet"
-msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
-#, fuzzy
-msgid "# Bytes received from CADET"
-msgstr "# Bytes recibidos de TUN"
-#: src/exit/gnunet-daemon-exit.c:2062
-#, fuzzy
-msgid "# TCP IP-exit creation requests received via cadet"
-msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:2169
-#, fuzzy
-msgid "# TCP data requests received via cadet"
-msgstr "# Peticiones de datos TCP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:2183
-msgid "# TCP DATA requests dropped (no session)"
-msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
-#: src/exit/gnunet-daemon-exit.c:2245
-msgid "# ICMP packets sent via TUN"
-msgstr "# Paquetes ICMP enviados vía TUN"
-#: src/exit/gnunet-daemon-exit.c:2419
-#, fuzzy
-msgid "# ICMP IP-exit requests received via cadet"
-msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:2669
-#, fuzzy
-msgid "# ICMP service requests received via cadet"
-msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:2002
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
-msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
-msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
-#: src/exit/gnunet-daemon-exit.c:2840
-msgid "# UDP packets sent via TUN"
-msgstr "# Paquetes UDP enviados vía TUN"
-#: src/exit/gnunet-daemon-exit.c:2956
-#, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
-msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:3059
-#, fuzzy
-msgid "# UDP service requests received via cadet"
-msgstr "# Peticiones de servicio UDP recibidas vía mesh"
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
 #, 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:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, 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:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2767,7 +2609,7 @@ msgstr ""
 "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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2775,7 +2617,7 @@ msgstr ""
 "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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2783,7 +2625,7 @@ msgstr ""
 "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:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2791,20 +2633,20 @@ msgstr ""
 "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:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, 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:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 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"
@@ -2813,7 +2655,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr "# reconocimientos enviados por framentos"
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr "# fragmentos recibidos"
@@ -2936,11 +2778,11 @@ msgstr ""
 "Se produjo un fallo mientras se retomaba de la operación de descarga «%s»: "
 "%s\n"
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2948,24 +2790,32 @@ msgstr ""
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 "Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+"Se produjo un fallo al crear el directorio para la descarga recursiva de "
+"«%s»\n"
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2974,37 +2824,37 @@ msgstr ""
 "Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
 "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s"
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 msgid "Invalid URI"
 msgstr "URI no válida"
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -3147,36 +2997,36 @@ msgstr "No se pudo leer el fichero"
 msgid "Error communicating with `fs' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio «FS» para el desindexado."
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 msgid "Failed to get KSKs from directory scan."
 msgstr "Se produjo un fallo al obtener KSKs de la búsqueda de directorios."
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Error interno escaneando «%s».\n"
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
@@ -3200,89 +3050,89 @@ msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
@@ -3320,28 +3170,28 @@ msgstr ""
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
-#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 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:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 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:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
@@ -3439,35 +3289,35 @@ msgstr "El nombre de fichero de destino debe ser especificado.\n"
 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:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 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:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)"
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "establece el número máximo de descargas paralelas permitido"
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "establece el número máximo de peticiones de bloque paralelas permitido"
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3475,29 +3325,29 @@ msgstr ""
 "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
 "chk/...)"
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr "imprimir una lista de todos los ficheros indexados"
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 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:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
@@ -3632,12 +3482,12 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, 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:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3645,7 +3495,7 @@ msgstr ""
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3653,11 +3503,11 @@ msgstr ""
 "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:917
+#: src/fs/gnunet-publish.c:930
 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:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3665,7 +3515,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3673,13 +3523,13 @@ msgstr ""
 "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:933
+#: src/fs/gnunet-publish.c:955
 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:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3687,14 +3537,14 @@ msgstr ""
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3702,7 +3552,7 @@ msgstr ""
 "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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
@@ -3726,61 +3576,61 @@ msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
 msgid "Could not start searching.\n"
 msgstr "No se pudo empezar a buscar.\n"
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 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:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr "terminar búsqueda automáticamente después de «DELAY»"
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 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:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, fuzzy, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 "Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n"
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3796,28 +3646,28 @@ msgstr "# respuestas recibidas vía «stream»"
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# Bloques transferidos vía «stream»"
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
@@ -3912,27 +3762,27 @@ msgstr "Error escribiendo «%s».\n"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n"
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr "no indexado"
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3972,113 +3822,112 @@ msgstr "# peticiones refrescadas"
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
@@ -4130,11 +3979,11 @@ msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -4158,145 +4007,123 @@ msgstr "Recibida petición DNS mal formada de %s\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 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:788
+#: src/gns/gnunet-dns2gns.c:796
 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:791
+#: src/gns/gnunet-dns2gns.c:802
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 #, 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:563
+#: src/gns/gnunet-gns.c:457
 #, 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:566
+#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr "Especificar el tipo del registro a buscar"
-#: src/gns/gnunet-gns.c:580
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
-msgstr "¡La transmisión con el cliente ha fallado!\n"
-#: 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/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
+#: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4315,129 +4142,119 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
-#: src/gns/gnunet-gns-proxy.c:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, 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:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, 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:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-msgid "Failed to connect to the namestore!\n"
-msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
-#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
@@ -4447,51 +4264,51 @@ msgstr "¡No se pudo conectar a la DHT!\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, fuzzy, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4518,21 +4335,21 @@ msgstr ""
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -4700,11 +4517,11 @@ msgstr ""
 "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:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4712,16 +4529,16 @@ msgstr ""
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 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:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
@@ -4863,7 +4680,7 @@ msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4999,48 +4816,48 @@ msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -5108,19 +4925,24 @@ msgstr "Las opción «%s» o «%s» es necesaria.\n"
 msgid "Token `%s' is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Conexión fallida\n"
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -5165,16 +4987,16 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 #, 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:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
@@ -5194,7 +5016,7 @@ msgstr "Error al comunicar con el servicio ARM.\n"
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
@@ -5265,7 +5087,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
@@ -5277,7 +5099,7 @@ msgstr "No se han proporcionado opciones\n"
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
@@ -5332,74 +5154,74 @@ msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr "añadir registro"
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr "borrar registro"
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr "mostrar registros"
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 #, 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:1156
+#: src/namestore/gnunet-namestore.c:1176
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5480,22 +5302,22 @@ msgstr "El almacén de nombres no pudo añadir el registro\n"
 msgid "flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr "Configuración de GNUnet"
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
@@ -5505,24 +5327,24 @@ msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 msgid "run autoconfiguration"
 msgstr "Configuración de GNUnet"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 #, fuzzy
 msgid "write configuration file (for autoconfiguration)"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
@@ -5546,17 +5368,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-"¡Por favor, pase un número de puerto válido como primer parámetro! (se "
-"obtuvo «%s»)\n"
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
@@ -5712,62 +5523,62 @@ msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 #, fuzzy
 msgid "watch for connection reversal requests"
 msgstr "# pares desconectados debido a petición externa"
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, fuzzy, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 "Puerto inválido \"%s\" en la especificación de la lista local, probando el "
 "puerto %d.\n"
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Colección detenida.\n"
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5778,7 +5589,7 @@ msgstr ""
 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/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
@@ -5796,33 +5607,33 @@ msgstr "comando «upnpc» no encontrado\n"
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 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:843
+#: src/nse/gnunet-nse-profiler.c:847
 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:849
+#: src/nse/gnunet-nse-profiler.c:859
 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:852
+#: src/nse/gnunet-nse-profiler.c:866
 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:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5920,39 +5731,39 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 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:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
@@ -5978,35 +5789,30 @@ msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
@@ -6014,7 +5820,7 @@ msgid ""
 "  %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
@@ -6023,7 +5829,7 @@ msgid ""
 "  %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
@@ -6144,59 +5950,59 @@ msgstr "«%s» falló en %s: %d con el error: %s\n"
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
@@ -6244,45 +6050,45 @@ msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 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:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
@@ -6296,12 +6102,12 @@ msgstr "El servicio «%s» no está ejecutandose\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -6369,7 +6175,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -6394,60 +6200,60 @@ msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 msgid "No action specified. Nothing to do.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sesiones wlan creadas"
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6486,29 +6292,30 @@ msgstr "No se pudo conectar al servicio %s.\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6517,188 +6324,218 @@ msgstr "Conexión fallida (¿bug?)\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 # Miguel: Conjunto resta.
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 msgid "number of element in set A-B"
 msgstr "número de elementos en el conjunto A-B"
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 msgid "number of element in set B-A"
 msgstr "número de elementos en el conjunto B-A"
 # Miguel: Conjunto unión.
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr "número de elementos comunes en A y B"
 # Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr "número de hash"
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr "tamaño ibf"
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Parámetro no válido «%s»\n"
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Parámetro no válido «%s»\n"
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Falló al entregar el mensaje '%s'.\n"
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 #, fuzzy
 msgid "GNS name"
 msgstr "Mostrar el _nombre"
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 #, fuzzy
 msgid "method name"
 msgstr "Mostrar el _nombre"
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "número de mensajes a usar por iteración"
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
@@ -6746,35 +6583,35 @@ msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
@@ -6826,12 +6663,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Argumento no válido para '%s' en %s:%d.\n"
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6865,7 +6702,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6881,17 +6718,65 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-#, fuzzy
+#, fuzzy, c-format
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "%s is stopped"
-msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
+msgstr "# elementos almacenados"
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, fuzzy, c-format
+msgid "%s is starting"
+msgstr "'%s' comenzando\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "'%s' comenzando\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+# Miguel: ¿Debería cambiar las siglas de ARM?
+# De momento las he mantenido con una traducción en
+# otro mensaje.
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "El servicio «%s» es desconocido para el ARM.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, 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/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, 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-service-testbed_peers.c:1179
+#, fuzzy, c-format
+msgid "%.s Unknown result code."
+msgstr "Código de respuesta del ARM desconocido.\n"
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6902,11 +6787,11 @@ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 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:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -7052,17 +6937,17 @@ msgstr ""
 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:352
+#: src/testing/gnunet-testing.c:354
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 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:356
+#: src/testing/gnunet-testing.c:365
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -7070,28 +6955,24 @@ msgstr ""
 "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:358
+#: src/testing/gnunet-testing.c:372
 msgid "configuration template"
 msgstr "plantilla de configuración"
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 #, fuzzy
 msgid "list COUNT number of keys"
 msgstr "crea «COUNT» número de pares"
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -7104,7 +6985,7 @@ msgstr "El número de clave %u no existe\n"
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -7113,59 +6994,59 @@ msgstr ""
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
 "suficientes puertos libres?)\n"
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 "Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
 "omitiendo bytes «%s».\n"
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, fuzzy, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
@@ -7229,7 +7110,7 @@ msgstr ""
 "conexiones.\n"
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
@@ -7302,207 +7183,207 @@ msgstr "# sesiones wlan creadas"
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
@@ -7625,38 +7506,38 @@ msgstr "# Mensajes PONG omitidos, firma expirada"
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, 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"
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:494
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Transmitiendo %u bytes a %s\n"
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7665,46 +7546,46 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, 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:623
+#: src/transport/gnunet-transport.c:618
 msgid "Connected to"
 msgstr "Conectado a"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 msgid "Disconnected from"
 msgstr "Desconectado de"
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Recibidos %u bytes de %s\n"
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, 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:1267
+#: src/transport/gnunet-transport.c:1251
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7713,7 +7594,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7721,59 +7602,59 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, 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:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 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:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, 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:1447
+#: src/transport/gnunet-transport.c:1437
 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:1450
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "conectar a un par"
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr "identidad del par"
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
@@ -7783,7 +7664,7 @@ 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:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
@@ -7792,63 +7673,63 @@ msgstr "Acceso directo al servicio de transporte."
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# respuestas recibidas de otros pares"
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
 msgid "iterations"
 msgstr "Otras configuraciones"
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "número de mensajes a usar por iteración"
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 #, fuzzy
 msgid "message size to use"
 msgstr "tamaño del mensaje"
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡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:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
-#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, 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:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, 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:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7857,12 +7738,12 @@ msgstr ""
 "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:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, 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:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -7870,7 +7751,7 @@ msgstr ""
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -7878,84 +7759,84 @@ msgstr ""
 "¡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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, fuzzy, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 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:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, 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:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 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:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 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:2975
+#: src/transport/plugin_transport_http_server.c:2976
 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:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, 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:3474
+#: src/transport/plugin_transport_http_server.c:3475
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8005,119 +7886,119 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8126,7 +8007,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8136,37 +8017,37 @@ msgstr ""
 "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:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, 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:3707
+#: src/transport/plugin_transport_udp.c:3716
 #, 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:3798
+#: src/transport/plugin_transport_udp.c:3807
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
-#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
@@ -8186,76 +8067,209 @@ msgstr "Imposible hallar el hash de '%s'.\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 #, fuzzy
 msgid "# ACKs sent"
 msgstr "# ACK WLAN enviados"
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# mensajes defragmentados"
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sesiones WLAN alojadas"
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# ACK recibidos vía WLAN"
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# «beacons HELLO» enviados vía WLAN"
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
+#: src/transport/tcp_connection_legacy.c:452
+#, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Acceso denegado a «%s»\n"
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr "Aceptando conexión desde «%s»: %p\n"
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "«%s» falló para el puerto %d (%s).\n"
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, 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/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, 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/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+"El código de procesado para el mensaje del tipo %u no llamó a "
+"«GNUNET_SERVER_receive_done» después de %s\n"
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr "Familia de direcciones %d desconocida\n"
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+"No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
+"mismo\n"
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+"No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
+"mismo\n"
+#: src/transport/tcp_service_legacy.c:1161
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr "El servicio «%s» se ejecuta en %s\n"
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr "No se pudo inicializar el proceso del servicio\n"
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+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/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr "El proceso del servicio no devolvió un estado\n"
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr "No existe tal usuario"
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr "demonizar (desasociar del terminal)"
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, 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/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -8290,7 +8304,7 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 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"
@@ -8385,16 +8399,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: src/util/connection.c:441
-#, c-format
-msgid "Access denied to `%s'\n"
-msgstr "Acceso denegado a «%s»\n"
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr "Aceptando conexión desde «%s»: %p\n"
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8474,16 +8478,11 @@ msgstr "El firmado ECC falló en %s:%d: %s\n"
 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:1245
+#: src/util/disk.c:1247
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8539,12 +8538,21 @@ msgstr "%s: la opción «-W %s» es ambigua\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción «-W %s» no permite un parámetro\n"
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Use %s para obtener una lista de opciones.\n"
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Falta la opción «%s» para la operación «%s»\n"
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr "imprime el número de versión"
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8552,16 +8560,47 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr "imprime esta ayuda"
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr ""
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "crear ficheros de configuración únicos"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+#: src/util/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8582,33 +8621,33 @@ msgstr ""
 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:228
+#: src/util/gnunet-config.c:229
 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:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr "nombre de la sección a la que acceder"
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr "nombre de la opción a la que acceder"
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr "valor a establecer"
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Falta configuración sobre las opciones de claves.\n"
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
@@ -8669,35 +8708,35 @@ msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
@@ -8706,23 +8745,23 @@ msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 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:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -8762,19 +8801,19 @@ msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -8784,7 +8823,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8801,17 +8840,22 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, 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:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+#: src/util/os_installation.c:944
 #, 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:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8835,21 +8879,6 @@ msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 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:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, 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:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, 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:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8890,110 +8919,12 @@ 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:478 src/util/service_new.c:1111
+#: src/util/service.c:1306
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "«%s» falló para el puerto %d (%s).\n"
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, 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:494 src/util/service_new.c:1127
-#, 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:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-"El código de procesado para el mensaje del tipo %u no llamó a "
-"«GNUNET_SERVER_receive_done» después de %s\n"
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr "Familia de direcciones %d desconocida\n"
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-"No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
-"mismo\n"
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-"No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
-"mismo\n"
-#: 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:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr "El servicio «%s» se ejecuta en %s\n"
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr "No se pudo inicializar el proceso del servicio\n"
-#: src/util/service.c:1264 src/util/service_new.c:1505
-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:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr "El proceso del servicio no devolvió un estado\n"
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "No existe tal usuario"
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, 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:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr "demonizar (desasociar del terminal)"
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9007,248 +8938,243 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "señal (%d, %p) devolvió %d.\n"
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr "para siempre"
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 msgid "day"
 msgstr "día"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 msgid "days"
 msgstr "días"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr "fin del plazo"
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 #, fuzzy
 msgid "# Active channels"
 msgstr "# Túneles activos"
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
 #, fuzzy
-msgid "# Bytes given to cadet for transmission"
+msgid "# Messages dropped in cadet queue (overflow)"
-msgstr "# Bytes dados para transmisión a mesh"
+msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
-#: src/vpn/gnunet-service-vpn.c:667
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# ICMP packets received from cadet"
-msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
+msgstr "# Paquetes ICMP recibidos de mesh"
+#: src/vpn/gnunet-service-vpn.c:1096
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "# Paquetes UDP recibidos de mesh"
+#: src/vpn/gnunet-service-vpn.c:1255
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "# Paquetes TCP recibidos de mesh"
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Túneles mesh creados"
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n"
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-#, fuzzy
-msgid "# ICMP packets received from cadet"
-msgstr "# Paquetes ICMP recibidos de mesh"
-#: src/vpn/gnunet-service-vpn.c:2093
-#, fuzzy
-msgid "# UDP packets received from cadet"
-msgstr "# Paquetes UDP recibidos de mesh"
-#: src/vpn/gnunet-service-vpn.c:2248
-#, fuzzy
-msgid "# TCP packets received from cadet"
-msgstr "# Paquetes TCP recibidos de mesh"
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n"
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 msgid "# Active destinations"
 msgstr "# Destinos activos"
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
@@ -9282,42 +9208,46 @@ msgstr "«%s» no es un identificador de par válido\n"
 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:291
+#: src/vpn/gnunet-vpn.c:292
 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:294
+#: src/vpn/gnunet-vpn.c:297
 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:297
+#: src/vpn/gnunet-vpn.c:303
 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:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr "IP de destino para el túnel"
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 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:306
+#: src/vpn/gnunet-vpn.c:321
 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:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr "el servicio es ofrecido vía TCP"
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr "el servicio es ofrecido vía UDP"
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+msgid "Failed to connect to the namestore!\n"
+msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
@@ -9334,6 +9264,61 @@ msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 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 "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
+# Miguel: "timeout" lo he traducido como plazo, pero no se
+# si hay alguna palabra que lo describa mejor.
+#, fuzzy
+#~ msgid "Request timed out"
+#~ msgstr "plazo de consenso"
+#~ msgid "Wrong CORE service\n"
+#~ msgstr "Servicio principal (CORE) erróneo\n"
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr ""
+#~ "Datos no válidos en la base de datos.  Intentando arreglar (por "
+#~ "borrado).\n"
+#~ 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"
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# respuestas recibidas de otros pares"
+#~ msgid "only monitor DNS replies"
+#~ msgstr "sólo monitorizar respuestas DNS"
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "Especificar el tipo del registro a buscar"
+#~ msgid "Transmission to client failed!\n"
+#~ msgstr "¡La transmisión con el cliente ha fallado!\n"
+#~ msgid "Shutdown in progress, aborting transmission.\n"
+#~ msgstr "Apagado en proceso, abortando transmisión.\n"
+#~ msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#~ msgstr ""
+#~ "¡Por favor, pase un número de puerto válido como primer parámetro! (se "
+#~ "obtuvo «%s»)\n"
+#~ msgid "GNUnet NAT traversal test helper daemon"
+#~ msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
+#, fuzzy
+#~ msgid "# Bytes given to cadet for transmission"
+#~ msgstr "# Bytes dados para transmisión a mesh"
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# peticiones «UPDATE» ejecutadas"
@@ -10422,10 +10407,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 #, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Error interno."
@@ -11891,12 +11872,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "# wlan messages queued"
 #~ msgstr "# mensajes WLAN encolados"
-#~ msgid "print this help"
-#~ msgstr "imprime esta ayuda"
-#~ msgid "print the version number"
-#~ msgstr "imprime el número de versión"
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Falló al comenzar la recolección.\n"
diff --git a/po/fr.po b/po/fr.po
index 1d261c0e8..ef1361425 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -30,327 +30,316 @@ msgstr ""
 msgid "Message was sent successfully"
 msgstr ""
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr ""
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr "API ARM occupé"
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-msgid "Request timed out"
-msgstr ""
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 msgid "Unknown request status"
 msgstr ""
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
 msgstr "%s est arrêté"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, c-format
+#, fuzzy
-msgid "%s is starting"
+msgid "is starting"
 msgstr "%s est en cours de démarrage"
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+#, fuzzy
-msgid "%s is stopping"
+msgid "is stopping"
 msgstr "%s est en cours d'arrêt"
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, c-format
+#, fuzzy
-msgid "%s is starting already"
+msgid "is starting already"
 msgstr "%s est déjà en cours de démarrage"
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+#, fuzzy
-msgid "%s is stopping already"
+msgid "is stopping already"
 msgstr "%s est déjà arrêté"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+#, fuzzy
-msgid "%s is started already"
+msgid "is started already"
 msgstr "%s est déjà démarré"
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+#, fuzzy
-msgid "%s is stopped already"
+msgid "is stopped already"
 msgstr "%s est déjà arrêté"
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, c-format
+msgid "service is not known to ARM"
-msgid "%s service is not known to ARM"
 msgstr ""
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "service failed to start"
-msgstr ""
+msgstr "Échec du démarrage de %s\n"
-#: src/arm/gnunet-arm.c:266
+#: src/arm/gnunet-arm.c:260
-#, c-format
+msgid "service cannot be manipulated because ARM is shutting down"
-msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:365
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:376
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:415
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Dernier message reçu de %s\n"
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:425
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:469
+#: src/arm/gnunet-arm.c:462
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:480
+#: src/arm/gnunet-arm.c:473
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:513
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:522
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:536
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 msgid "stop all GNUnet services"
 msgstr ""
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 msgid "start all GNUnet default services"
 msgstr ""
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 msgid "stop and start all GNUnet default services"
 msgstr ""
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr ""
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:944
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr "exit"
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr "signal"
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 msgid "unknown"
 msgstr "inconnu"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -380,30 +369,26 @@ msgid ""
 "%llu\n"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3293
+#: src/ats/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr "solveur utilisé"
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
-msgid "experiment to use"
-msgstr ""
 #: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 msgid "print logging"
 msgstr "afficher le journal"
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -510,7 +495,7 @@ msgstr "Arrêter la journalisation\n"
 msgid "Start logging `%s'\n"
 msgstr "Démarrer la journalisation « %s »\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -553,7 +538,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -584,186 +568,185 @@ msgstr ""
 msgid "Valid type required\n"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Connecté à"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr "mode moniteur"
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 msgid "set preference for the given peer"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 msgid "Print information about ATS state"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 msgid "public auction outcome"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, c-format
 msgid "Invalid target `%s'\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 msgid "No action requested\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
-msgstr ""
-#: src/cadet/gnunet-cadet.c:932
-msgid "activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:933
-msgid "dump debug information to STDERR"
+msgid "Activate echo mode"
 msgstr ""
 #: src/cadet/gnunet-cadet.c:938
-msgid "port to listen to"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:944
-msgid "provide information about a patricular peer"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:951
-msgid "provide information about all peers"
+msgid "Provide information about a patricular peer"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:957
-msgid "provide information about a particular tunnel"
+msgid "Provide information about all peers"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:963
-msgid "provide information about all tunnels"
+msgid "Provide information about a particular tunnel"
 msgstr ""
-#: src/cadet/gnunet-service-cadet_peer.c:687
+#: src/cadet/gnunet-cadet.c:969
-msgid "Wrong CORE service\n"
+msgid "Provide information about all tunnels"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:499
+#: src/consensus/gnunet-consensus-profiler.c:523
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 msgid "number of peers in consensus"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 msgid "number of values"
 msgstr "nombre de valeurs"
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
@@ -1013,15 +996,15 @@ msgstr ""
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1047,8 +1030,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1058,59 +1041,59 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() échoué : %s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: 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:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, 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:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr "Spécification incorrecte\n"
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: 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:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: 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:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: 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:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1172,7 +1155,7 @@ msgstr "ogg_stream_init() échoué.\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 msgid "Could not start record audio helper\n"
 msgstr ""
@@ -1239,36 +1222,41 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 msgid "provide information about all current connections (continuously)"
 msgstr ""
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 msgid "# messages discarded (session disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+#: src/core/gnunet-service-core.c:985
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr ""
@@ -1281,126 +1269,126 @@ msgstr ""
 msgid "# bytes decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 msgid "# PING messages transmitted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 msgid "# ephemeral keys received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 msgid "# PING messages dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# PONG messages created"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 msgid "# sessions terminated by timeout"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# keepalive messages sent"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# PONG messages decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 msgid "# session keys confirmed via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# timeouts prevented via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 msgid "# DATA message dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "# sessions terminated by key expiration"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 msgid "# bytes dropped (duplicates)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 msgid "# bytes dropped (ancient message)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# bytes of payload decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1681
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1431,7 +1419,7 @@ msgid "# updates to my type map"
 msgstr ""
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 msgid "# bytes stored"
 msgstr ""
@@ -1469,17 +1457,17 @@ msgstr ""
 msgid "Heap datacache running\n"
 msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1492,68 +1480,68 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "Déconnecté de"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "Déconnecté de"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr ""
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 msgid "# status messages received"
 msgstr ""
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr ""
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 msgid "# datastore connections (re)created"
 msgstr ""
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 msgid "# PUT requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 msgid "# RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 msgid "# REMOVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr ""
@@ -1562,206 +1550,206 @@ msgstr ""
 msgid "Failed to store item: %s, aborting\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 msgid "Manipulate GNUnet datastore"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr "# résultats introuvables"
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr "# réservé"
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 msgid "# GET requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# GET KEY requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 msgid "# GET REPLICATION requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 msgid "# REMOVE requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr "# quota"
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr "# taille du cache"
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 msgid "Heap database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 msgid "Data too large"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 msgid "Failed to drop table from database.\n"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1769,37 +1757,33 @@ msgstr ""
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:692
+#: src/datastore/plugin_datastore_sqlite.c:1234
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 msgid "Sqlite database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
@@ -1824,44 +1808,41 @@ msgstr ""
 msgid "Issueing DHT GET with key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
@@ -1871,43 +1852,43 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
@@ -1923,88 +1904,78 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
@@ -2047,100 +2018,90 @@ msgid "# GET requests given to datacache"
 msgstr ""
 #: src/dht/gnunet-service-dht_hello.c:86
-#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 msgid "# FIND PEER messages initiated"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 msgid "# requests TTL-dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 msgid "# Peer selection failed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 msgid "# PUT requests routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 msgid "# GET requests routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 msgid "# P2P PUT requests received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 msgid "# P2P PUT bytes received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 msgid "# P2P GET requests received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 msgid "# P2P GET bytes received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 msgid "# P2P RESULT bytes received"
 msgstr ""
@@ -2148,171 +2109,48 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr ""
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d"
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-msgid "# Bytes received from other peers"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, fuzzy, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2352,27 +2190,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr ""
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
@@ -2392,240 +2226,236 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 msgid "# DNS requests received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr "sortie verbeuse"
 #: src/dv/gnunet-dv.c:175
 msgid "Print information about DV state"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
-msgid "# Inbound CADET channels created"
+msgid "# TCP packets sent via TUN"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:860
+#: src/exit/gnunet-daemon-exit.c:1062
-#, c-format
+msgid "# ICMP packets sent via TUN"
-msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1341
-msgid "# Bytes transmitted via cadet channels"
+msgid "# UDP packets sent via TUN"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:2208
+msgid "# Bytes received from CADET"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:1468
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+msgid "# UDP IP-exit requests received via cadet"
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1117
+#: src/exit/gnunet-daemon-exit.c:1576
-msgid "# ICMP packets dropped (not allowed)"
+msgid "# UDP service requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1125
+#: src/exit/gnunet-daemon-exit.c:1616
-msgid "ICMP Packet dropped, have no matching connection information\n"
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1202
+#: src/exit/gnunet-daemon-exit.c:1705
-msgid "UDP Packet dropped, have no matching connection information\n"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1789
-msgid "TCP Packet dropped, have no matching connection information\n"
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1826
-msgid "# Packets received from TUN"
+msgid "# TCP data requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1957
-msgid "# Bytes received from TUN"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1397
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#, c-format
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1443
+#: src/exit/gnunet-daemon-exit.c:2211
-#, c-format
+msgid "# ICMP service requests received via cadet"
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1451
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
-#, c-format
+#: src/vpn/gnunet-service-vpn.c:2096
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1852
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
-msgid "# TCP packets sent via TUN"
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1976
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
-msgid "# TCP service creation requests received via cadet"
+msgid "# Inbound CADET channels created"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2523
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#, c-format
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+msgid "Got duplicate service records for `%s:%u'\n"
-#: src/exit/gnunet-daemon-exit.c:3056
-msgid "# Bytes received from CADET"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2062
+#: src/exit/gnunet-daemon-exit.c:2542
-msgid "# TCP IP-exit creation requests received via cadet"
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2169
+#: src/exit/gnunet-daemon-exit.c:2720
-msgid "# TCP data requests received via cadet"
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2183
+#: src/exit/gnunet-daemon-exit.c:2728
-msgid "# TCP DATA requests dropped (no session)"
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2245
+#: src/exit/gnunet-daemon-exit.c:2802
-msgid "# ICMP packets sent via TUN"
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2419
+#: src/exit/gnunet-daemon-exit.c:2874
-msgid "# ICMP IP-exit requests received via cadet"
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2669
+#: src/exit/gnunet-daemon-exit.c:2922
-msgid "# ICMP service requests received via cadet"
+msgid "# Packets received from TUN"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/exit/gnunet-daemon-exit.c:2936
-#: src/vpn/gnunet-service-vpn.c:2002
+msgid "# Bytes received from TUN"
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/exit/gnunet-daemon-exit.c:2962
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+msgid "IPv4 packet options received.  Ignored.\n"
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2989
-msgid "# UDP packets sent via TUN"
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:3035
-msgid "# UDP IP-exit requests received via cadet"
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:3043
-msgid "# UDP service requests received via cadet"
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr "Doit être un nombre"
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
@@ -2634,7 +2464,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr ""
@@ -2747,65 +2577,71 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 msgid "Invalid URI"
 msgstr "URI invalide"
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2936,33 +2772,33 @@ msgstr ""
 msgid "Error communicating with `fs' service."
 msgstr ""
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 msgid "Failed to connect to `datastore' service."
 msgstr ""
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 msgid "Failed to open file for unindexing."
 msgstr ""
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr ""
@@ -2983,76 +2819,76 @@ msgstr ""
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr ""
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
@@ -3088,27 +2924,27 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
@@ -3204,61 +3040,61 @@ msgstr ""
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr ""
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr ""
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 msgid "Special file-sharing operations"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
@@ -3386,61 +3222,61 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
-#: src/fs/gnunet-publish.c:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 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:917
+#: src/fs/gnunet-publish.c:930
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:955
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
@@ -3462,56 +3298,56 @@ msgstr ""
 msgid "Could not start searching.\n"
 msgstr ""
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 msgid "# replies received for local clients"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 msgid "# client searches received"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3525,24 +3361,24 @@ msgstr ""
 msgid "# replies received via cadet dropped"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 msgid "# queries received via CADET not answered"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 msgid "# Blocks transferred via cadet"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 msgid "# queries received via cadet"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 msgid "# cadet client connections rejected"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
@@ -3636,25 +3472,25 @@ msgstr ""
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr "non indexé"
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3690,111 +3526,110 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 msgid "# Pending requests created"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# Replies received from CADET"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr ""
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
@@ -3845,11 +3680,11 @@ msgstr ""
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -3872,134 +3707,113 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 msgid "No DNS server specified!\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 msgid "No valid GNS zone specified!\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 msgid "Specify the type of the record to lookup"
 msgstr ""
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 msgid "Specify timeout for the lookup"
 msgstr ""
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:563
+#: src/gns/gnunet-gns.c:457
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:566
+#: src/gns/gnunet-gns.c:476
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr ""
-#: src/gns/gnunet-gns.c:580
 msgid "GNUnet GNS resolver tool"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:766
+#: src/gns/gnunet-gns-helper-service-w32.c:739
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, c-format
 msgid "Failed to connect to identity service\n"
 msgstr ""
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4018,126 +3832,116 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 msgid "Failed to pass client to MHD\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-msgid "Failed to connect to the namestore!\n"
-msgstr ""
-#: src/gns/gnunet-service-gns.c:593
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 msgid "Could not connect to DHT!\n"
 msgstr ""
@@ -4146,49 +3950,49 @@ msgstr ""
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 msgid "Failed to parse DNS response\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4213,21 +4017,21 @@ msgstr ""
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 msgid "GNS REST API initialized\n"
 msgstr ""
@@ -4373,25 +4177,25 @@ msgid ""
 "reason to run!\n"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
@@ -4525,7 +4329,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4650,43 +4454,43 @@ msgstr ""
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -4750,18 +4554,23 @@ msgstr ""
 msgid "Token `%s' is malformed\n"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 msgid "Identity Token REST API initialized\n"
 msgstr ""
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -4806,15 +4615,15 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 msgid "GNUnet zone manipulation tool"
 msgstr ""
@@ -4831,7 +4640,7 @@ msgstr ""
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr ""
@@ -4901,7 +4710,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -4913,7 +4722,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -4968,69 +4777,69 @@ msgid "Invalid nick `%s'\n"
 msgstr ""
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr "ajouter un enregistrement"
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr "suprimer un enregistrement"
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr "afficher les enregistrements"
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 msgid "set the desired nick name for the zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 msgid "monitor changes in the namestore"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1176
 msgid "determine our name for the given PKEY"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -5105,20 +4914,20 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr ""
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 msgid "Namestore REST API initialized\n"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 msgid "Suggested configuration changes:\n"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "fornat invalide : « %s »\n"
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr ""
@@ -5128,23 +4937,23 @@ msgstr ""
 msgid "run autoconfiguration"
 msgstr "fornat invalide : « %s »\n"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
@@ -5164,15 +4973,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
@@ -5315,57 +5115,57 @@ msgstr "Résolution de « %s » échouée : %s\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 msgid "Connection reversal request failed\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5376,7 +5176,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Échec du démarrage de %s\n"
@@ -5393,32 +5193,32 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5511,39 +5311,39 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 msgid "list all known peers"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 msgid "Print information about peers."
 msgstr ""
@@ -5569,33 +5369,28 @@ msgstr ""
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:629
 msgid "Received a malformed response from service."
 msgstr ""
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, c-format
 msgid ""
@@ -5603,7 +5398,7 @@ msgid ""
 "  %s\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, c-format
@@ -5612,7 +5407,7 @@ msgid ""
 "  %s\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr ""
@@ -5721,58 +5516,58 @@ msgstr ""
 msgid "SQLite database running\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 msgid "# DNS requests intercepted"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 msgid "# DNS replies received"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
@@ -5814,39 +5609,39 @@ msgstr ""
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 msgid "name of the file for writing statistics"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 msgid "name of file with input strings"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 msgid "name of file with hosts' names"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
@@ -5860,11 +5655,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 msgid "GNUnet REST server"
 msgstr ""
@@ -5927,7 +5722,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
@@ -5950,55 +5745,55 @@ msgstr ""
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 msgid "# unsupported revocations received via set union"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 msgid "# revocation messages received via set union"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 msgid "# revocation set unions failed"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 msgid "Could not open revocation database file!"
 msgstr ""
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6036,29 +5831,30 @@ msgstr "Impossible d’ouvrir « %s ».\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 msgid "Connect to CADET failed\n"
 msgstr ""
@@ -6066,180 +5862,210 @@ msgstr ""
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr "threshold"
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 msgid "number of element in set A-B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 msgid "number of element in set B-A"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr "numéro de hash"
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr "taille ibz"
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 msgid "--place missing or invalid.\n"
 msgstr ""
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 msgid "name or public key of ego"
 msgstr ""
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 msgid "wait for incoming messages"
 msgstr ""
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 msgid "GNS name"
 msgstr ""
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 msgid "method name"
 msgstr ""
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "nombre de valeurs"
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "Échec du démarrage de %s\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6286,35 +6112,35 @@ msgstr ""
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr ""
@@ -6364,12 +6190,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6403,7 +6229,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6419,15 +6245,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-msgid "Misconfiguration (can't connect to the ARM service)"
+#, c-format
+msgid "%s is stopped"
+msgstr "%s est arrêté"
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr "%s est en cours de démarrage"
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr "%s est en cours d'arrêt"
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is starting already"
+msgstr "%s est déjà en cours de démarrage"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr "%s est déjà arrêté"
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr "%s est déjà démarré"
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr "%s est déjà arrêté"
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, c-format
+msgid "%s service is not known to ARM"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, c-format
+msgid "%s service failed to start"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr "%.s Code d'erreur inconnu"
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6437,11 +6309,11 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -6581,40 +6453,36 @@ msgstr ""
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 msgid "create unique configuration files"
 msgstr ""
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 msgid "configuration template"
 msgstr ""
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6625,57 +6493,57 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr ""
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -6731,7 +6599,7 @@ msgid ""
 msgstr ""
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
@@ -6800,182 +6668,182 @@ msgstr "# Session TCP active"
 msgid "# DISCONNECT messages sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 msgid "# SYN messages sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 msgid "# SYN_ACK messages sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 msgid "# SYN messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 msgid "# SYN_ACK messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 msgid "# ACK messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 msgid "# unexpected ACK messages"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 msgid "# quota messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 msgid "# QUOTA messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 msgid "# DISCONNECT messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
@@ -7088,140 +6956,140 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:494
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 msgid "Connected to"
 msgstr "Connecté à"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 msgid "Disconnected from"
 msgstr "Déconnecté de"
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "%s message(s) reçu(s)\n"
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 msgid "Failed to connect to transport service\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 msgid "disconnect from a peer"
 msgstr ""
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr ""
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7230,7 +7098,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 msgid "Direct access to transport service."
 msgstr ""
@@ -7239,153 +7107,153 @@ msgstr ""
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 msgid "receive data from peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "iterations"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "nombre de valeurs"
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 msgid "message size to use"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:2976
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3474
+#: src/transport/plugin_transport_http_server.c:3475
 msgid "Unable to compile URL regex\n"
 msgstr ""
@@ -7431,157 +7299,157 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 msgid "# bytes currently in TCP buffers"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 msgid "# TCP WELCOME messages received"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 msgid "# TCP server connect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 msgid "Failed to start service.\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, 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:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 msgid "Failed to open UDP sockets\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
@@ -7599,64 +7467,189 @@ msgstr ""
 msgid "Failed to open UNIX listen socket\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 msgid "# Messages defragmented"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# Session TCP active"
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 msgid "# message fragments sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 msgid "# messages pending (with fragmentation)"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 msgid "# MAC endpoints allocated"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 msgid "# ACKs received"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 msgid "# HELLO beacons sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 msgid "# DATA messages received"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 msgid "# DATA messages processed"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# Session TCP active"
+#: src/transport/tcp_connection_legacy.c:452
+#, c-format
+msgid "Access denied to `%s'\n"
+msgstr ""
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1161
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr "Aucun utilisateur trouvé"
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+msgid "Malformed configuration, exit ...\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr ""
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -7691,7 +7684,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7782,16 +7775,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: src/util/connection.c:441
-#, c-format
-msgid "Access denied to `%s'\n"
-msgstr ""
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -7862,16 +7845,11 @@ msgstr ""
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
-#: src/util/disk.c:1245
+#: src/util/disk.c:1247
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr ""
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -7927,27 +7905,67 @@ msgstr ""
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr ""
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr ""
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr ""
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr ""
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "fornat invalide : « %s »\n"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
+#: src/util/getopt_helpers.c:675
+#, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr ""
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -7968,31 +7986,31 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 msgid "print available configuration sections"
 msgstr ""
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
@@ -8053,35 +8071,35 @@ msgstr ""
 msgid "No hostkey file specified on command line\n"
 msgstr ""
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
@@ -8090,23 +8108,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
@@ -8145,17 +8163,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -8165,7 +8183,7 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8178,17 +8196,22 @@ msgid ""
 "variable.\n"
 msgstr ""
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
-#: src/util/os_installation.c:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+#: src/util/os_installation.c:944
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8212,20 +8235,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr ""
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr ""
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-msgid "Malformed configuration, exit ...\n"
-msgstr ""
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8259,103 +8268,12 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
-#: src/util/server.c:478 src/util/service_new.c:1111
+#: src/util/service.c:1306
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr ""
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-#: src/util/server.c:494 src/util/service_new.c:1127
-#, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr ""
-#: src/util/server.c:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:1170
-#, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr ""
-#: src/util/service.c:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "Aucun utilisateur trouvé"
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr ""
-#: src/util/service.c:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8367,230 +8285,226 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "o"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr "µs"
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr "perpetuel"
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 msgid "day"
 msgstr "jour"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 msgid "days"
 msgstr "jours"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr "fin du temps"
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 msgid "# Active channels"
 msgstr "# Canaux actifs"
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
-msgid "# Bytes given to cadet for transmission"
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+#: src/vpn/gnunet-service-vpn.c:753
+msgid "# ICMP packets received from cadet"
+msgstr ""
+#: src/vpn/gnunet-service-vpn.c:1096
+msgid "# UDP packets received from cadet"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:667
+#: src/vpn/gnunet-service-vpn.c:1255
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# TCP packets received from cadet"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1467
 msgid "# Cadet channels created"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 msgid "# Packets received from TUN interface"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-msgid "# ICMP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2093
-msgid "# UDP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2248
-msgid "# TCP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 msgid "# Active destinations"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 msgid "Must specify valid IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 msgid "Must specify valid IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
@@ -8623,42 +8537,46 @@ msgstr ""
 msgid "`%s' is not a valid IP address.\n"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+msgid "Failed to connect to the namestore!\n"
+msgstr ""
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
@@ -8675,6 +8593,76 @@ msgstr ""
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
+#~ msgid "ARM API is busy"
+#~ msgstr "API ARM occupé"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail_length = %d"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail[%d]=%s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail_id[%d]=%s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,trail[%d] = %s "
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->trail_id = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->next_hop = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "SUPU %s, %s, %d, trail->prev_hop = %s"
+#~ msgstr ""
+#~ "\n"
+#~ "SUPU %s, %s, %d,my_identity = %s"
+#~ msgid "verbose output"
+#~ msgstr "sortie verbeuse"
 #~ msgid "malformed"
 #~ msgstr "malformé"
diff --git a/po/sv.po b/po/sv.po
index 78958cbab..3120e6594 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -30,335 +30,323 @@ msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 msgid "Message was sent successfully"
 msgstr ""
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr ""
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-#, fuzzy
-msgid "Request timed out"
-msgstr "# sessionsnycklar accepterade"
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
 msgstr "# byte krypterade"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is starting"
+msgid "is starting"
 msgstr "\"%s\" startar\n"
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+#, fuzzy
-msgid "%s is stopping"
+msgid "is stopping"
-msgstr ""
+msgstr "# byte krypterade"
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is starting already"
+msgid "is starting already"
 msgstr "\"%s\" startar\n"
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+#, fuzzy
-msgid "%s is stopping already"
+msgid "is stopping already"
-msgstr ""
+msgstr "\"%s\" startar\n"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+#, fuzzy
-msgid "%s is started already"
+msgid "is started already"
-msgstr ""
+msgstr "\"%s\" startar\n"
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+#, fuzzy
-msgid "%s is stopped already"
+msgid "is stopped already"
-msgstr ""
+msgstr "\"%s\" startar\n"
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service is not known to ARM"
+msgid "service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "service failed to start"
 msgstr "Misslyckades att starta samling.\n"
-#: src/arm/gnunet-arm.c:266
+#: src/arm/gnunet-arm.c:260
-#, c-format
+msgid "service cannot be manipulated because ARM is shutting down"
-msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
-msgstr ""
+msgstr "Okänd operation \"%s\"\n"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:365
 #, 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:382
+#: src/arm/gnunet-arm.c:376
 #, 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:422
+#: src/arm/gnunet-arm.c:415
 #, 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:432
+#: src/arm/gnunet-arm.c:425
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/arm/gnunet-arm.c:469
+#: src/arm/gnunet-arm.c:462
 #, 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:480
+#: src/arm/gnunet-arm.c:473
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:513
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:522
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/arm/gnunet-arm.c:536
+#: src/arm/gnunet-arm.c:528
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 msgid "stop all GNUnet services"
 msgstr ""
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 msgid "start all GNUnet default services"
 msgstr ""
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 msgid "stop and start all GNUnet default services"
 msgstr ""
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:944
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, 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:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -388,31 +376,27 @@ msgid ""
 "%llu\n"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3293
+#: src/ats/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:941
+#: src/ats-tests/gnunet-solver-eval.c:950
 msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "be verbose"
-msgstr "var informativ"
-#: src/ats/gnunet-ats-solver-eval.c:3302
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -519,7 +503,7 @@ msgstr ""
 msgid "Start logging `%s'\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -562,7 +546,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -596,199 +579,198 @@ msgstr ""
 msgid "Valid type required\n"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 msgid "public auction outcome"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Samling stoppad.\n"
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:933
-msgid "activate echo mode"
+msgid "Activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:938
-msgid "dump debug information to STDERR"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:938
+#: src/cadet/gnunet-cadet.c:944
-msgid "port to listen to"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:969
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/cadet/gnunet-service-cadet_peer.c:687
+#: src/consensus/gnunet-consensus-profiler.c:523
-msgid "Wrong CORE service\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
-msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
@@ -1042,15 +1024,15 @@ msgstr "Du måste ange en lista av filer att lägga in.\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1076,8 +1058,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1087,63 +1069,63 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Samling stoppad.\n"
-#: src/conversation/gnunet-helper-audio-playback.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: 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:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: 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:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: 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:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: 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:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: 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:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1209,7 +1191,7 @@ msgstr "\"%s\" %s misslyckades: %s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -1282,40 +1264,45 @@ msgstr "Ogiltiga kommandoradsargument:\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, fuzzy, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/core/gnunet-service-core.c:985
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -1328,148 +1315,148 @@ msgstr "# byte krypterade"
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# byte kastade via UDP (utgående)"
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1158
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
-#: src/core/gnunet-service-core_kx.c:1681
-#, fuzzy
-msgid "# PAYLOAD dropped (out of order)"
-msgstr "# byte kastade via UDP (utgående)"
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1504,7 +1491,7 @@ msgid "# updates to my type map"
 msgstr ""
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -1547,17 +1534,17 @@ msgstr "# klartext PONG-meddelanden mottagna"
 msgid "Heap datacache running\n"
 msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1570,72 +1557,72 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "\"%s\" ansluten till \"%s\".\n"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 msgid "# PUT requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 msgid "# RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 msgid "# REMOVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr ""
@@ -1644,215 +1631,215 @@ msgstr ""
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# byte mottogs via TCP"
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 msgid "# GET REPLICATION requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, 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:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 msgid "Heap database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1860,37 +1847,33 @@ msgstr ""
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
-#: src/datastore/plugin_datastore_sqlite.c:692
+#: src/datastore/plugin_datastore_sqlite.c:1234
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 msgid "Sqlite database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
@@ -1914,44 +1897,41 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Issueing DHT GET with key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
@@ -1961,43 +1941,43 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
@@ -2016,93 +1996,83 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_clients.c:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/dht/gnunet-service-dht_clients.c:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/dht/gnunet-service-dht_clients.c:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
@@ -2146,116 +2116,106 @@ msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 #: src/dht/gnunet-service-dht_hello.c:86
-#: 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:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 msgid "# Peer selection failed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2265,158 +2225,49 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-#, fuzzy
-msgid "Could not pass reply to client, message too big!\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# byte mottagna av typen %d"
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2456,27 +2307,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr ""
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
@@ -2496,259 +2343,255 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr ""
 #: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
 #, fuzzy
-msgid "# Inbound CADET channels created"
+msgid "# TCP packets sent via TUN"
-msgstr "# PING-meddelanden skapade"
+msgstr "# byte skickade via UDP"
-#: src/exit/gnunet-daemon-exit.c:860
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1062
 #, fuzzy
-msgid "# Bytes transmitted via cadet channels"
+msgid "# ICMP packets sent via TUN"
-msgstr "# byte skickade av typen %d"
+msgstr "# byte skickade via UDP"
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv4 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1117
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1125
-msgid "ICMP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1202
-msgid "UDP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
-msgid "TCP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1341
 #, fuzzy
-msgid "# Packets received from TUN"
+msgid "# UDP packets sent via TUN"
-msgstr "# byte mottagna via HTTP"
+msgstr "# byte skickade via UDP"
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
+#: src/exit/gnunet-daemon-exit.c:2208
 #, fuzzy
-msgid "# Bytes received from TUN"
+msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:1468
-msgid "IPv4 packet options received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1397
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1443
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1451
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1852
 #, fuzzy
-msgid "# TCP packets sent via TUN"
+msgid "# UDP IP-exit requests received via cadet"
-msgstr "# byte skickade via UDP"
-#: src/exit/gnunet-daemon-exit.c:1976
-#, fuzzy
-msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:1576
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
 #, fuzzy
-msgid "# Bytes received from CADET"
+msgid "# UDP service requests received via cadet"
-msgstr "# byte mottagna via HTTP"
+msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2062
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
-msgid "# TCP IP-exit creation requests received via cadet"
+msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2169
+#: src/exit/gnunet-daemon-exit.c:1705
 #, fuzzy
-msgid "# TCP data requests received via cadet"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2183
+#: src/exit/gnunet-daemon-exit.c:1789
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2245
+#: src/exit/gnunet-daemon-exit.c:1826
 #, fuzzy
-msgid "# ICMP packets sent via TUN"
+msgid "# TCP data requests received via cadet"
-msgstr "# byte skickade via UDP"
+msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2419
+#: src/exit/gnunet-daemon-exit.c:1957
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
-#: src/exit/gnunet-daemon-exit.c:2669
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2211
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
-#: src/vpn/gnunet-service-vpn.c:2002
+#: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
 #, fuzzy
-msgid "# UDP packets sent via TUN"
+msgid "# Inbound CADET channels created"
-msgstr "# byte skickade via UDP"
+msgstr "# PING-meddelanden skapade"
+#: src/exit/gnunet-daemon-exit.c:2523
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:2542
 #, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
+msgid "# Messages transmitted via cadet channels"
-msgstr "# byte mottogs via TCP"
+msgstr "# byte skickade av typen %d"
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:2720
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2728
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2802
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2874
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2922
 #, fuzzy
-msgid "# UDP service requests received via cadet"
+msgid "# Packets received from TUN"
-msgstr "# byte mottogs via TCP"
+msgstr "# byte mottagna via HTTP"
+#: src/exit/gnunet-daemon-exit.c:2936
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# byte mottagna via HTTP"
+#: src/exit/gnunet-daemon-exit.c:2962
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2989
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3035
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3043
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, 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:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
@@ -2757,7 +2600,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
@@ -2876,68 +2719,74 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -3079,37 +2928,37 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Error communicating with `fs' service."
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3134,76 +2983,76 @@ msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr ""
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
@@ -3241,27 +3090,27 @@ 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:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
@@ -3361,62 +3210,62 @@ msgstr ""
 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:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
@@ -3551,61 +3400,61 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
-#: src/fs/gnunet-publish.c:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 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:917
+#: src/fs/gnunet-publish.c:930
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:955
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
@@ -3629,60 +3478,60 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3698,28 +3547,28 @@ msgstr "# byte mottagna av typen %d"
 msgid "# replies received via cadet dropped"
 msgstr "# byte mottagna av typen %d"
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# byte skickade av typen %d"
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
@@ -3819,26 +3668,26 @@ msgstr "Fel vid skapandet av användare"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3877,117 +3726,116 @@ msgstr "# byte mottogs via TCP"
 msgid "# query plan entries"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
@@ -4042,11 +3890,11 @@ msgstr "Misslyckades att starta samling.\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -4070,142 +3918,120 @@ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 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:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Inga nyckelord angivna!\n"
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "ange prioritet för innehållet"
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 #, 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:563
+#: src/gns/gnunet-gns.c:457
 #, 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:566
+#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr "ange prioritet för innehållet"
-#: src/gns/gnunet-gns.c:580
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:766
+#: src/gns/gnunet-gns-helper-service-w32.c:739
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4224,129 +4050,118 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-#: src/gns/gnunet-gns-proxy.c:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, 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:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
@@ -4356,51 +4171,51 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4425,21 +4240,21 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -4590,25 +4405,25 @@ msgid ""
 "reason to run!\n"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
@@ -4745,7 +4560,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4874,43 +4689,43 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -4976,19 +4791,24 @@ msgstr "%s: flagga \"%s\" är tvetydig\n"
 msgid "Token `%s' is malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -5033,16 +4853,16 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 #, fuzzy
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5061,7 +4881,7 @@ msgstr "Skriv ut information om GNUnets motparter."
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -5138,7 +4958,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
@@ -5150,7 +4970,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -5206,72 +5026,72 @@ msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, 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:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1176
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5349,22 +5169,22 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr ""
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "Kunde inte spara konfiguration!"
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -5374,24 +5194,24 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "run autoconfiguration"
 msgstr "GNUnet-konfiguration"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 #, fuzzy
 msgid "write configuration file (for autoconfiguration)"
 msgstr "Inga applikationer definierade i konfiguration!\n"
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "GNUnet-konfiguration"
@@ -5414,15 +5234,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
@@ -5574,58 +5385,58 @@ msgstr "Misslyckades att binda till UDP-port %d.\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Samling stoppad.\n"
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5636,7 +5447,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -5654,34 +5465,34 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 #, 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:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -5775,39 +5586,39 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 msgid "list all known peers"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -5834,35 +5645,30 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 #, 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:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
@@ -5870,7 +5676,7 @@ msgid ""
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
@@ -5879,7 +5685,7 @@ msgid ""
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
@@ -5999,67 +5805,67 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "SQLite database running\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
@@ -6103,43 +5909,43 @@ msgstr ""
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
@@ -6153,11 +5959,11 @@ msgstr "\"%s\" är inte en fil.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -6223,7 +6029,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -6248,60 +6054,60 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# byte mottogs via TCP"
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sessionsnycklar accepterade"
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6340,29 +6146,30 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -6371,187 +6178,217 @@ msgstr " Anslutning misslyckades (fel?)\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "antal iterationer"
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "antal iterationer"
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr ""
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 #, fuzzy
 msgid "GNS name"
 msgstr "Visa _namn"
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 #, fuzzy
 msgid "method name"
 msgstr "Visa _namn"
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "antal meddelanden att använda per iteration"
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
@@ -6599,35 +6436,35 @@ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
@@ -6679,12 +6516,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6718,7 +6555,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6734,16 +6571,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-#, fuzzy
+#, fuzzy, c-format
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "%s is stopped"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgstr "# byte krypterade"
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, fuzzy, c-format
+msgid "%s is starting"
+msgstr "\"%s\" startar\n"
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "\"%s\" startar\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "\"%s\" är inte en fil.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "Misslyckades att starta samling.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6754,11 +6636,11 @@ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -6898,43 +6780,39 @@ msgstr "Kunde inte skapa värdnyckel!\n"
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6945,59 +6823,59 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -7056,7 +6934,7 @@ msgid ""
 msgstr ""
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -7131,208 +7009,208 @@ msgstr "# sessionsnycklar accepterade"
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7448,151 +7326,151 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, 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:499
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7601,7 +7479,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -7611,163 +7489,163 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 #, fuzzy
 msgid "receive data from peer"
 msgstr "# byte mottagna av typen %d"
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
 msgid "iterations"
 msgstr "Visa alla alternativ"
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "antal meddelanden att använda per iteration"
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 #, fuzzy
 msgid "message size to use"
 msgstr "meddelandestorlek"
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
-#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, 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:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, 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:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 #, 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:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:2976
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, 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:3474
+#: src/transport/plugin_transport_http_server.c:3475
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -7820,167 +7698,167 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, 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:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
-#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
@@ -8000,73 +7878,200 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# PING-meddelanden skapade"
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# sessionsnycklar accepterade"
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# byte mottogs via TCP"
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# byte mottogs via TCP"
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# byte mottogs via TCP"
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# byte skickade via UDP"
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
+#: src/transport/tcp_connection_legacy.c:452
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+# drive = hard drive ?
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, 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/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, 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/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Okänd operation \"%s\"\n"
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1161
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
+#: src/transport/tcp_service_legacy.c:1202
+#, fuzzy, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -8102,7 +8107,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8193,16 +8198,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: 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:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8275,16 +8270,11 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-#: src/util/disk.c:1245
+#: src/util/disk.c:1247
 #, 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:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8340,12 +8330,21 @@ msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr "skriv ut versionsnummer"
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8353,16 +8352,47 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr "skriv ut denna hjälp"
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr "var informativ"
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, fuzzy, c-format
 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/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8383,33 +8413,33 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet-konfiguration"
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8469,36 +8499,36 @@ msgstr "Kunde inte skapa värdnyckel!\n"
 msgid "No hostkey file specified on command line\n"
 msgstr ""
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
@@ -8507,23 +8537,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8563,17 +8593,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, 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:601
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -8583,7 +8613,7 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8596,18 +8626,23 @@ msgid ""
 "variable.\n"
 msgstr ""
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
 # drive = hard drive ?
-#: src/util/os_installation.c:921
+#: src/util/os_installation.c:944
 #, 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:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8632,21 +8667,6 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8682,104 +8702,12 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
-# drive = hard drive ?
+#: src/util/service.c:1306
-#: src/util/server.c:478 src/util/service_new.c:1111
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, 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:494 src/util/service_new.c:1127
-#, 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:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Okänd operation \"%s\"\n"
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-#: 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: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:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr ""
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, 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:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8791,244 +8719,239 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " dagar"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " dagar"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 #, fuzzy
 msgid "# Active channels"
 msgstr "Nätverksanslutning"
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
 #, fuzzy
-msgid "# Bytes given to cadet for transmission"
+msgid "# Messages dropped in cadet queue (overflow)"
-msgstr "# PING-meddelanden skapade"
+msgstr "# byte kastade via UDP (utgående)"
-#: src/vpn/gnunet-service-vpn.c:667
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# ICMP packets received from cadet"
-msgstr "# byte kastade via UDP (utgående)"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/vpn/gnunet-service-vpn.c:1096
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1255
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# byte kastade via UDP (utgående)"
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-#, fuzzy
-msgid "# ICMP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/vpn/gnunet-service-vpn.c:2093
-#, fuzzy
-msgid "# UDP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/vpn/gnunet-service-vpn.c:2248
-#, fuzzy
-msgid "# TCP packets received from cadet"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
@@ -9062,44 +8985,49 @@ msgstr "\"%s\" är inte en vanlig fil.\n"
 msgid "`%s' is not a valid IP address.\n"
 msgstr "\"%s\" är inte tillgänglig."
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# byte mottogs via TCP"
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr ""
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
@@ -9117,6 +9045,34 @@ 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 "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+#, fuzzy
+#~ msgid "Request timed out"
+#~ msgstr "# sessionsnycklar accepterade"
+#, fuzzy
+#~ msgid "Could not pass reply to client, message too big!\n"
+#~ msgstr "Kunde inte skicka meddelande till gnunetd\n"
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# byte mottagna av typen %d"
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "ange prioritet för innehållet"
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+#, fuzzy
+#~ msgid "# Bytes given to cadet for transmission"
+#~ msgstr "# PING-meddelanden skapade"
+#, fuzzy
 #~ msgid "# UPDATE requests received"
 #~ msgstr "# byte mottogs via TCP"
@@ -9890,10 +9846,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Testar transport(er) %s\n"
 #, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Okänt fel.\n"
@@ -10506,12 +10458,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "# wlan messages queued"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
-#~ msgid "print this help"
-#~ msgstr "skriv ut denna hjälp"
-#~ msgid "print the version number"
-#~ msgstr "skriv ut versionsnummer"
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
diff --git a/po/vi.po b/po/vi.po
index db522ea47..a9f00a20d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -33,338 +33,327 @@ msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 msgid "Message was sent successfully"
 msgstr ""
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-#, 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:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, 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:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr ""
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-#, fuzzy
-msgid "Request timed out"
-msgstr "# các khoá phiên chạy được chấp nhận"
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
 msgstr "# các byte trong kho dữ liệu"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, c-format
+#, fuzzy
-msgid "%s is starting"
+msgid "is starting"
-msgstr ""
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+#, fuzzy
-msgid "%s is stopping"
+msgid "is stopping"
-msgstr ""
+msgstr "# các byte trong kho dữ liệu"
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s is starting already"
+msgid "is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+#, fuzzy
-msgid "%s is stopping already"
+msgid "is stopping already"
-msgstr ""
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+#, fuzzy
-msgid "%s is started already"
+msgid "is started already"
-msgstr ""
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+#, fuzzy
-msgid "%s is stopped already"
+msgid "is stopped already"
-msgstr ""
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service is not known to ARM"
+msgid "service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
-#: src/arm/gnunet-arm.c:266
+#: src/arm/gnunet-arm.c:260
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service cannot be started because ARM is shutting down"
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
-msgstr ""
+msgstr "Không rõ người dùng « %s »\n"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, 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:371
+#: src/arm/gnunet-arm.c:365
 #, 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:382
+#: src/arm/gnunet-arm.c:376
 #, 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:422
+#: src/arm/gnunet-arm.c:415
 #, 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:432
+#: src/arm/gnunet-arm.c:425
 #, 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:469
+#: src/arm/gnunet-arm.c:462
 #, 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:480
+#: src/arm/gnunet-arm.c:473
 #, 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:521
+#: src/arm/gnunet-arm.c:513
 #, 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:530
+#: src/arm/gnunet-arm.c:522
 #, 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:536
+#: src/arm/gnunet-arm.c:528
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, 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:774
+#: src/arm/gnunet-arm.c:769
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, 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/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, 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:943
+#: src/arm/gnunet-service-arm.c:944
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, 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:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, 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:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, 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:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -394,31 +383,27 @@ msgid ""
 "%llu\n"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3293
+#: src/ats/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3296
+#: src/ats/gnunet-ats-solver-eval.c:3299
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:941
+#: src/ats-tests/gnunet-solver-eval.c:950
 msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3299
+#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "be verbose"
-msgstr "xuất chi tiết"
-#: src/ats/gnunet-ats-solver-eval.c:3302
 #, fuzzy
 msgid "print logging"
 msgstr "Theo dõi"
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -526,7 +511,7 @@ msgstr "Theo dõi"
 msgid "Start logging `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -569,7 +554,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -604,199 +588,198 @@ msgstr "chưa đưa ra tên"
 msgid "Valid type required\n"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "không quyết định các tên máy"
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 #, fuzzy
 msgid "public auction outcome"
 msgstr "Ứng dụng bị hủy bỏ."
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, 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:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Thu thập bị dừng.\n"
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:933
-msgid "activate echo mode"
+msgid "Activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:938
-msgid "dump debug information to STDERR"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:938
+#: src/cadet/gnunet-cadet.c:944
-msgid "port to listen to"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:969
 #, fuzzy
-msgid "provide information about all tunnels"
+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:687
+#: src/consensus/gnunet-consensus-profiler.c:523
-msgid "Wrong CORE service\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
-msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
@@ -1050,15 +1033,15 @@ msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1084,8 +1067,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1095,63 +1078,63 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: 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:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: 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:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: 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:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: 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:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: 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:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: 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:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: 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:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1215,7 +1198,7 @@ msgstr "SMTP: « %s » bị lỗi: %s\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/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -1288,41 +1271,46 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 #, 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:185
+#: src/core/gnunet-core.c:186
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, fuzzy, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr "# các byte nhiễu được nhận"
+#: src/core/gnunet-service-core.c:985
 #, fuzzy
 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:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -1335,148 +1323,148 @@ msgstr "# các byte đã mã hoá"
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 #, 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:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 #, 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:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 #, 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:1106
+#: src/core/gnunet-service-core_kx.c:1158
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 #, 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:1145
+#: src/core/gnunet-service-core_kx.c:1197
 #, 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:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 #, 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:1216
+#: src/core/gnunet-service-core_kx.c:1268
 #, 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:1221
+#: src/core/gnunet-service-core_kx.c:1273
 #, 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:1256
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 #, 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:1305
+#: src/core/gnunet-service-core_kx.c:1357
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 #, 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:1485
+#: src/core/gnunet-service-core_kx.c:1518
 #, 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:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 #, 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:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 #, 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:1612
+#: src/core/gnunet-service-core_kx.c:1645
 #, 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:1620
+#: src/core/gnunet-service-core_kx.c:1653
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
-#: src/core/gnunet-service-core_kx.c:1681
-#, fuzzy
-msgid "# PAYLOAD dropped (out of order)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1512,7 +1500,7 @@ msgid "# updates to my type map"
 msgstr ""
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -1556,17 +1544,17 @@ msgstr "# các yêu cầu khách lỗ hổng được nhận"
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1579,75 +1567,75 @@ msgstr "kho dữ liệu sqlite"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -1657,220 +1645,220 @@ msgstr "# các yêu cầu dht được định tuyến"
 msgid "Failed to store item: %s, aborting\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 #, 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:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 #, 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:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 #, 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:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 #, 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:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 #, 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:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, 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:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, 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:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, 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:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1878,39 +1866,34 @@ msgstr ""
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
-#: src/datastore/plugin_datastore_sqlite.c:692
+#: src/datastore/plugin_datastore_sqlite.c:1234
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
-#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
@@ -1934,44 +1917,41 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "Issueing DHT GET with key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
@@ -1981,43 +1961,43 @@ msgstr ""
 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:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
@@ -2036,92 +2016,82 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr "# độ tin cậy được tiêu phí"
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, 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:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 #, 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:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 #, 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:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 #, 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:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 #, 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:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
@@ -2165,118 +2135,108 @@ 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:86
-#: 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:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 #, 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:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 #, 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:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 #, 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:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 #, 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:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 #, 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:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 #, 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:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 #, 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:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 #, 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:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 #, 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:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 #, 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:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 #, 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:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2286,157 +2246,49 @@ msgstr "# Tín hiệu HTTP PUT được nhận"
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-#, fuzzy
-msgid "# Bytes received from other peers"
-msgstr "# các byte kiểu %d được nhận"
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-#: src/dht/plugin_block_dht.c:167
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2476,27 +2328,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr ""
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
@@ -2516,259 +2364,255 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 #, fuzzy
 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:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 #, 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:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr ""
 #: 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."
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
 #, fuzzy
-msgid "# Inbound CADET channels created"
+msgid "# TCP packets sent via TUN"
-msgstr "# các truy vấn lỗ hổng được định tuyến"
+msgstr "# các byte đã gửi qua UDP"
-#: src/exit/gnunet-daemon-exit.c:860
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1062
 #, fuzzy
-msgid "# Bytes transmitted via cadet channels"
+msgid "# ICMP packets sent via TUN"
-msgstr "# các byte được gửi"
+msgstr "# các byte đã gửi qua UDP"
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv4 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1117
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1125
-msgid "ICMP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1202
-msgid "UDP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
-msgid "TCP Packet dropped, have no matching connection information\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1341
 #, fuzzy
-msgid "# Packets received from TUN"
+msgid "# UDP packets sent via TUN"
-msgstr "# các byte đã nh���n qua HTTP"
+msgstr "# các byte đã g���i qua UDP"
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
+#: src/exit/gnunet-daemon-exit.c:2208
 #, fuzzy
-msgid "# Bytes received from TUN"
+msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:1468
-msgid "IPv4 packet options received.  Ignored.\n"
+#, fuzzy
-msgstr ""
+msgid "# UDP IP-exit requests received via cadet"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/exit/gnunet-daemon-exit.c:1397
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1443
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1451
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
-msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1852
+#: src/exit/gnunet-daemon-exit.c:1576
 #, fuzzy
-msgid "# TCP packets sent via TUN"
+msgid "# UDP service requests received via cadet"
-msgstr "# các byte đ�� g���i qua UDP"
+msgstr "# các yêu cầu get (lấy) dht đư��c nh���n"
-#: src/exit/gnunet-daemon-exit.c:1976
+#: src/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:1705
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
-#, fuzzy
-msgid "# Bytes received from CADET"
-msgstr "# các byte đã nhận qua HTTP"
-#: src/exit/gnunet-daemon-exit.c:2062
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
-#: src/exit/gnunet-daemon-exit.c:2169
+#: src/exit/gnunet-daemon-exit.c:1789
-#, fuzzy
-msgid "# TCP data requests received via cadet"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/exit/gnunet-daemon-exit.c:2183
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/exit/gnunet-daemon-exit.c:2245
+#: src/exit/gnunet-daemon-exit.c:1826
 #, fuzzy
-msgid "# ICMP packets sent via TUN"
+msgid "# TCP data requests received via cadet"
-msgstr "# các byte đ�� g���i qua UDP"
+msgstr "# các yêu cầu get (lấy) dht đư��c nh���n"
-#: src/exit/gnunet-daemon-exit.c:2419
+#: src/exit/gnunet-daemon-exit.c:1957
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/exit/gnunet-daemon-exit.c:2669
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2211
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
-#: src/vpn/gnunet-service-vpn.c:2002
+#: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
 #, fuzzy
-msgid "# UDP packets sent via TUN"
+msgid "# Inbound CADET channels created"
-msgstr "# các byte đ�� g��i qua UDP"
+msgstr "# các truy vấn lỗ hổng đư��c đ��nh tuyến"
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:2523
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2542
 #, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
+msgid "# Messages transmitted via cadet channels"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+msgstr "# các byte được gửi"
+#: src/exit/gnunet-daemon-exit.c:2720
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2728
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2802
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:2874
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2922
 #, fuzzy
-msgid "# UDP service requests received via cadet"
+msgid "# Packets received from TUN"
-msgstr "# các yêu cầu get (lấy) dht đư��c nhận"
+msgstr "# các byte đ�� nhận qua HTTP"
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:2936
+#, fuzzy
+msgid "# Bytes received from TUN"
+msgstr "# các byte đã nhận qua HTTP"
+#: src/exit/gnunet-daemon-exit.c:2962
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:2989
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3035
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3043
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, 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:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
@@ -2777,7 +2621,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
@@ -2897,68 +2741,74 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, fuzzy, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -3100,37 +2950,37 @@ msgstr "Lỗi gửi tin nhẳn.\n"
 msgid "Error communicating with `fs' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -3152,76 +3002,76 @@ msgstr ""
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr ""
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
@@ -3257,27 +3107,27 @@ 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:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 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:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 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:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 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:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 #, fuzzy
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
@@ -3378,65 +3228,65 @@ msgstr ""
 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:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 #, 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"
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 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:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
@@ -3570,12 +3420,12 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, 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:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3583,7 +3433,7 @@ msgstr ""
 "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:913
+#: src/fs/gnunet-publish.c:923
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3591,11 +3441,11 @@ msgstr ""
 "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:917
+#: src/fs/gnunet-publish.c:930
 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:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3603,7 +3453,7 @@ msgstr ""
 "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:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3611,12 +3461,12 @@ msgstr ""
 "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:933
+#: src/fs/gnunet-publish.c:955
 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:939
+#: src/fs/gnunet-publish.c:968
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3624,13 +3474,13 @@ msgid ""
 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:943
+#: src/fs/gnunet-publish.c:975
 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:947
+#: src/fs/gnunet-publish.c:982
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3638,7 +3488,7 @@ msgstr ""
 "Đị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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
@@ -3662,62 +3512,62 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 #, 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:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 #, 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:837
+#: src/fs/gnunet-service-fs.c:836
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, 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:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3733,28 +3583,28 @@ msgstr "# các byte kiểu %d được nhận"
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# các byte được gửi"
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
@@ -3859,25 +3709,25 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3918,119 +3768,118 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 msgid "# query plan entries"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
@@ -4085,11 +3934,11 @@ msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 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:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -4113,142 +3962,120 @@ msgstr "Nhận yêu cầu định tuyến\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, 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:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 #, 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:554
+#: src/gns/gnunet-gns.c:440
 #, 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:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 #, 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:563
+#: src/gns/gnunet-gns.c:457
 #, 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:566
+#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr "xác định mức ưu tiên của nội dung"
-#: src/gns/gnunet-gns.c:580
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:260
+#: src/gns/gnunet-gns-helper-service-w32.c:739
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4267,129 +4094,118 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 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:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, fuzzy, c-format
 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:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, 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:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
@@ -4400,51 +4216,51 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4469,21 +4285,21 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 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_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 #, fuzzy
 msgid "GNS REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -4634,28 +4450,28 @@ msgid ""
 "reason to run!\n"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 #, 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:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 #, 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:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 #, 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:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
@@ -4795,7 +4611,7 @@ 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:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4930,43 +4746,43 @@ msgstr "« %s » không sẵn sàng.\n"
 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"
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -5032,19 +4848,24 @@ msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thàn
 msgid "Token `%s' is malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 #, fuzzy
 msgid "Identity Token REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -5089,16 +4910,16 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 #, 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:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5117,7 +4938,7 @@ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -5189,7 +5010,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -5201,7 +5022,7 @@ msgstr "chưa đưa ra tên"
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -5257,72 +5078,72 @@ msgid "Invalid nick `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, 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:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 #, 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:1150
+#: src/namestore/gnunet-namestore.c:1164
 #, 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:1156
+#: src/namestore/gnunet-namestore.c:1176
 #, 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:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -5400,24 +5221,24 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr "kho dữ liệu sqlite"
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr ""
 "\n"
 "CHƯA lưu các thay đổi trong cấu hình.\n"
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "Lỗi lưu cấu hình."
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -5427,23 +5248,23 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "run autoconfiguration"
 msgstr "Cấu hình hạn ngạch"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "Cấu hình GNUnet"
@@ -5466,15 +5287,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
@@ -5621,58 +5433,58 @@ msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5683,7 +5495,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -5701,34 +5513,34 @@ msgstr ""
 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:840
+#: src/nse/gnunet-nse-profiler.c:842
 #, 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:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 #, 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:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 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."
@@ -5827,40 +5639,40 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 #, 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:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -5887,35 +5699,30 @@ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 #, 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:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
@@ -5923,7 +5730,7 @@ msgid ""
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
@@ -5932,7 +5739,7 @@ msgid ""
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -6053,66 +5860,66 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
@@ -6156,42 +5963,42 @@ msgstr ""
 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:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 #, 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:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 #, 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:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 #, 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:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
@@ -6205,11 +6012,11 @@ msgstr "« %s » không phải là một tập tin.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
@@ -6275,7 +6082,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -6300,60 +6107,60 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 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:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# các yêu cầu danh sách máy được nhận"
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6392,29 +6199,30 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -6423,185 +6231,215 @@ msgstr " Không kết nối được (lỗi ?)\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "số lần lặp lại"
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "số lần lặp lại"
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr ""
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "Lỗi gửi tin nhẳn.\n"
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 msgid "GNS name"
 msgstr ""
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 msgid "method name"
 msgstr ""
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, 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:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
@@ -6649,35 +6487,35 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
@@ -6729,12 +6567,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6768,7 +6606,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6784,16 +6622,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-#, fuzzy
+#, fuzzy, c-format
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "%s is stopped"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgstr "# các byte trong kho dữ liệu"
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "Lỗi bắt đầu thu thập.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6804,11 +6687,11 @@ msgstr "Đang đợi các đồng đẳng kết nối"
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -6948,43 +6831,39 @@ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 #, 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:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "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:358
+#: src/testing/gnunet-testing.c:372
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6995,59 +6874,59 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -7112,7 +6991,7 @@ msgid ""
 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:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -7188,210 +7067,210 @@ msgstr "# các khoá phiên chạy được chấp nhận"
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 #, 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:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 #, 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:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 #, 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:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 #, 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:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 #, 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:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 #, 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"
@@ -7508,151 +7387,151 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, 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:499
+#: src/transport/gnunet-transport.c:494
 #, 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:532
+#: src/transport/gnunet-transport.c:527
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, 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:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, 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:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, 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:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 #, 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:1459
+#: src/transport/gnunet-transport.c:1453
 #, 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:1462
+#: src/transport/gnunet-transport.c:1457
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7661,7 +7540,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -7671,160 +7550,160 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 #, 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:622
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
 msgid "iterations"
 msgstr "Tùy chọn chung"
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, 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:628
+#: src/transport/gnunet-transport-profiler.c:636
 #, fuzzy
 msgid "message size to use"
 msgstr "kích cỡ tin nhắn"
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, 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:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, 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:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, 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:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 #, 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:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:2976
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, 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:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, 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:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, 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:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, 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:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, 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:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, 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:3474
+#: src/transport/plugin_transport_http_server.c:3475
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -7871,167 +7750,167 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, 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:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 #, 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:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -8051,73 +7930,199 @@ msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 #, fuzzy
 msgid "# Messages defragmented"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 #, fuzzy
 msgid "# Sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "# các thông báo bị tế phân"
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 #, fuzzy
 msgid "# messages pending (with fragmentation)"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 #, fuzzy
 msgid "# MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 #, fuzzy
 msgid "# ACKs received"
 msgstr "# các byte đã nhận qua TCP"
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 #, fuzzy
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 #, fuzzy
 msgid "# HELLO beacons sent"
 msgstr "# các byte đã gửi qua UDP"
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 #, fuzzy
 msgid "# DATA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 #, fuzzy
 msgid "# DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 #, fuzzy
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
+#: src/transport/tcp_connection_legacy.c:452
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "Không đủ quyền cho « %s ».\n"
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, 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/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, 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/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "\tKhông rõ miền tên « %s »\n"
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1161
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+#: src/transport/tcp_service_legacy.c:1202
+#, fuzzy, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, 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"
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr "Không có người dùng như vậy"
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, 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/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, 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/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, 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/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -8152,7 +8157,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8247,16 +8252,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: 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:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8329,16 +8324,11 @@ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 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:1245
+#: src/util/disk.c:1247
 #, 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:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, 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"
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8394,13 +8384,22 @@ msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr "hiển thị số thứ tự phiên bản"
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8408,16 +8407,48 @@ msgstr ""
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr "hiển thị trợ giúp này"
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr "xuất chi tiết"
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+#: src/util/getopt_helpers.c:488
+#, fuzzy
+msgid "configure logging to write logs to FILENAME"
+msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, fuzzy, c-format
 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/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8438,32 +8469,32 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8523,36 +8554,36 @@ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 msgid "No hostkey file specified on command line\n"
 msgstr ""
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
@@ -8561,23 +8592,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 #, 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"
@@ -8617,17 +8648,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, 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:382
+#: src/util/helper.c:386
 #, 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:601
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -8637,7 +8668,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8650,17 +8681,22 @@ msgid ""
 "variable.\n"
 msgstr ""
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, 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:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+#: src/util/os_installation.c:944
 #, 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:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8685,21 +8721,6 @@ msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 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:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, 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:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, 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:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8733,103 +8754,12 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
-#: src/util/server.c:478 src/util/service_new.c:1111
+#: src/util/service.c:1306
-#, 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:488 src/util/service_new.c:1121
-#, 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:494 src/util/service_new.c:1127
-#, 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:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-#: 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: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:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "Không có người dùng như vậy"
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, 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:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8841,245 +8771,240 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "mg"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "g"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "p"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "g"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " ngày"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " ngày"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 #, fuzzy
 msgid "# Active channels"
 msgstr "# các kết nối dht"
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
 #, fuzzy
-msgid "# Bytes given to cadet for transmission"
+msgid "# Messages dropped in cadet queue (overflow)"
-msgstr "# các thông báo PING được tạo"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
-#: src/vpn/gnunet-service-vpn.c:667
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# ICMP packets received from cadet"
-msgstr "# các byte lo��i b�� b��i UDP (đi ra)"
+msgstr "# các đ��p ��ng l�� hổng được gửi cho trình/máy khách"
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1096
+#, fuzzy
+msgid "# UDP packets received from cadet"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+#: src/vpn/gnunet-service-vpn.c:1255
+#, fuzzy
+msgid "# TCP packets received from cadet"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-#, fuzzy
-msgid "# ICMP packets received from cadet"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/vpn/gnunet-service-vpn.c:2093
-#, fuzzy
-msgid "# UDP packets received from cadet"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/vpn/gnunet-service-vpn.c:2248
-#, fuzzy
-msgid "# TCP packets received from cadet"
-msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
@@ -9113,44 +9038,49 @@ msgstr "« %s » không sẵn sàng.\n"
 msgid "`%s' is not a valid IP address.\n"
 msgstr "« %s » không sẵn sàng.\n"
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 #, fuzzy
 msgid "service is offered via TCP"
 msgstr "# các byte đã nhận qua TCP"
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 #, fuzzy
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr ""
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, fuzzy, c-format
@@ -9168,6 +9098,34 @@ 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 "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+#, fuzzy
+#~ msgid "Request timed out"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
+#, fuzzy
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
+#, fuzzy
+#~ msgid "# Bytes received from other peers"
+#~ msgstr "# các byte kiểu %d được nhận"
+#, fuzzy
+#~ msgid "Specify the public key of the zone to reverse lookup a name for"
+#~ msgstr "xác định mức ưu tiên của nội dung"
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+#, fuzzy
+#~ msgid "# Bytes given to cadet for transmission"
+#~ msgstr "# các thông báo PING được tạo"
+#, fuzzy
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# các yêu cầu dht được định tuyến"
@@ -9988,10 +9946,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 #, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "Lỗi VR."
@@ -10786,19 +10740,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "# wlan messages queued"
 #~ msgstr "# các thông báo phát hiện dht được nhận"
-#~ msgid "print this help"
-#~ msgstr "hiển thị trợ giúp này"
-#~ msgid "print the version number"
-#~ msgstr "hiển thị số thứ tự phiên bản"
-#, fuzzy
-#~ msgid "configure logging to write logs to LOGFILE"
-#~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
-#~ msgid "configure logging to use LOGLEVEL"
-#~ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 #, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f28a878a5..fee065a9d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -30,334 +30,317 @@ msgstr ""
 msgid "Message was sent successfully"
 msgstr ""
-#: src/arm/gnunet-arm.c:224
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
-msgid "ARM API is busy"
-msgstr ""
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-msgid "Request timed out"
-msgstr ""
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
+#: src/arm/gnunet-arm.c:242
-#, c-format
+#, fuzzy
-msgid "%s is stopped"
+msgid "is stopped"
-msgstr ""
+msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
+#: src/arm/gnunet-arm.c:244
-#, c-format
+msgid "is starting"
-msgid "%s is starting"
 msgstr ""
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
+#: src/arm/gnunet-arm.c:246
-#, c-format
+msgid "is stopping"
-msgid "%s is stopping"
 msgstr ""
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
+#: src/arm/gnunet-arm.c:248
-#, c-format
+msgid "is starting already"
-msgid "%s is starting already"
 msgstr ""
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
+#: src/arm/gnunet-arm.c:250
-#, c-format
+msgid "is stopping already"
-msgid "%s is stopping already"
 msgstr ""
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
+#: src/arm/gnunet-arm.c:252
-#, c-format
+msgid "is started already"
-msgid "%s is started already"
 msgstr ""
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
+#: src/arm/gnunet-arm.c:254
-#, c-format
+msgid "is stopped already"
-msgid "%s is stopped already"
 msgstr ""
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
+#: src/arm/gnunet-arm.c:256
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service is not known to ARM"
+msgid "service is not known to ARM"
 msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
+#: src/arm/gnunet-arm.c:258
-#, fuzzy, c-format
+#, fuzzy
-msgid "%s service failed to start"
+msgid "service failed to start"
 msgstr "运行 %s失败：%s %d\n"
-#: src/arm/gnunet-arm.c:266
+#: src/arm/gnunet-arm.c:260
-#, c-format
+msgid "service cannot be manipulated because ARM is shutting down"
-msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
+#: src/arm/gnunet-arm.c:262
-#, c-format
+#, fuzzy
-msgid "%.s Unknown result code."
+msgid "Unknown result code."
-msgstr ""
+msgstr "未知的用户“%s”\n"
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:365
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:376
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:415
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:425
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:469
+#: src/arm/gnunet-arm.c:462
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:480
+#: src/arm/gnunet-arm.c:473
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败：%s %d\n"
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:513
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:522
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-#: src/arm/gnunet-arm.c:536
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr ""
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
+#: src/transport/plugin_transport_tcp.c:1139
-#: src/transport/plugin_transport_tcp.c:658
+#: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
+#: src/transport/plugin_transport_tcp.c:3824
-#: src/util/service.c:590 src/util/service_new.c:637
+#: src/transport/tcp_service_legacy.c:576
-#: src/util/service_new.c:643
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2621
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
+#: src/transport/plugin_transport_tcp.c:1259
-#: src/util/service_new.c:782
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
+#: src/transport/plugin_transport_http_server.c:2639
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
+#: src/transport/plugin_transport_tcp.c:1278
-#: src/util/service_new.c:802
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:944
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
-#: src/arm/gnunet-service-arm.c:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -387,31 +370,27 @@ msgid ""
 "%llu\n"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3293
+#: src/ats/gnunet-ats-solver-eval.c:3294
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
-msgid "experiment to use"
-msgstr ""
 #: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 #, fuzzy
 msgid "print logging"
 msgstr "未知的命令“%s”。\n"
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
@@ -518,7 +497,7 @@ msgstr ""
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -561,7 +540,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -595,196 +573,195 @@ msgstr ""
 msgid "Valid type required\n"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "初始化“%s”服务失败。\n"
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 msgid "public auction outcome"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
-#: src/cadet/gnunet-cadet.c:779
+#: src/cadet/gnunet-cadet.c:775
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 msgid "No action requested\n"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:933
-msgid "activate echo mode"
+msgid "Activate echo mode"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:935
+#: src/cadet/gnunet-cadet.c:938
-msgid "dump debug information to STDERR"
+msgid "Dump debug information to STDERR"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:938
+#: src/cadet/gnunet-cadet.c:944
-msgid "port to listen to"
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:969
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/cadet/gnunet-service-cadet_peer.c:687
+#: src/consensus/gnunet-consensus-profiler.c:523
-msgid "Wrong CORE service\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
-msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:505
+#: src/consensus/gnunet-consensus-profiler.c:535
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
-#: src/set/gnunet-set-profiler.c:384
+#: src/set/gnunet-set-profiler.c:462
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:514
+#: src/consensus/gnunet-consensus-profiler.c:554
-#: src/set/gnunet-set-profiler.c:390
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:517
+#: src/consensus/gnunet-consensus-profiler.c:559
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
@@ -1037,15 +1014,15 @@ msgstr "您必须指定一个昵称\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
@@ -1071,8 +1048,8 @@ msgid ""
 "played back to you..."
 msgstr ""
-#: src/conversation/gnunet_gst.c:630
+#: src/conversation/gnunet_gst.c:622
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1082,59 +1059,59 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
-#: src/conversation/gnunet-helper-audio-playback.c:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
-#: src/conversation/gnunet-helper-audio-playback.c:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1198,7 +1175,7 @@ msgstr "“%s”说：%s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -1271,37 +1248,42 @@ msgstr "“%s”的参数无效。\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 msgid "provide information about all current connections (continuously)"
 msgstr ""
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 msgid "# messages discarded (session disconnected)"
 msgstr ""
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+#: src/core/gnunet-service-core.c:985
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
@@ -1314,127 +1296,127 @@ msgstr ""
 msgid "# bytes decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 msgid "# ephemeral keys received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 msgid "# PING messages dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# PONG messages created"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 msgid "# sessions terminated by timeout"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# keepalive messages sent"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# PONG messages decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 msgid "# session keys confirmed via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# timeouts prevented via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 msgid "# DATA message dropped (out of order)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, 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:1496
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "# sessions terminated by key expiration"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1557
+#: src/core/gnunet-service-core_kx.c:1590
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1616
 msgid "# bytes dropped (duplicates)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 msgid "# bytes dropped (ancient message)"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# bytes of payload decrypted"
 msgstr ""
-#: src/core/gnunet-service-core_kx.c:1681
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
+#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1467,7 +1449,7 @@ msgid "# updates to my type map"
 msgstr ""
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 msgid "# bytes stored"
 msgstr ""
@@ -1506,17 +1488,17 @@ msgstr ""
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
-#: src/datacache/plugin_datacache_sqlite.c:77
+#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:86
+#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datastore/plugin_datastore_mysql.c:1024
+#: src/datastore/plugin_datastore_mysql.c:980
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/namestore/plugin_namestore_sqlite.c:53
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1529,68 +1511,68 @@ msgstr "sqlite 数据仓库"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-#: src/datacache/plugin_datacache_sqlite.c:749
+#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:415
+#: src/datastore/plugin_datastore_sqlite.c:475
-#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr ""
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 msgid "# status messages received"
 msgstr ""
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr ""
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 msgid "# datastore connections (re)created"
 msgstr ""
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 msgid "# PUT requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 msgid "# RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 msgid "# REMOVE requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr ""
@@ -1599,211 +1581,211 @@ msgstr ""
 msgid "Failed to store item: %s, aborting\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 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:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:629
+#: src/datastore/gnunet-service-datastore.c:634
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:689
-#: src/datastore/gnunet-service-datastore.c:969
+#: src/datastore/gnunet-service-datastore.c:977
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 msgid "# GET requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# GET KEY requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 msgid "# GET REPLICATION requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 msgid "# REMOVE requests received"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1293
+#: src/datastore/gnunet-service-datastore.c:1307
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/datastore/gnunet-service-datastore.c:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1711
+#: src/datastore/gnunet-service-datastore.c:1725
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1741
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
-#: src/datastore/plugin_datastore_mysql.c:347
+#: src/datastore/plugin_datastore_mysql.c:377
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-#: src/datastore/plugin_datastore_mysql.c:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1811,39 +1793,34 @@ msgstr ""
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-#: src/datastore/plugin_datastore_sqlite.c:263
+#: src/datastore/plugin_datastore_sqlite.c:281
-#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:213
+#: src/namestore/plugin_namestore_sqlite.c:222
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
-#: src/datastore/plugin_datastore_sqlite.c:692
+#: src/datastore/plugin_datastore_sqlite.c:1234
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
-#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1249
+#: src/datastore/plugin_datastore_sqlite.c:1312
-#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/namestore/plugin_namestore_sqlite.c:802
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
@@ -1867,44 +1844,41 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Issueing DHT GET with key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-get.c:283
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 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:271
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
@@ -1914,43 +1888,43 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
@@ -1967,88 +1941,78 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:482
+#: src/dht/gnunet-service-dht_clients.c:485
-#: src/dht/gnunet-service-wdht_clients.c:945
 msgid "# PUT requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:621
+#: src/dht/gnunet-service-dht_clients.c:624
-#: src/dht/gnunet-service-wdht_clients.c:1011
 msgid "# GET requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:847
+#: src/dht/gnunet-service-dht_clients.c:850
-#: src/dht/gnunet-service-wdht_clients.c:1220
 msgid "# GET STOP requests received from clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1032
+#: src/dht/gnunet-service-dht_clients.c:1035
-#: src/dht/gnunet-service-wdht_clients.c:510
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1047
+#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-wdht_clients.c:524
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1093
+#: src/dht/gnunet-service-dht_clients.c:1096
-#: src/dht/gnunet-service-wdht_clients.c:566
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1100
+#: src/dht/gnunet-service-dht_clients.c:1103
-#: src/dht/gnunet-service-wdht_clients.c:589
 msgid "# RESULTS queued for clients"
 msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1178
+#: src/dht/gnunet-service-dht_clients.c:1181
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
@@ -2091,100 +2055,90 @@ msgid "# GET requests given to datacache"
 msgstr ""
 #: src/dht/gnunet-service-dht_hello.c:86
-#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 msgid "# FIND PEER messages initiated"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 msgid "# requests TTL-dropped"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1046
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1063
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 msgid "# Peer selection failed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 msgid "# PUT requests routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1290
+#: src/dht/gnunet-service-dht_neighbours.c:1306
-#: src/dht/gnunet-service-dht_neighbours.c:1430
+#: src/dht/gnunet-service-dht_neighbours.c:1446
-#: src/dht/gnunet-service-dht_neighbours.c:1533
+#: src/dht/gnunet-service-dht_neighbours.c:1549
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 msgid "# GET requests routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 msgid "# P2P PUT requests received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 msgid "# P2P PUT bytes received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 msgid "# P2P GET requests received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 msgid "# P2P GET bytes received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 msgid "# P2P RESULT bytes received"
 msgstr ""
@@ -2192,155 +2146,48 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr ""
-#: src/dht/gnunet-service-wdht_clients.c:653
+#: src/dht/plugin_block_dht.c:187
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-msgid "# Bytes received from other peers"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-#: src/dht/plugin_block_dht.c:167
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2380,27 +2227,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
-#: src/dns/gnunet-dns-monitor.c:354
+#: src/dns/gnunet-dns-monitor.c:370
-msgid "only monitor DNS replies"
-msgstr ""
-#: src/dns/gnunet-dns-monitor.c:365
 msgid "Monitor DNS queries."
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
@@ -2420,248 +2263,244 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 msgid "# DNS requests received via TUN interface"
 msgstr ""
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr ""
 #: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
+#: src/exit/gnunet-daemon-exit.c:961
-#, fuzzy
+msgid "# TCP packets sent via TUN"
-msgid "# Inbound CADET channels created"
 msgstr ""
-"\n"
-"按任意键继续\n"
-#: src/exit/gnunet-daemon-exit.c:860
+#: src/exit/gnunet-daemon-exit.c:1062
-#, c-format
+msgid "# ICMP packets sent via TUN"
-msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:913
+#: src/exit/gnunet-daemon-exit.c:1341
-#, fuzzy
+msgid "# UDP packets sent via TUN"
-msgid "# Bytes transmitted via cadet channels"
 msgstr ""
-"\n"
-"按任意键继续\n"
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:2208
+msgid "# Bytes received from CADET"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
+#: src/exit/gnunet-daemon-exit.c:1468
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
+msgid "# UDP IP-exit requests received via cadet"
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1117
+#: src/exit/gnunet-daemon-exit.c:1576
-msgid "# ICMP packets dropped (not allowed)"
+msgid "# UDP service requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1125
+#: src/exit/gnunet-daemon-exit.c:1616
-msgid "ICMP Packet dropped, have no matching connection information\n"
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1202
+#: src/exit/gnunet-daemon-exit.c:1705
-msgid "UDP Packet dropped, have no matching connection information\n"
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1789
-msgid "TCP Packet dropped, have no matching connection information\n"
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1330
+#: src/exit/gnunet-daemon-exit.c:1826
-msgid "# Packets received from TUN"
+msgid "# TCP data requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1344
+#: src/exit/gnunet-daemon-exit.c:1957
-msgid "# Bytes received from TUN"
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1370
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1397
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#, c-format
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1443
+#: src/exit/gnunet-daemon-exit.c:2211
-#, c-format
+msgid "# ICMP service requests received via cadet"
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1451
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
-#, c-format
+#: src/vpn/gnunet-service-vpn.c:2096
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1852
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
-msgid "# TCP packets sent via TUN"
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1976
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
-msgid "# TCP service creation requests received via cadet"
+#, fuzzy
+msgid "# Inbound CADET channels created"
 msgstr ""
+"\n"
+"按任意键继续\n"
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
+#: src/exit/gnunet-daemon-exit.c:2523
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
+#, c-format
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
+msgid "Got duplicate service records for `%s:%u'\n"
-#: src/exit/gnunet-daemon-exit.c:3056
-msgid "# Bytes received from CADET"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2062
+#: src/exit/gnunet-daemon-exit.c:2542
-msgid "# TCP IP-exit creation requests received via cadet"
+#, fuzzy
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
+"\n"
+"按任意键继续\n"
-#: src/exit/gnunet-daemon-exit.c:2169
+#: src/exit/gnunet-daemon-exit.c:2720
-msgid "# TCP data requests received via cadet"
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2183
+#: src/exit/gnunet-daemon-exit.c:2728
-msgid "# TCP DATA requests dropped (no session)"
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2245
+#: src/exit/gnunet-daemon-exit.c:2802
-msgid "# ICMP packets sent via TUN"
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2419
+#: src/exit/gnunet-daemon-exit.c:2874
-msgid "# ICMP IP-exit requests received via cadet"
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2669
+#: src/exit/gnunet-daemon-exit.c:2922
-msgid "# ICMP service requests received via cadet"
+msgid "# Packets received from TUN"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
+#: src/exit/gnunet-daemon-exit.c:2936
-#: src/vpn/gnunet-service-vpn.c:2002
+msgid "# Bytes received from TUN"
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
+#: src/exit/gnunet-daemon-exit.c:2962
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
+msgid "IPv4 packet options received.  Ignored.\n"
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2840
+#: src/exit/gnunet-daemon-exit.c:2989
-msgid "# UDP packets sent via TUN"
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2956
+#: src/exit/gnunet-daemon-exit.c:3035
-msgid "# UDP IP-exit requests received via cadet"
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3059
+#: src/exit/gnunet-daemon-exit.c:3043
-msgid "# UDP service requests received via cadet"
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 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:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 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:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
@@ -2670,7 +2509,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr ""
@@ -2783,67 +2622,73 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2978,36 +2823,36 @@ msgstr "发送消息失败。\n"
 msgid "Error communicating with `fs' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr ""
@@ -3028,76 +2873,76 @@ msgstr ""
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr ""
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr ""
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
@@ -3133,27 +2978,27 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
@@ -3253,61 +3098,61 @@ msgstr ""
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr ""
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr ""
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 msgid "Special file-sharing operations"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
@@ -3437,61 +3282,61 @@ 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:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
-#: src/fs/gnunet-publish.c:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 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:917
+#: src/fs/gnunet-publish.c:930
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:955
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
@@ -3513,57 +3358,57 @@ msgstr ""
 msgid "Could not start searching.\n"
 msgstr ""
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 msgid "# replies received for local clients"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 msgid "# client searches received"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3577,27 +3422,27 @@ msgstr ""
 msgid "# replies received via cadet dropped"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 msgid "# queries received via CADET not answered"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 msgid "# Blocks transferred via cadet"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 msgid "# queries received via cadet"
 msgstr ""
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
-#: src/fs/gnunet-service-fs_cadet_server.c:391
+#: src/fs/gnunet-service-fs_cadet_server.c:395
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
@@ -3693,25 +3538,25 @@ msgstr "创建用户出错"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3747,111 +3592,110 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 msgid "# Pending requests created"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# Replies received from CADET"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1562
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1438
 msgid "# on-demand blocks matched requests"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
+#: src/fs/gnunet-service-fs_pr.c:1626
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1540
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr ""
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
@@ -3902,11 +3746,11 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
@@ -3930,135 +3774,114 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 msgid "No DNS server specified!\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 msgid "No valid GNS zone specified!\n"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
+#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-#: src/gns/gnunet-gns.c:484
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 msgid "Specify the type of the record to lookup"
 msgstr ""
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 msgid "Specify timeout for the lookup"
 msgstr ""
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:563
+#: src/gns/gnunet-gns.c:457
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
-#: src/gns/gnunet-gns.c:566
+#: src/gns/gnunet-gns.c:476
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr ""
-#: src/gns/gnunet-gns.c:580
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
-#: src/gns/gnunet-gns-helper-service-w32.c:221
+#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Transmission to client failed!\n"
+msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
 msgstr ""
-#: src/gns/gnunet-gns-helper-service-w32.c:836
+#: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4077,129 +3900,118 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite：%s。\n"
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-proxy.c:3172
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/gns/gnunet-gns-proxy.c:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
-#: src/gns/gnunet-service-gns.c:585
+#: src/gns/gnunet-service-gns.c:442
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
@@ -4209,51 +4021,51 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4278,21 +4090,21 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 msgid "GNS REST API initialized\n"
 msgstr ""
@@ -4441,25 +4253,25 @@ msgid ""
 "reason to run!\n"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
@@ -4593,7 +4405,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4720,43 +4532,43 @@ msgstr "“%s”不可用。\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "发送消息失败。\n"
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "发送消息失败。\n"
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
@@ -4821,18 +4633,23 @@ msgstr "%s：选项“%s”有歧义\n"
 msgid "Token `%s' is malformed\n"
 msgstr "“%s”的参数无效。\n"
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 msgid "Identity Token REST API initialized\n"
 msgstr ""
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "解析配置文件“%s”失败\n"
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -4877,15 +4694,15 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4904,7 +4721,7 @@ msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -4976,7 +4793,7 @@ msgid ""
 msgstr ""
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -4988,7 +4805,7 @@ msgstr ""
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -5044,72 +4861,72 @@ msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1176
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
@@ -5187,23 +5004,23 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr "sqlite 数据仓库"
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 msgid "Namestore REST API initialized\n"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr ""
 "\n"
 "您的配置更改没有保存。\n"
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "保存配置失败。"
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -5213,23 +5030,23 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "run autoconfiguration"
 msgstr "配额配置"
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "GNUnet 配置"
@@ -5251,15 +5068,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
@@ -5405,57 +5213,57 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 msgid "Connection reversal request failed\n"
 msgstr ""
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5466,7 +5274,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -5483,33 +5291,33 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5603,40 +5411,40 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -5663,35 +5471,30 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "peerstore"
 msgstr ""
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
-#: src/peerstore/peerstore_api.c:296
+#: src/peerstore/peerstore_api.c:350
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-#: src/peerstore/peerstore_api.c:344
 msgid "timeout"
 msgstr ""
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知，不应出现这种情况。\n"
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
@@ -5699,7 +5502,7 @@ msgid ""
 "  %s\n"
 msgstr "创建用户出错"
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
@@ -5708,7 +5511,7 @@ msgid ""
 "  %s\n"
 msgstr "创建用户出错"
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
@@ -5829,58 +5632,58 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 msgid "# DNS requests intercepted"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 msgid "# DNS replies received"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1262
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
@@ -5923,42 +5726,42 @@ msgstr ""
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
@@ -5972,11 +5775,11 @@ msgstr "服务已删除。\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
@@ -6041,7 +5844,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
@@ -6066,59 +5869,59 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口，将使用默认。\n"
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 msgid "# unsupported revocations received via set union"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 msgid "# revocation messages received via set union"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
 "\n"
 "按任意键继续\n"
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:519
+#: src/revocation/gnunet-service-revocation.c:524
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
@@ -6157,29 +5960,30 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6188,185 +5992,215 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "无法连接到 %s:%u：%s\n"
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "迭代次数"
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "迭代次数"
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr ""
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "“%s”的参数无效。\n"
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "“%s”的参数无效。\n"
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "发送消息失败。\n"
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 msgid "GNS name"
 msgstr ""
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 msgid "method name"
 msgstr ""
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "每次迭代所使用的消息数量"
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "解析配置文件“%s”失败\n"
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6414,35 +6248,35 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr ""
@@ -6494,12 +6328,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
-#: src/testbed/generate-underlay-topology.c:339
+#: src/testbed/generate-underlay-topology.c:342
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6533,7 +6367,7 @@ msgid ""
 "deployments"
 msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6549,16 +6383,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/testbed/gnunet-service-testbed_peers.c:1159
-#, fuzzy
+#, c-format
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "%s is stopped"
-msgstr "初始化“%s”服务失败。\n"
+msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is starting already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "服务已删除。\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "运行 %s失败：%s %d\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6568,11 +6447,11 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 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 "
@@ -6712,43 +6591,39 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6759,58 +6634,58 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -6871,7 +6746,7 @@ msgid ""
 msgstr ""
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
@@ -6940,185 +6815,185 @@ msgstr ""
 msgid "# DISCONNECT messages sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1310
+#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 msgid "# SYN_ACK messages sent"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 msgid "# SYN messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 msgid "# SYN_ACK messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3114
+#: src/transport/gnunet-service-transport_neighbours.c:3128
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 msgid "# ACK messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 msgid "# unexpected ACK messages"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 msgid "# quota messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 msgid "# QUOTA messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 msgid "# DISCONNECT messages received"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
@@ -7232,148 +7107,148 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, c-format
 msgid "Received %u bytes\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr ""
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7382,7 +7257,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -7392,158 +7267,158 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 msgid "receive data from peer"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "iterations"
 msgstr ""
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "每次迭代所使用的消息数量"
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 #, fuzzy
 msgid "message size to use"
 msgstr "消息尺寸"
-#: src/transport/plugin_transport_http_client.c:1477
+#: src/transport/plugin_transport_http_client.c:1474
-#: src/transport/plugin_transport_http_server.c:2248
+#: src/transport/plugin_transport_http_server.c:2249
-#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_http_server.c:3463
-#: src/transport/plugin_transport_tcp.c:3403
+#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2167
+#: src/transport/plugin_transport_http_client.c:2164
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3178
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
-#: src/transport/plugin_transport_http_client.c:2184
+#: src/transport/plugin_transport_http_client.c:2181
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_server.c:3248
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
-#: src/transport/plugin_transport_http_server.c:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 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:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_http_server.c:2838
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:2976
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
-#: src/transport/plugin_transport_http_server.c:3474
+#: src/transport/plugin_transport_http_server.c:3475
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -7590,164 +7465,164 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1547
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1730
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1954
-#: src/transport/plugin_transport_tcp.c:2650
+#: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:4013
 msgid "# TCP sessions active"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1772
-#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1936
-#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:2060
-#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:2133
-#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:2233
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:2258
 msgid "# bytes currently in TCP buffers"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 msgid "# TCP WELCOME messages received"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2972
+#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3689
+#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3797
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_udp.c:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_udp.c:3869
+#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
@@ -7767,63 +7642,189 @@ msgstr "发送消息失败。\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 msgid "# Messages defragmented"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:803
+#: src/transport/plugin_transport_wlan.c:829
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:914
 msgid "# Sessions allocated"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 msgid "# messages pending (with fragmentation)"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1167
+#: src/transport/plugin_transport_wlan.c:1193
-#: src/transport/plugin_transport_wlan.c:1258
+#: src/transport/plugin_transport_wlan.c:1284
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:2305
 msgid "# MAC endpoints allocated"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 msgid "# ACKs received"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 msgid "# HELLO beacons sent"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 msgid "# DATA messages received"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 msgid "# DATA messages processed"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 msgid "# sessions allocated"
 msgstr ""
+#: src/transport/tcp_connection_legacy.c:452
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1161
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr "无此用户"
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”：%s\n"
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -7858,7 +7859,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7949,16 +7950,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
-#: src/util/connection.c:441
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8031,16 +8022,11 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/disk.c:1245
+#: src/util/disk.c:1247
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8096,27 +8082,67 @@ msgstr "%s：选项“-W %s”有歧义\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "配置文件“%s”已写入。\n"
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr ""
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr ""
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr ""
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "更改配置文件中的一个值"
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
+#: src/util/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8137,32 +8163,32 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "立即保存配置？"
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
@@ -8222,36 +8248,36 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "No hostkey file specified on command line\n"
 msgstr ""
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
@@ -8260,23 +8286,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
@@ -8316,17 +8342,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -8336,7 +8362,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8349,17 +8375,22 @@ msgid ""
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
-#: src/util/os_installation.c:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+#: src/util/os_installation.c:944
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8384,21 +8415,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8432,103 +8448,12 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
-#: src/util/server.c:478 src/util/service_new.c:1111
+#: src/util/service.c:1306
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-#: src/util/server.c:494 src/util/service_new.c:1127
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/server.c:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-#: src/util/service.c:1170
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-#: src/util/service.c:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "无此用户"
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-#: src/util/service.c:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-#: src/util/service_new.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8540,237 +8465,233 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "毫秒"
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "秒"
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "分"
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "时"
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " 天"
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " 天"
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
-#: src/util/strings.c:1749
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 msgid "# Active channels"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:629
+#: src/vpn/gnunet-service-vpn.c:599
-msgid "# Bytes given to cadet for transmission"
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+#: src/vpn/gnunet-service-vpn.c:753
+msgid "# ICMP packets received from cadet"
+msgstr ""
+#: src/vpn/gnunet-service-vpn.c:1096
+msgid "# UDP packets received from cadet"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:667
+#: src/vpn/gnunet-service-vpn.c:1255
-msgid "# Bytes dropped in cadet queue (overflow)"
+msgid "# TCP packets received from cadet"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 msgid "# Packets received from TUN interface"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1754
+#: src/vpn/gnunet-service-vpn.c:2364
-msgid "# ICMP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2093
-msgid "# UDP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2248
-msgid "# TCP packets received from cadet"
-msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2399
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 msgid "# Active destinations"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
@@ -8804,42 +8725,47 @@ msgstr "“%s”不可用。\n"
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr ""
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr ""
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
@@ -8857,6 +8783,18 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 #, fuzzy
+#~ msgid "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "初始化“%s”服务失败。\n"
+#, fuzzy
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "初始化“%s”服务失败。\n"
+#, fuzzy
 #~ msgid "Could not connect to cadet service\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
@@ -9209,10 +9147,6 @@ msgstr ""
 #~ msgstr "解析配置文件“%s”失败\n"
 #, fuzzy
-#~ msgid "Failed to close statement %p: %d\n"
-#~ msgstr "解析配置文件“%s”失败\n"
-#, fuzzy
 #~ msgid "Failed to initialize solver!\n"
 #~ msgstr "无法初始化 SQLite：%s。\n"
@@ -9368,10 +9302,6 @@ msgstr ""
 #~ msgstr "解析配置文件“%s”失败\n"
 #, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "解析配置文件“%s”失败\n"
-#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "未知错误。\n"
@@ -9771,10 +9701,6 @@ msgstr ""
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
-#, fuzzy
-#~ msgid "Service `%s' stopped\n"
-#~ msgstr "服务已删除。\n"
 #~ msgid "KiB"
 #~ msgstr "KiB"
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 4811bc8d7..53b37b558 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -1,4 +1,4 @@
-# This Makefile.am is in the public domain
+#t This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 pkgcfgdir= $(pkgdatadir)/config.d/
@@ -60,6 +60,7 @@ libgnunetatstesting_la_SOURCES = \
 libgnunetatstesting_la_LIBADD = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 libgnunetatstesting_la_DEPENDENCIES = \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index decf473a9..3fdeffe13 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1583,7 +1583,7 @@ GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 * @param window_changes Function called when the transmit window size changes.
 * @param disconnects Function called when a channel is disconnected.
 * @param handlers Callbacks for messages we care about, NULL-terminated.
- * @return Port handle.
+ * @return Port handle, NULL if port is in use
 */
 struct GNUNET_CADET_Port *
 GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
@@ -1604,17 +1604,21 @@ GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
  p = GNUNET_new (struct GNUNET_CADET_Port);
  p->cadet = h;
  p->id = *port;
+  if (GNUNET_OK !=
+      GNUNET_CONTAINER_multihashmap_put (h->ports,
+                                         &p->id,
+                                         p,
+                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+  {
+    GNUNET_free (p);
+    return NULL;
+  }
  p->connects = connects;
  p->cls = connects_cls;
  p->window_changes = window_changes;
  p->disconnects = disconnects;
  p->handlers = GNUNET_MQ_copy_handlers (handlers);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multihashmap_put (h->ports,
-                                                    &p->id,
-                                                    p,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
  env = GNUNET_MQ_msg (msg,
                       GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN);
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 5f43bfe80..7d319e51e 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -1270,6 +1270,14 @@ handle_client_register_message (void *cls,
                                       NULL,
                                       &inbound_end,
                                       cadet_handlers);
+  if (NULL == line->port)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Could not open line, port %s already in use!\n"),
+                GNUNET_h2s (&msg->line_port));
+    GNUNET_SERVICE_client_drop (line->client);
+    return;
+  }
  GNUNET_SERVICE_client_continue (line->client);
 }
diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c
index 9e0ee205e..891343e17 100644
--- a/src/datastore/gnunet-datastore.c
+++ b/src/datastore/gnunet-datastore.c
@@ -23,101 +23,136 @@
 * @brief tool to manipulate datastores
 * @author Christian Grothoff
 */
+#include <inttypes.h>
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datastore_service.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+struct DataRecord
+{
+  /**
+   * Number of bytes in the item (NBO).
+   */
+  uint32_t size GNUNET_PACKED;
+  /**
+   * Type of the item (NBO) (actually an enum GNUNET_BLOCK_Type)
+   */
+  uint32_t type GNUNET_PACKED;
+  /**
+   * Priority of the item (NBO).
+   */
+  uint32_t priority GNUNET_PACKED;
+  /**
+   * Desired anonymity level (NBO).
+   */
+  uint32_t anonymity GNUNET_PACKED;
+  /**
+   * Desired replication level (NBO).
+   */
+  uint32_t replication GNUNET_PACKED;
+  /**
+   * Expiration time (NBO).
+   */
+  struct GNUNET_TIME_AbsoluteNBO expiration;
+  /**
+   * Key under which the item can be found.
+   */
+  struct GNUNET_HashCode key;
+};
+GNUNET_NETWORK_STRUCT_END
 /**
- * Name of the second configuration file.
+ * Length of our magic header.
 */
-static char *alternative_cfg;
+static const size_t MAGIC_LEN = 16;
 /**
- * Global return value.
+ * Magic header bytes.
 */
-static int ret;
+static const uint8_t MAGIC_BYTES[16] = "GNUNETDATASTORE1";
+/**
+ * Dump the database.
+ */
+static int dump;
 /**
- * Our offset on 'get'.
+ * Insert into the database.
 */
-static uint64_t offset;
+static int insert;
 /**
- * First UID ever returned.
+ * Dump file name.
 */
-static uint64_t first_uid;
+static char *file_name;
 /**
- * Configuration for the source database.
+ * Dump file handle.
 */
-static struct GNUNET_CONFIGURATION_Handle *scfg;
+static struct GNUNET_DISK_FileHandle *file_handle;
 /**
- * Handle for database source.
+ * Global return value.
 */
-static struct GNUNET_DATASTORE_Handle *db_src;
+static int ret;
 /**
- * Handle for database destination.
+ * Handle for datastore.
 */
-static struct GNUNET_DATASTORE_Handle *db_dst;
+static struct GNUNET_DATASTORE_Handle *datastore;
 /**
 * Current operation.
 */
 static struct GNUNET_DATASTORE_QueueEntry *qe;
+/**
+ * Record count.
+ */
+static uint64_t record_count;
 static void
 do_shutdown (void *cls)
 {
  if (NULL != qe)
    GNUNET_DATASTORE_cancel (qe);
-  GNUNET_DATASTORE_disconnect (db_src, GNUNET_NO);
+  if (NULL != datastore)
-  GNUNET_DATASTORE_disconnect (db_dst, GNUNET_NO);
+    GNUNET_DATASTORE_disconnect (datastore, GNUNET_NO);
-  GNUNET_CONFIGURATION_destroy (scfg);
+  if (NULL != file_handle)
+    GNUNET_DISK_file_close (file_handle);
 }
 /**
- * Perform next GET operation.
+ * Begin dumping the database.
 */
 static void
-do_get (void);
+start_dump (void);
 /**
- * Continuation called to notify client about result of the
+ * Begin inserting into the database.
- * operation.
- *
- * @param cls closure
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop)
- *                GNUNET_NO if content was already there
- *                GNUNET_YES (or other positive value) on success
- * @param min_expiration minimum expiration time required for 0-priority content to be stored
- *                by the datacache at this time, zero for unknown, forever if we have no
- *                space for 0-priority content
- * @param msg NULL on success, otherwise an error message
 */
 static void
-do_finish (void *cls,
+start_insert (void);
-           int32_t success,
-           struct GNUNET_TIME_Absolute min_expiration,
-           const char *msg)
+/**
-{
+ * Perform next GET operation.
-  qe = NULL;
+ */
-  if (GNUNET_SYSERR == success)
+static void
-  {
+do_get (const uint64_t next_uid);
-    fprintf (stderr,
-             _("Failed to store item: %s, aborting\n"),
-             msg);
-    ret = 1;
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  do_get ();
-}
 /**
@@ -136,7 +171,7 @@ do_finish (void *cls,
 *        maybe 0 if no unique identifier is available
 */
 static void
-do_put (void *cls,
+get_cb (void *cls,
        const struct GNUNET_HashCode *key,
        size_t size,
        const void *data,
@@ -144,33 +179,63 @@ do_put (void *cls,
        uint32_t priority,
        uint32_t anonymity,
        uint32_t replication,
-        struct GNUNET_TIME_Absolute
+        struct GNUNET_TIME_Absolute expiration,
-        expiration,
        uint64_t uid)
 {
  qe = NULL;
-  if ( (0 != offset) &&
+  if (NULL == key)
-       (uid == first_uid) )
  {
+    FPRINTF (stderr,
+             _("Dumped %" PRIu64 " records\n"),
+             record_count);
+    GNUNET_DISK_file_close (file_handle);
+    file_handle = NULL;
+    if (insert)
+      start_insert();
+    else
+    {
+      ret = 0;
+      GNUNET_SCHEDULER_shutdown ();
+    }
+    return;
+  }
+  struct DataRecord dr;
+  dr.size = htonl ((uint32_t) size);
+  dr.type = htonl (type);
+  dr.priority = htonl (priority);
+  dr.anonymity = htonl (anonymity);
+  dr.replication = htonl (replication);
+  dr.expiration = GNUNET_TIME_absolute_hton (expiration);
+  dr.key = *key;
+  ssize_t len;
+  len = GNUNET_DISK_file_write (file_handle, &dr, sizeof (dr));
+  if (sizeof (dr) != len)
+  {
+    FPRINTF (stderr,
+             _("Short write to file: %zd bytes expecting %zd\n"),
+             len,
+             sizeof (dr));
+    ret = 1;
    GNUNET_SCHEDULER_shutdown ();
    return;
  }
-  if (0 == offset)
-    first_uid = uid;
+  len = GNUNET_DISK_file_write (file_handle, data, size);
-  qe = GNUNET_DATASTORE_put (db_dst,
+  if (size != len)
-                             0,
+  {
-                             key,
+    FPRINTF (stderr,
-                             size,
+             _("Short write to file: %zd bytes expecting %zd\n"),
-                             data,
+             len,
-                             type,
+             size);
-                             priority,
+    ret = 1;
-                             anonymity,
+    GNUNET_SCHEDULER_shutdown ();
-                             replication,
+    return;
-                             expiration,
+  }
-                             0,
-                             1,
+  record_count++;
-                             &do_finish,
+  do_get(uid + 1);
-                             NULL);
 }
@@ -178,64 +243,236 @@ do_put (void *cls,
 * Perform next GET operation.
 */
 static void
-do_get ()
+do_get (const uint64_t next_uid)
 {
-  qe = GNUNET_DATASTORE_get_key (db_src,
+  GNUNET_assert (NULL == qe);
-                                 0, false,
+  qe = GNUNET_DATASTORE_get_key (datastore,
-                                 NULL, GNUNET_BLOCK_TYPE_ANY,
+                                 next_uid,
-                                 0, 1,
+                                 false /* random */,
-                                 &do_put, NULL);
+                                 NULL /* key */,
+                                 GNUNET_BLOCK_TYPE_ANY,
+                                 0 /* queue_priority */,
+                                 1 /* max_queue_size */,
+                                 &get_cb,
+                                 NULL /* proc_cls */);
+  if (NULL == qe)
+  {
+    FPRINTF (stderr,
+             _("Error queueing datastore GET operation\n"));
+    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+  }
 }
+/**
+ * Begin dumping the database.
+ */
+static void
+start_dump ()
+{
+  record_count = 0;
+  if (NULL != file_name)
+  {
+    file_handle = GNUNET_DISK_file_open (file_name,
+                                         GNUNET_DISK_OPEN_WRITE |
+                                         GNUNET_DISK_OPEN_TRUNCATE |
+                                         GNUNET_DISK_OPEN_CREATE,
+                                         GNUNET_DISK_PERM_USER_READ |
+                                         GNUNET_DISK_PERM_USER_WRITE);
+    if (NULL == file_handle)
+    {
+      FPRINTF (stderr,
+               _("Unable to open dump file: %s\n"),
+               file_name);
+      ret = 1;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+  }
+  else
+  {
+    file_handle = GNUNET_DISK_get_handle_from_int_fd (STDOUT_FILENO);
+  }
+  GNUNET_DISK_file_write (file_handle, MAGIC_BYTES, MAGIC_LEN);
+  do_get(0);
+}
 /**
- * Main function that will be run by the scheduler.
+ * Continuation called to notify client about result of the
+ * operation.
 *
 * @param cls closure
- * @param args remaining command-line arguments
+ * @param success GNUNET_SYSERR on failure (including timeout/queue drop)
- * @param cfgfile name of the configuration file used
+ *                GNUNET_NO if content was already there
- * @param cfg configuration -- for destination datastore
+ *                GNUNET_YES (or other positive value) on success
+ * @param min_expiration minimum expiration time required for 0-priority content to be stored
+ *                by the datacache at this time, zero for unknown, forever if we have no
+ *                space for 0-priority content
+ * @param msg NULL on success, otherwise an error message
 */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+put_cb (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+        int32_t success,
+        struct GNUNET_TIME_Absolute min_expiration,
+        const char *msg)
 {
-  if (NULL == alternative_cfg)
+  qe = NULL;
-    return; /* nothing to be done */
+  if (GNUNET_SYSERR == success)
-  if (0 == strcmp (cfgfile, alternative_cfg))
  {
-    fprintf (stderr,
+    FPRINTF (stderr,
-             _("Cannot use the same configuration for source and destination\n"));
+             _("Failed to store item: %s, aborting\n"),
+             msg);
    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
    return;
  }
-  scfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK !=
+  struct DataRecord dr;
-      GNUNET_CONFIGURATION_load (scfg,
+  ssize_t len;
-                                 alternative_cfg))
+  len = GNUNET_DISK_file_read (file_handle, &dr, sizeof (dr));
+  if (0 == len)
+  {
+    FPRINTF (stderr,
+             _("Inserted %" PRIu64 " records\n"),
+             record_count);
+    ret = 0;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  else if (sizeof (dr) != len)
  {
-    GNUNET_CONFIGURATION_destroy (scfg);
+    FPRINTF (stderr,
+             _("Short read from file: %zd bytes expecting %zd\n"),
+             len,
+             sizeof (dr));
    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
    return;
  }
-  db_src = GNUNET_DATASTORE_connect (scfg);
-  if (NULL == db_src)
+  const size_t size = ntohl (dr.size);
+  uint8_t data[size];
+  len = GNUNET_DISK_file_read (file_handle, data, size);
+  if (size != len)
  {
-    GNUNET_CONFIGURATION_destroy (scfg);
+    FPRINTF (stderr,
+             _("Short read from file: %zd bytes expecting %zd\n"),
+             len,
+             size);
    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
    return;
  }
-  db_dst = GNUNET_DATASTORE_connect (cfg);
-  if (NULL == db_dst)
+  record_count++;
+  qe = GNUNET_DATASTORE_put (datastore,
+                             0,
+                             &dr.key,
+                             size,
+                             data,
+                             ntohl (dr.type),
+                             ntohl (dr.priority),
+                             ntohl (dr.anonymity),
+                             ntohl (dr.replication),
+                             GNUNET_TIME_absolute_ntoh (dr.expiration),
+                             0,
+                             1,
+                             &put_cb,
+                             NULL);
+  if (NULL == qe)
  {
-    GNUNET_DATASTORE_disconnect (db_src, GNUNET_NO);
+    FPRINTF (stderr,
-    GNUNET_CONFIGURATION_destroy (scfg);
+             _("Error queueing datastore PUT operation\n"));
    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+  }
+}
+/**
+ * Begin inserting into the database.
+ */
+static void
+start_insert ()
+{
+  record_count = 0;
+  if (NULL != file_name)
+  {
+    file_handle = GNUNET_DISK_file_open (file_name,
+                                         GNUNET_DISK_OPEN_READ,
+                                         GNUNET_DISK_PERM_NONE);
+    if (NULL == file_handle)
+    {
+      FPRINTF (stderr,
+               _("Unable to open dump file: %s\n"),
+               file_name);
+      ret = 1;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+  }
+  else
+  {
+    file_handle = GNUNET_DISK_get_handle_from_int_fd (STDIN_FILENO);
+  }
+  uint8_t buf[MAGIC_LEN];
+  ssize_t len;
+  len = GNUNET_DISK_file_read (file_handle, buf, MAGIC_LEN);
+  if (len != MAGIC_LEN ||
+      0 != memcmp (buf, MAGIC_BYTES, MAGIC_LEN))
+  {
+    FPRINTF (stderr,
+             _("Input file is not of a supported format\n"));
    return;
  }
+  put_cb (NULL, GNUNET_YES, GNUNET_TIME_UNIT_ZERO_ABS, NULL);
+}
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
-  do_get ();
+  datastore = GNUNET_DATASTORE_connect (cfg);
+  if (NULL == datastore)
+  {
+    FPRINTF (stderr,
+             _("Failed connecting to the datastore.\n"));
+    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (dump)
+    start_dump();
+  else if (insert)
+    start_insert();
+  else
+  {
+    FPRINTF (stderr,
+             _("Please choose at least one operation: %s, %s\n"),
+             "dump",
+             "insert");
+    ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+  }
 }
@@ -247,14 +484,23 @@ run (void *cls, char *const *args, const char *cfgfile,
 * @return 0 ok, 1 on error
 */
 int
-main (int argc, char *const *argv)
+main (int argc,
+      char *const *argv)
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_filename ('s',
+    GNUNET_GETOPT_option_flag ('d',
-                                   "sourcecfg",
+                               "dump",
+                               gettext_noop ("Dump all records from the datastore"),
+                               &dump),
+    GNUNET_GETOPT_option_flag ('i',
+                               "insert",
+                               gettext_noop ("Insert records into the datastore"),
+                               &insert),
+    GNUNET_GETOPT_option_filename ('f',
+                                   "file",
                                   "FILENAME",
-                                   gettext_noop ("specifies the configuration to use to access an alternative datastore; will merge that datastore into our current datastore"),
+                                   gettext_noop ("File to dump or insert"),
-                                       &alternative_cfg),
+                                   &file_name),
    GNUNET_GETOPT_OPTION_END
  };
  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 277530843..53ba858e4 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -733,41 +733,23 @@ check_data (const struct DataMessage *dm)
 /**
- * Context for a PUT request used to see if the content is
- * already present.
- */
-struct PutContext
-{
-  /**
-   * Client to notify on completion.
-   */
-  struct GNUNET_SERVICE_Client *client;
-#if ! HAVE_UNALIGNED_64_ACCESS
-  void *reserved;
-#endif
-  /* followed by the 'struct DataMessage' */
-};
-/**
 * Put continuation.
 *
 * @param cls closure
 * @param key key for the item stored
 * @param size size of the item stored
- * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param status #GNUNET_OK if inserted, #GNUNET_NO if updated,
+ *        or #GNUNET_SYSERROR if error
 * @param msg error message on error
 */
 static void
 put_continuation (void *cls,
-                  const struct GNUNET_HashCode *key,
+                  const struct GNUNET_HashCode *key,
-                  uint32_t size,
+                  uint32_t size,
                  int status,
-                  const char *msg)
+                  const char *msg)
 {
-  struct PutContext *pc = cls;
+  struct GNUNET_SERVICE_Client *client = cls;
  if (GNUNET_OK == status)
  {
@@ -782,10 +764,9 @@ put_continuation (void *cls,
                size,
                GNUNET_h2s (key));
  }
-  transmit_status (pc->client,
+  transmit_status (client,
-                   status,
+                   GNUNET_SYSERR == status ? GNUNET_SYSERR : GNUNET_OK,
                   msg);
-  GNUNET_free (pc);
  if (quota - reserved - cache_size < payload)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -799,125 +780,6 @@ put_continuation (void *cls,
 /**
- * Actually put the data message.
- *
- * @param pc put context
- */
-static void
-execute_put (struct PutContext *pc)
-{
-  const struct DataMessage *dm;
-  dm = (const struct DataMessage *) &pc[1];
-  plugin->api->put (plugin->api->cls,
-                    &dm->key,
-                    ntohl (dm->size),
-                    &dm[1],
-                    ntohl (dm->type),
-                    ntohl (dm->priority),
-                    ntohl (dm->anonymity),
-                    ntohl (dm->replication),
-                    GNUNET_TIME_absolute_ntoh (dm->expiration),
-                    &put_continuation,
-                    pc);
-}
-/**
- *
- * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
- * @param msg error message on error
- */
-static void
-check_present_continuation (void *cls,
-                            int status,
-                            const char *msg)
-{
-  struct GNUNET_SERVICE_Client *client = cls;
-  transmit_status (client,
-                   GNUNET_NO,
-                   NULL);
-}
-/**
- * Function that will check if the given datastore entry
- * matches the put and if none match executes the put.
- *
- * @param cls closure, pointer to the client (of type `struct PutContext`).
- * @param key key for the content
- * @param size number of bytes in data
- * @param data content stored
- * @param type type of the content
- * @param priority priority of the content
- * @param anonymity anonymity-level for the content
- * @param replication replication-level for the content
- * @param expiration expiration time for the content
- * @param uid unique identifier for the datum;
- *        maybe 0 if no unique identifier is available
- * @return #GNUNET_OK usually
- *         #GNUNET_NO to delete the item
- */
-static int
-check_present (void *cls,
-               const struct GNUNET_HashCode *key,
-               uint32_t size,
-               const void *data,
-               enum GNUNET_BLOCK_Type type,
-               uint32_t priority,
-               uint32_t anonymity,
-               uint32_t replication,
-               struct GNUNET_TIME_Absolute expiration,
-               uint64_t uid)
-{
-  struct PutContext *pc = cls;
-  const struct DataMessage *dm;
-  dm = (const struct DataMessage *) &pc[1];
-  if (key == NULL)
-  {
-    execute_put (pc);
-    return GNUNET_OK;
-  }
-  if ( (GNUNET_BLOCK_TYPE_FS_DBLOCK == type) ||
-       (GNUNET_BLOCK_TYPE_FS_IBLOCK == type) ||
-       ( (size == ntohl (dm->size)) &&
-         (0 == memcmp (&dm[1],
-                       data,
-                       size)) ) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Result already present in datastore\n");
-    if ( (ntohl (dm->priority) > 0) ||
-         (ntohl (dm->replication) > 0) ||
-         (GNUNET_TIME_absolute_ntoh (dm->expiration).abs_value_us >
-          expiration.abs_value_us) )
-      plugin->api->update (plugin->api->cls,
-                           uid,
-                           ntohl (dm->priority),
-                           ntohl (dm->replication),
-                           GNUNET_TIME_absolute_ntoh (dm->expiration),
-                           &check_present_continuation,
-                           pc->client);
-    else
-    {
-      transmit_status (pc->client,
-                       GNUNET_NO,
-                       NULL);
-    }
-    GNUNET_free (pc);
-  }
-  else
-  {
-    execute_put (pc);
-  }
-  return GNUNET_OK;
-}
-/**
 * Verify PUT-message.
 *
 * @param cls identification of the client
@@ -950,8 +812,6 @@ handle_put (void *cls,
  struct GNUNET_SERVICE_Client *client = cls;
  int rid;
  struct ReservationList *pos;
-  struct PutContext *pc;
-  struct GNUNET_HashCode vhash;
  uint32_t size;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -979,30 +839,20 @@ handle_put (void *cls,
                             GNUNET_NO);
    }
  }
-  pc = GNUNET_malloc (sizeof (struct PutContext) + size +
+  bool absent = GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (filter,
-                      sizeof (struct DataMessage));
+                                                                &dm->key);
-  pc->client = client;
+  plugin->api->put (plugin->api->cls,
-  GNUNET_memcpy (&pc[1],
+                    &dm->key,
-                 dm,
+                    absent,
-                 size + sizeof (struct DataMessage));
+                    ntohl (dm->size),
-  if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (filter,
+                    &dm[1],
-                                                       &dm->key))
+                    ntohl (dm->type),
-  {
+                    ntohl (dm->priority),
-    GNUNET_CRYPTO_hash (&dm[1],
+                    ntohl (dm->anonymity),
-                        size,
+                    ntohl (dm->replication),
-                        &vhash);
+                    GNUNET_TIME_absolute_ntoh (dm->expiration),
-    plugin->api->get_key (plugin->api->cls,
+                    &put_continuation,
-                          0,
+                    client);
-                          false,
-                          &dm->key,
-                          &vhash,
-                          ntohl (dm->type),
-                          &check_present,
-                          pc);
-    GNUNET_SERVICE_client_continue (client);
-    return;
-  }
-  execute_put (pc);
  GNUNET_SERVICE_client_continue (client);
 }
@@ -1030,7 +880,6 @@ handle_get (void *cls,
                        GNUNET_ntohll (msg->next_uid),
                        msg->random,
                        NULL,
-                        NULL,
                        ntohl (msg->type),
                        &transmit_item,
                        client);
@@ -1082,7 +931,6 @@ handle_get_key (void *cls,
                        GNUNET_ntohll (msg->next_uid),
                        msg->random,
                        &msg->key,
-                        NULL,
                        ntohl (msg->type),
                        &transmit_item,
                        client);
@@ -1151,50 +999,46 @@ handle_get_zero_anonymity (void *cls,
 /**
- * Callback function that will cause the item that is passed
+ * Remove continuation.
- * in to be deleted (by returning #GNUNET_NO).
 *
 * @param cls closure
 * @param key key for the content
 * @param size number of bytes in data
- * @param data content stored
+ * @param status #GNUNET_OK if removed, #GNUNET_NO if not found,
- * @param type type of the content
+ *        or #GNUNET_SYSERROR if error
- * @param priority priority of the content
+ * @param msg error message on error
- * @param anonymity anonymity-level for the content
- * @param replication replication-level for the content
- * @param expiration expiration time for the content
- * @param uid unique identifier for the datum
- * @return #GNUNET_OK to keep the item
- *         #GNUNET_NO to delete the item
 */
-static int
+static void
-remove_callback (void *cls,
+remove_continuation (void *cls,
-                 const struct GNUNET_HashCode *key,
+                     const struct GNUNET_HashCode *key,
-                 uint32_t size,
+                     uint32_t size,
-                 const void *data,
+                     int status,
-                 enum GNUNET_BLOCK_Type type,
+                     const char *msg)
-                 uint32_t priority,
-                 uint32_t anonymity,
-                 uint32_t replication,
-                 struct GNUNET_TIME_Absolute expiration,
-                 uint64_t uid)
 {
  struct GNUNET_SERVICE_Client *client = cls;
-  if (NULL == key)
+  if (GNUNET_SYSERR == status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "REMOVE request failed: %s.\n",
+                msg);
+    transmit_status (client,
+                     GNUNET_NO,
+                     msg);
+    return;
+  }
+  if (GNUNET_NO == status)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "No further matches for REMOVE request.\n");
+                "Content not found for REMOVE request.\n");
    transmit_status (client,
                     GNUNET_NO,
                     _("Content not found"));
-    return GNUNET_OK;           /* last item */
+    return;
  }
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Item %llu matches REMOVE request for key `%s' and type %u.\n",
+              "Item matches REMOVE request for key `%s'.\n",
-              (unsigned long long) uid,
+              GNUNET_h2s (key));
-              GNUNET_h2s (key),
-              type);
  GNUNET_STATISTICS_update (stats,
                            gettext_noop ("# bytes removed (explicit request)"),
                            size,
@@ -1204,7 +1048,6 @@ remove_callback (void *cls,
  transmit_status (client,
                   GNUNET_OK,
                   NULL);
-  return GNUNET_NO;
 }
@@ -1240,26 +1083,19 @@ handle_remove (void *cls,
               const struct DataMessage *dm)
 {
  struct GNUNET_SERVICE_Client *client = cls;
-  struct GNUNET_HashCode vhash;
  GNUNET_STATISTICS_update (stats,
                            gettext_noop ("# REMOVE requests received"),
                            1, GNUNET_NO);
-  GNUNET_CRYPTO_hash (&dm[1],
-                      ntohl (dm->size),
-                      &vhash);
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Processing REMOVE request for `%s' of type %u\n",
+              "Processing REMOVE request for `%s'\n",
-              GNUNET_h2s (&dm->key),
+              GNUNET_h2s (&dm->key));
-              (uint32_t) ntohl (dm->type));
+  plugin->api->remove_key (plugin->api->cls,
-  plugin->api->get_key (plugin->api->cls,
+                           &dm->key,
-                        0,
+                           ntohl (dm->size),
-                        false,
+                           &dm[1],
-                        &dm->key,
+                           &remove_continuation,
-                        &vhash,
+                           client);
-                        (enum GNUNET_BLOCK_Type) ntohl (dm->type),
-                        &remove_callback,
-                        client);
  GNUNET_SERVICE_client_continue (client);
 }
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index 2f9502989..d6f44bf9f 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -181,8 +181,14 @@ do_put (struct CpsRunContext *crc)
  value[0] = crc->i;
  GNUNET_memcpy (&value[4], &i, sizeof (i));
  prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
-  crc->api->put (crc->api->cls, &key, size, value, 1 + i % 4 /* type */ ,
+  crc->api->put (crc->api->cls,
-                 prio, i % 4 /* anonymity */ ,
+                 &key,
+                 false /* absent */,
+                 size,
+                 value,
+                 1 + i % 4 /* type */ ,
+                 prio,
+                 i % 4 /* anonymity */ ,
                 0 /* replication */ ,
                 GNUNET_TIME_relative_to_absolute
                 (GNUNET_TIME_relative_multiply
@@ -190,7 +196,8 @@ do_put (struct CpsRunContext *crc)
                    60 * 60 * 60 * 1000 +
                    GNUNET_CRYPTO_random_u32
                      (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                 put_continuation, crc);
+                 put_continuation,
+                 crc);
  i++;
 }
diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c
index d04c1cf60..9950f7ab2 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -195,10 +195,89 @@ heap_plugin_estimate_size (void *cls, unsigned long long *estimate)
 /**
+ * Closure for iterator for updating.
+ */
+struct UpdateContext
+{
+  /**
+   * Number of bytes in 'data'.
+   */
+  uint32_t size;
+  /**
+   * Pointer to the data.
+   */
+  const void *data;
+  /**
+   * Priority of the value.
+   */
+  uint32_t priority;
+  /**
+   * Replication level for the value.
+   */
+  uint32_t replication;
+  /**
+   * Expiration time for this value.
+   */
+  struct GNUNET_TIME_Absolute expiration;
+  /**
+   * True if the value was found and updated.
+   */
+  bool updated;
+};
+/**
+ * Update the matching value.
+ *
+ * @param cls the 'struct UpdateContext'
+ * @param key unused
+ * @param val the 'struct Value'
+ * @return GNUNET_YES (continue iteration), GNUNET_NO if value was found
+ */
+static int
+update_iterator (void *cls,
+                 const struct GNUNET_HashCode *key,
+                 void *val)
+{
+  struct UpdateContext *uc = cls;
+  struct Value *value = val;
+  if (value->size != uc->size)
+    return GNUNET_YES;
+  if (0 != memcmp (value->data, uc->data, uc->size))
+    return GNUNET_YES;
+  uc->expiration = GNUNET_TIME_absolute_max (value->expiration,
+                                             uc->expiration);
+  if (value->expiration.abs_value_us != uc->expiration.abs_value_us)
+  {
+    value->expiration = uc->expiration;
+    GNUNET_CONTAINER_heap_update_cost (value->expire_heap,
+                                       value->expiration.abs_value_us);
+  }
+  /* Saturating adds, don't overflow */
+  if (value->priority > UINT32_MAX - uc->priority)
+    value->priority = UINT32_MAX;
+  else
+    value->priority += uc->priority;
+  if (value->replication > UINT32_MAX - uc->replication)
+    value->replication = UINT32_MAX;
+  else
+    value->replication += uc->replication;
+  uc->updated = true;
+  return GNUNET_NO;
+}
+/**
 * Store an item in the datastore.
 *
 * @param cls closure
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in data
 * @param data content stored
 * @param type type of the content
@@ -211,19 +290,40 @@ heap_plugin_estimate_size (void *cls, unsigned long long *estimate)
 */
 static void
 heap_plugin_put (void *cls,
-                 const struct GNUNET_HashCode * key,
+                 const struct GNUNET_HashCode *key,
-                 uint32_t size,
+                 bool absent,
-                 const void *data,
+                 uint32_t size,
-                 enum GNUNET_BLOCK_Type type,
+                 const void *data,
-                 uint32_t priority, uint32_t anonymity,
+                 enum GNUNET_BLOCK_Type type,
-                 uint32_t replication,
+                 uint32_t priority,
-                 struct GNUNET_TIME_Absolute expiration,
+                 uint32_t anonymity,
-                 PluginPutCont cont,
+                 uint32_t replication,
-                 void *cont_cls)
+                 struct GNUNET_TIME_Absolute expiration,
+                 PluginPutCont cont,
+                 void *cont_cls)
 {
  struct Plugin *plugin = cls;
  struct Value *value;
+  if (!absent) {
+    struct UpdateContext uc;
+    uc.size = size;
+    uc.data = data;
+    uc.priority = priority;
+    uc.replication = replication;
+    uc.expiration = expiration;
+    uc.updated = false;
+    GNUNET_CONTAINER_multihashmap_get_multiple (plugin->keyvalue,
+                                                key,
+                                                &update_iterator,
+                                                &uc);
+    if (uc.updated)
+    {
+      cont (cont_cls, key, size, GNUNET_NO, NULL);
+      return;
+    }
+  }
  value = GNUNET_malloc (sizeof (struct Value) + size);
  value->key = *key;
  value->data = &value[1];
@@ -333,11 +433,6 @@ struct GetContext
  struct Value *value;
  /**
-   * Requested value hash.
-   */
-  const struct GNUNET_HashCode *vhash;
-  /**
   * Requested type.
   */
  enum GNUNET_BLOCK_Type type;
@@ -365,17 +460,10 @@ get_iterator (void *cls,
 {
  struct GetContext *gc = cls;
  struct Value *value = val;
-  struct GNUNET_HashCode vh;
  if ( (gc->type != GNUNET_BLOCK_TYPE_ANY) &&
       (gc->type != value->type) )
    return GNUNET_OK;
-  if (NULL != gc->vhash)
-  {
-    GNUNET_CRYPTO_hash (&value[1], value->size, &vh);
-    if (0 != memcmp (&vh, gc->vhash, sizeof (struct GNUNET_HashCode)))
-      return GNUNET_OK;
-  }
  if (gc->random)
  {
    gc->value = value;
@@ -398,23 +486,20 @@ get_iterator (void *cls,
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key maybe NULL (to match all entries)
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
- * @param proc function to call on each matching value;
+ * @param proc function to call on the matching value;
 *        will be called with NULL if nothing matches
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
 */
 static void
-heap_plugin_get_key (void *cls, uint64_t next_uid, bool random,
+heap_plugin_get_key (void *cls,
-                     const struct GNUNET_HashCode *key,
+                     uint64_t next_uid,
-                     const struct GNUNET_HashCode *vhash,
+                     bool random,
-                     enum GNUNET_BLOCK_Type type, PluginDatumProcessor proc,
+                     const struct GNUNET_HashCode *key,
-                     void *proc_cls)
+                     enum GNUNET_BLOCK_Type type,
+                     PluginDatumProcessor proc,
+                     void *proc_cls)
 {
  struct Plugin *plugin = cls;
  struct GetContext gc;
@@ -422,7 +507,6 @@ heap_plugin_get_key (void *cls, uint64_t next_uid, bool random,
  gc.value = NULL;
  gc.next_uid = next_uid;
  gc.random = random;
-  gc.vhash = vhash;
  gc.type = type;
  if (NULL == key)
  {
@@ -442,20 +526,17 @@ heap_plugin_get_key (void *cls, uint64_t next_uid, bool random,
    proc (proc_cls, NULL, 0, NULL, 0, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
    return;
  }
-  if (GNUNET_NO ==
+  GNUNET_assert (GNUNET_OK ==
-      proc (proc_cls,
+                 proc (proc_cls,
-            &gc.value->key,
+                       &gc.value->key,
-            gc.value->size,
+                       gc.value->size,
-            &gc.value[1],
+                       &gc.value[1],
-            gc.value->type,
+                       gc.value->type,
-            gc.value->priority,
+                       gc.value->priority,
-            gc.value->anonymity,
+                       gc.value->anonymity,
-            gc.value->replication,
+                       gc.value->replication,
-            gc.value->expiration,
+                       gc.value->expiration,
-            (uint64_t) (intptr_t) gc.value))
+                       (uint64_t) (intptr_t) gc.value));
-  {
-    delete_value (plugin, gc.value);
-  }
 }
@@ -499,18 +580,17 @@ heap_plugin_get_replication (void *cls,
                                                            value->replication);
    value = GNUNET_CONTAINER_heap_walk_get_next (plugin->by_replication);
  }
-  if (GNUNET_NO ==
+  GNUNET_assert (GNUNET_OK ==
-      proc (proc_cls,
+                 proc (proc_cls,
-            &value->key,
+                       &value->key,
-            value->size,
+                       value->size,
-            &value[1],
+                       &value[1],
-            value->type,
+                       value->type,
-            value->priority,
+                       value->priority,
-            value->anonymity,
+                       value->anonymity,
-            value->replication,
+                       value->replication,
-            value->expiration,
+                       value->expiration,
-            (uint64_t) (intptr_t) value))
+                       (uint64_t) (intptr_t) value));
-    delete_value (plugin, value);
 }
@@ -551,57 +631,6 @@ heap_plugin_get_expiration (void *cls, PluginDatumProcessor proc,
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls our `struct Plugin *`
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls continuation closure
- */
-static void
-heap_plugin_update (void *cls,
-                    uint64_t uid,
-                    uint32_t priority,
-                    uint32_t replication,
-                    struct GNUNET_TIME_Absolute expire,
-                    PluginUpdateCont cont,
-                    void *cont_cls)
-{
-  struct Value *value;
-  value = (struct Value*) (intptr_t) uid;
-  GNUNET_assert (NULL != value);
-  if (value->expiration.abs_value_us != expire.abs_value_us)
-  {
-    value->expiration = expire;
-    GNUNET_CONTAINER_heap_update_cost (value->expire_heap,
-                                       expire.abs_value_us);
-  }
-  /* Saturating adds, don't overflow */
-  if (value->priority > UINT32_MAX - priority)
-    value->priority = UINT32_MAX;
-  else
-    value->priority += priority;
-  if (value->replication > UINT32_MAX - replication)
-    value->replication = UINT32_MAX;
-  else
-    value->replication += replication;
-  cont (cont_cls, GNUNET_OK, NULL);
-}
-/**
 * Call the given processor on an item with zero anonymity.
 *
 * @param cls our "struct Plugin*"
@@ -641,18 +670,17 @@ heap_plugin_get_zero_anonymity (void *cls, uint64_t next_uid,
    proc (proc_cls, NULL, 0, NULL, 0, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0);
    return;
  }
-  if (GNUNET_NO ==
+  GNUNET_assert (GNUNET_OK ==
-      proc (proc_cls,
+                 proc (proc_cls,
-            &value->key,
+                       &value->key,
-            value->size,
+                       value->size,
-            &value[1],
+                       &value[1],
-            value->type,
+                       value->type,
-            value->priority,
+                       value->priority,
-            value->anonymity,
+                       value->anonymity,
-            value->replication,
+                       value->replication,
-            value->expiration,
+                       value->expiration,
-            (uint64_t) (intptr_t) value))
+                       (uint64_t) (intptr_t) value));
-    delete_value (plugin, value);
 }
@@ -730,6 +758,102 @@ heap_get_keys (void *cls,
 /**
+ * Closure for iterator called during 'remove_key'.
+ */
+struct RemoveContext
+{
+  /**
+   * Value found.
+   */
+  struct Value *value;
+  /**
+   * Size of data.
+   */
+  uint32_t size;
+  /**
+   * Data to remove.
+   */
+  const void *data;
+};
+/**
+ * Obtain the matching value with the lowest uid >= next_uid.
+ *
+ * @param cls the 'struct GetContext'
+ * @param key unused
+ * @param val the 'struct Value'
+ * @return GNUNET_YES (continue iteration), GNUNET_NO if result was found
+ */
+static int
+remove_iterator (void *cls,
+                 const struct GNUNET_HashCode *key,
+                 void *val)
+{
+  struct RemoveContext *rc = cls;
+  struct Value *value = val;
+  if (value->size != rc->size)
+    return GNUNET_YES;
+  if (0 != memcmp (value->data, rc->data, rc->size))
+    return GNUNET_YES;
+  rc->value = value;
+  return GNUNET_NO;
+}
+/**
+ * Remove a particular key in the datastore.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
+ */
+static void
+heap_plugin_remove_key (void *cls,
+                        const struct GNUNET_HashCode *key,
+                        uint32_t size,
+                        const void *data,
+                        PluginRemoveCont cont,
+                        void *cont_cls)
+{
+  struct Plugin *plugin = cls;
+  struct RemoveContext rc;
+  rc.value = NULL;
+  rc.size = size;
+  rc.data = data;
+  GNUNET_CONTAINER_multihashmap_get_multiple (plugin->keyvalue,
+                                              key,
+                                              &remove_iterator,
+                                              &rc);
+  if (NULL == rc.value)
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_NO,
+          NULL);
+    return;
+  }
+  delete_value (plugin,
+                rc.value);
+  cont (cont_cls,
+        key,
+        size,
+        GNUNET_OK,
+        NULL);
+}
+/**
 * Entry point for the plugin.
 *
 * @param cls the "struct GNUNET_DATASTORE_PluginEnvironment*"
@@ -758,13 +882,13 @@ libgnunet_plugin_datastore_heap_init (void *cls)
  api->cls = plugin;
  api->estimate_size = &heap_plugin_estimate_size;
  api->put = &heap_plugin_put;
-  api->update = &heap_plugin_update;
  api->get_key = &heap_plugin_get_key;
  api->get_replication = &heap_plugin_get_replication;
  api->get_expiration = &heap_plugin_get_expiration;
  api->get_zero_anonymity = &heap_plugin_get_zero_anonymity;
  api->drop = &heap_plugin_drop;
  api->get_keys = &heap_get_keys;
+  api->remove_key = &heap_plugin_remove_key;
  GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "heap",
                   _("Heap database running\n"));
  return api;
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 6f2a76499..708e35860 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -150,6 +150,12 @@ struct Plugin
 #define DELETE_ENTRY_BY_UID "DELETE FROM gn090 WHERE uid=?"
  struct GNUNET_MYSQL_StatementHandle *delete_entry_by_uid;
+#define DELETE_ENTRY_BY_HASH_VALUE "DELETE FROM gn090 "\
+  "WHERE hash = ? AND "\
+  "value = ? "\
+  "LIMIT 1"
+  struct GNUNET_MYSQL_StatementHandle *delete_entry_by_hash_value;
 #define RESULT_COLUMNS "repl, type, prio, anonLevel, expire, hash, value, uid"
 #define SELECT_ENTRY "SELECT " RESULT_COLUMNS " FROM gn090 "\
@@ -159,22 +165,13 @@ struct Plugin
  struct GNUNET_MYSQL_StatementHandle *select_entry;
 #define SELECT_ENTRY_BY_HASH "SELECT " RESULT_COLUMNS " FROM gn090 "\
-  "FORCE INDEX (idx_hash) "\
+  "FORCE INDEX (idx_hash_type_uid) "\
  "WHERE hash=? AND "\
  "uid >= ? AND "\
  "(rvalue >= ? OR 0 = ?) "\
  "ORDER BY uid LIMIT 1"
  struct GNUNET_MYSQL_StatementHandle *select_entry_by_hash;
-#define SELECT_ENTRY_BY_HASH_AND_VHASH "SELECT " RESULT_COLUMNS " FROM gn090 "\
-  "FORCE INDEX (idx_hash_vhash) "\
-  "WHERE hash = ? AND "\
-  "vhash = ? AND "\
-  "uid >= ? AND "\
-  "(rvalue >= ? OR 0 = ?) "\
-  "ORDER BY uid LIMIT 1"
-  struct GNUNET_MYSQL_StatementHandle *select_entry_by_hash_and_vhash;
 #define SELECT_ENTRY_BY_HASH_AND_TYPE "SELECT " RESULT_COLUMNS " FROM gn090 "\
  "FORCE INDEX (idx_hash_type_uid) "\
  "WHERE hash = ? AND "\
@@ -184,22 +181,11 @@ struct Plugin
  "ORDER BY uid LIMIT 1"
  struct GNUNET_MYSQL_StatementHandle *select_entry_by_hash_and_type;
-#define SELECT_ENTRY_BY_HASH_VHASH_AND_TYPE "SELECT " RESULT_COLUMNS " "\
-  "FROM gn090 "\
-  "FORCE INDEX (idx_hash_vhash) "\
-  "WHERE hash = ? AND "\
-  "vhash = ? AND "\
-  "type = ? AND "\
-  "uid >= ? AND "\
-  "(rvalue >= ? OR 0 = ?) "\
-  "ORDER BY uid LIMIT 1"
-  struct GNUNET_MYSQL_StatementHandle *select_entry_by_hash_vhash_and_type;
 #define UPDATE_ENTRY "UPDATE gn090 SET "\
  "prio = prio + ?, "\
  "repl = repl + ?, "\
-  "expire = IF(expire >= ?, expire, ?) "\
+  "expire = GREATEST(expire, ?) "\
-  "WHERE uid = ?"
+  "WHERE hash = ? AND vhash = ?"
  struct GNUNET_MYSQL_StatementHandle *update_entry;
 #define DEC_REPL "UPDATE gn090 SET repl=GREATEST (1, repl) - 1 WHERE uid=?"
@@ -330,6 +316,7 @@ mysql_plugin_estimate_size (void *cls,
 *
 * @param cls closure
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in @a data
 * @param data content stored
 * @param type type of the content
@@ -343,6 +330,7 @@ mysql_plugin_estimate_size (void *cls,
 static void
 mysql_plugin_put (void *cls,
                  const struct GNUNET_HashCode *key,
+                  bool absent,
                  uint32_t size,
                  const void *data,
                  enum GNUNET_BLOCK_Type type,
@@ -355,9 +343,54 @@ mysql_plugin_put (void *cls,
 {
  struct Plugin *plugin = cls;
  uint64_t lexpiration = expiration.abs_value_us;
+  struct GNUNET_HashCode vhash;
+  GNUNET_CRYPTO_hash (data,
+                      size,
+                      &vhash);
+  if (!absent)
+  {
+    struct GNUNET_MY_QueryParam params_update[] = {
+      GNUNET_MY_query_param_uint32 (&priority),
+      GNUNET_MY_query_param_uint32 (&replication),
+      GNUNET_MY_query_param_uint64 (&lexpiration),
+      GNUNET_MY_query_param_auto_from_type (key),
+      GNUNET_MY_query_param_auto_from_type (&vhash),
+      GNUNET_MY_query_param_end
+    };
+    if (GNUNET_OK !=
+        GNUNET_MY_exec_prepared (plugin->mc,
+                                 plugin->update_entry,
+                                 params_update))
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            _("MySQL statement run failure"));
+      return;
+    }
+    MYSQL_STMT *stmt = GNUNET_MYSQL_statement_get_stmt (plugin->update_entry);
+    my_ulonglong rows = mysql_stmt_affected_rows (stmt);
+    GNUNET_break (GNUNET_NO ==
+                  GNUNET_MY_extract_result (plugin->update_entry,
+                                            NULL));
+    if (0 != rows)
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_NO,
+            NULL);
+      return;
+    }
+  }
  uint64_t lrvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
                                               UINT64_MAX);
-  struct GNUNET_HashCode vhash;
  struct GNUNET_MY_QueryParam params_insert[] = {
    GNUNET_MY_query_param_uint32 (&replication),
    GNUNET_MY_query_param_uint32 (&type),
@@ -377,9 +410,6 @@ mysql_plugin_put (void *cls,
    cont (cont_cls, key, size, GNUNET_SYSERR, _("Data too large"));
    return;
  }
-  GNUNET_CRYPTO_hash (data,
-                      size,
-                      &vhash);
  if (GNUNET_OK !=
      GNUNET_MY_exec_prepared (plugin->mc,
@@ -412,76 +442,6 @@ mysql_plugin_put (void *cls,
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls our "struct Plugin*"
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls continuation closure
- */
-static void
-mysql_plugin_update (void *cls,
-                     uint64_t uid,
-                     uint32_t priority,
-                     uint32_t replication,
-                     struct GNUNET_TIME_Absolute expire,
-                     PluginUpdateCont cont,
-                     void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  uint64_t lexpire = expire.abs_value_us;
-  int ret;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Updating value %llu adding %d to priority %d to replication and maxing exp at %s\n",
-              (unsigned long long) uid,
-              priority,
-              replication,
-              GNUNET_STRINGS_absolute_time_to_string (expire));
-  struct GNUNET_MY_QueryParam params_update[] = {
-    GNUNET_MY_query_param_uint32 (&priority),
-    GNUNET_MY_query_param_uint32 (&replication),
-    GNUNET_MY_query_param_uint64 (&lexpire),
-    GNUNET_MY_query_param_uint64 (&lexpire),
-    GNUNET_MY_query_param_uint64 (&uid),
-    GNUNET_MY_query_param_end
-  };
-  ret = GNUNET_MY_exec_prepared (plugin->mc,
-                                 plugin->update_entry,
-                                 params_update);
-  if (GNUNET_OK != ret)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to update value %llu\n",
-                (unsigned long long) uid);
-  }
-  else
-  {
-    GNUNET_break (GNUNET_NO ==
-                  GNUNET_MY_extract_result (plugin->update_entry,
-                                            NULL));
-  }
-  cont (cont_cls,
-        ret,
-        NULL);
-}
-/**
 * Run the given select statement and call 'proc' on the resulting
 * values (which must be in particular positions).
 *
@@ -578,11 +538,6 @@ execute_select (struct Plugin *plugin,
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key key to match, never NULL
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
 * @param proc function to call on the matching value,
@@ -594,7 +549,6 @@ mysql_plugin_get_key (void *cls,
                      uint64_t next_uid,
                      bool random,
                      const struct GNUNET_HashCode *key,
-                      const struct GNUNET_HashCode *vhash,
                      enum GNUNET_BLOCK_Type type,
                      PluginDatumProcessor proc,
                      void *proc_cls)
@@ -628,79 +582,37 @@ mysql_plugin_get_key (void *cls,
  }
  else if (type != GNUNET_BLOCK_TYPE_ANY)
  {
-    if (NULL != vhash)
+    struct GNUNET_MY_QueryParam params_select[] = {
-    {
+      GNUNET_MY_query_param_auto_from_type (key),
-      struct GNUNET_MY_QueryParam params_select[] = {
+      GNUNET_MY_query_param_uint32 (&type),
-        GNUNET_MY_query_param_auto_from_type (key),
+      GNUNET_MY_query_param_uint64 (&next_uid),
-        GNUNET_MY_query_param_auto_from_type (vhash),
+      GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_uint32 (&type),
+      GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_uint64 (&next_uid),
+      GNUNET_MY_query_param_end
-        GNUNET_MY_query_param_uint64 (&rvalue),
+    };
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_end
+    execute_select (plugin,
-      };
+                    plugin->select_entry_by_hash_and_type,
+                    proc,
-      execute_select (plugin,
+                    proc_cls,
-                      plugin->select_entry_by_hash_vhash_and_type,
+                    params_select);
-                      proc,
-                      proc_cls,
-                      params_select);
-    }
-    else
-    {
-      struct GNUNET_MY_QueryParam params_select[] = {
-        GNUNET_MY_query_param_auto_from_type (key),
-        GNUNET_MY_query_param_uint32 (&type),
-        GNUNET_MY_query_param_uint64 (&next_uid),
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_end
-      };
-      execute_select (plugin,
-                      plugin->select_entry_by_hash_and_type,
-                      proc,
-                      proc_cls,
-                      params_select);
-    }
  }
  else
  {
-    if (NULL != vhash)
+    struct GNUNET_MY_QueryParam params_select[] = {
-    {
+      GNUNET_MY_query_param_auto_from_type (key),
-      struct GNUNET_MY_QueryParam params_select[] = {
+      GNUNET_MY_query_param_uint64 (&next_uid),
-        GNUNET_MY_query_param_auto_from_type (key),
+      GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_auto_from_type (vhash),
+      GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_uint64 (&next_uid),
+      GNUNET_MY_query_param_end
-        GNUNET_MY_query_param_uint64 (&rvalue),
+    };
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_end
-      };
-      execute_select (plugin,
-                      plugin->select_entry_by_hash_and_vhash,
-                      proc,
-                      proc_cls,
-                      params_select);
-    }
-    else
-    {
-      struct GNUNET_MY_QueryParam params_select[] = {
-        GNUNET_MY_query_param_auto_from_type (key),
-        GNUNET_MY_query_param_uint64 (&next_uid),
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_uint64 (&rvalue),
-        GNUNET_MY_query_param_end
-      };
-      execute_select (plugin,
-                      plugin->select_entry_by_hash,
-                      proc,
-                      proc_cls,
-                      params_select);
-    }
-  }
+    execute_select (plugin,
+                    plugin->select_entry_by_hash,
+                    proc,
+                    proc_cls,
+                    params_select);
+  }
 }
@@ -1124,6 +1036,69 @@ mysql_plugin_drop (void *cls)
 /**
+ * Remove a particular key in the datastore.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
+ */
+static void
+mysql_plugin_remove_key (void *cls,
+                         const struct GNUNET_HashCode *key,
+                         uint32_t size,
+                         const void *data,
+                         PluginRemoveCont cont,
+                         void *cont_cls)
+{
+  struct Plugin *plugin = cls;
+  struct GNUNET_MY_QueryParam params_delete[] = {
+    GNUNET_MY_query_param_auto_from_type (key),
+    GNUNET_MY_query_param_fixed_size (data, size),
+    GNUNET_MY_query_param_end
+  };
+  if (GNUNET_OK !=
+      GNUNET_MY_exec_prepared (plugin->mc,
+                               plugin->delete_entry_by_hash_value,
+                               params_delete))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Removing key `%s' from gn090 table failed\n",
+                GNUNET_h2s (key));
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_SYSERR,
+          _("MySQL statement run failure"));
+    return;
+  }
+  MYSQL_STMT *stmt = GNUNET_MYSQL_statement_get_stmt (plugin->delete_entry_by_hash_value);
+  my_ulonglong rows = mysql_stmt_affected_rows (stmt);
+  if (0 == rows)
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_NO,
+          NULL);
+    return;
+  }
+  plugin->env->duc (plugin->env->cls,
+                    -size);
+  cont (cont_cls,
+        key,
+        size,
+        GNUNET_OK,
+        NULL);
+}
+/**
 * Entry point for the plugin.
 *
 * @param cls the `struct GNUNET_DATASTORE_PluginEnvironment *`
@@ -1158,24 +1133,20 @@ libgnunet_plugin_datastore_mysql_init (void *cls)
       " hash BINARY(64) NOT NULL DEFAULT '',"
       " vhash BINARY(64) NOT NULL DEFAULT '',"
       " value BLOB NOT NULL DEFAULT ''," " uid BIGINT NOT NULL AUTO_INCREMENT,"
-       " PRIMARY KEY (uid)," " INDEX idx_hash (hash(64)),"
+       " PRIMARY KEY (uid),"
-       " INDEX idx_hash_uid (hash(64),uid),"
-       " INDEX idx_hash_vhash (hash(64),vhash(64)),"
       " INDEX idx_hash_type_uid (hash(64),type,rvalue),"
-       " INDEX idx_prio (prio)," " INDEX idx_repl_rvalue (repl,rvalue),"
+       " INDEX idx_prio (prio),"
+       " INDEX idx_repl_rvalue (repl,rvalue),"
       " INDEX idx_expire (expire),"
       " INDEX idx_anonLevel_type_rvalue (anonLevel,type,rvalue)"
       ") ENGINE=InnoDB") || MRUNS ("SET AUTOCOMMIT = 1") ||
      PINIT (plugin->insert_entry, INSERT_ENTRY) ||
      PINIT (plugin->delete_entry_by_uid, DELETE_ENTRY_BY_UID) ||
+      PINIT (plugin->delete_entry_by_hash_value, DELETE_ENTRY_BY_HASH_VALUE) ||
      PINIT (plugin->select_entry, SELECT_ENTRY) ||
      PINIT (plugin->select_entry_by_hash, SELECT_ENTRY_BY_HASH) ||
-      PINIT (plugin->select_entry_by_hash_and_vhash,
-             SELECT_ENTRY_BY_HASH_AND_VHASH) ||
      PINIT (plugin->select_entry_by_hash_and_type,
             SELECT_ENTRY_BY_HASH_AND_TYPE) ||
-      PINIT (plugin->select_entry_by_hash_vhash_and_type,
-             SELECT_ENTRY_BY_HASH_VHASH_AND_TYPE) ||
      PINIT (plugin->get_size, SELECT_SIZE) ||
      PINIT (plugin->update_entry, UPDATE_ENTRY) ||
      PINIT (plugin->dec_repl, DEC_REPL) ||
@@ -1184,7 +1155,8 @@ libgnunet_plugin_datastore_mysql_init (void *cls)
      PINIT (plugin->select_priority, SELECT_IT_PRIORITY) ||
      PINIT (plugin->max_repl, SELECT_MAX_REPL) ||
      PINIT (plugin->get_all_keys, GET_ALL_KEYS) ||
-      PINIT (plugin->select_replication, SELECT_IT_REPLICATION))
+      PINIT (plugin->select_replication, SELECT_IT_REPLICATION) ||
+      false)
  {
    GNUNET_MYSQL_context_destroy (plugin->mc);
    GNUNET_free (plugin);
@@ -1197,13 +1169,13 @@ libgnunet_plugin_datastore_mysql_init (void *cls)
  api->cls = plugin;
  api->estimate_size = &mysql_plugin_estimate_size;
  api->put = &mysql_plugin_put;
-  api->update = &mysql_plugin_update;
  api->get_key = &mysql_plugin_get_key;
  api->get_replication = &mysql_plugin_get_replication;
  api->get_expiration = &mysql_plugin_get_expiration;
  api->get_zero_anonymity = &mysql_plugin_get_zero_anonymity;
  api->get_keys = &mysql_plugin_get_keys;
  api->drop = &mysql_plugin_drop;
+  api->remove_key = &mysql_plugin_remove_key;
  GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "mysql",
                   _("Mysql database running\n"));
  return api;
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 87a7acbdc..b6aeb0be6 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -119,9 +119,6 @@ init_connection (struct Plugin *plugin)
                               "CREATE INDEX IF NOT EXISTS idx_hash ON gn090 (hash)")) ||
        (GNUNET_OK !=
         GNUNET_POSTGRES_exec (plugin->dbh,
-                               "CREATE INDEX IF NOT EXISTS idx_hash_vhash ON gn090 (hash,vhash)")) ||
-        (GNUNET_OK !=
-         GNUNET_POSTGRES_exec (plugin->dbh,
                               "CREATE INDEX IF NOT EXISTS idx_prio ON gn090 (prio)")) ||
        (GNUNET_OK !=
         GNUNET_POSTGRES_exec (plugin->dbh,
@@ -183,9 +180,8 @@ init_connection (struct Plugin *plugin)
                   "WHERE oid >= $1::bigint AND "
                   "(rvalue >= $2 OR 0 = $3::smallint) AND "
                   "(hash = $4 OR 0 = $5::smallint) AND "
-                   "(vhash = $6 OR 0 = $7::smallint) AND "
+                   "(type = $6 OR 0 = $7::smallint) "
-                   "(type = $8 OR 0 = $9::smallint) "
+                   "ORDER BY oid ASC LIMIT 1", 7)) ||
-                   "ORDER BY oid ASC LIMIT 1", 9)) ||
      (GNUNET_OK !=
       GNUNET_POSTGRES_prepare (plugin->dbh, "put",
                   "INSERT INTO gn090 (repl, type, prio, anonLevel, expire, rvalue, hash, vhash, value) "
@@ -195,8 +191,8 @@ init_connection (struct Plugin *plugin)
                   "UPDATE gn090 "
                   "SET prio = prio + $1, "
                   "repl = repl + $2, "
-                   "expire = CASE WHEN expire < $3 THEN $3 ELSE expire END "
+                   "expire = GREATEST(expire, $3) "
-                   "WHERE oid = $4", 4)) ||
+                   "WHERE hash = $4 AND vhash = $5", 5)) ||
      (GNUNET_OK !=
       GNUNET_POSTGRES_prepare (plugin->dbh, "decrepl",
                   "UPDATE gn090 SET repl = GREATEST (repl - 1, 0) "
@@ -223,6 +219,10 @@ init_connection (struct Plugin *plugin)
      (GNUNET_OK !=
       GNUNET_POSTGRES_prepare (plugin->dbh, "delrow", "DELETE FROM gn090 " "WHERE oid=$1", 1)) ||
      (GNUNET_OK !=
+       GNUNET_POSTGRES_prepare (plugin->dbh, "remove", "DELETE FROM gn090 "
+         "WHERE hash = $1 AND "
+         "value = $2", 2)) ||
+      (GNUNET_OK !=
       GNUNET_POSTGRES_prepare (plugin->dbh, "get_keys", "SELECT hash FROM gn090", 0)))
  {
    PQfinish (plugin->dbh);
@@ -288,6 +288,7 @@ postgres_plugin_estimate_size (void *cls, unsigned long long *estimate)
 *
 * @param cls closure with the `struct Plugin`
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in data
 * @param data content stored
 * @param type type of the content
@@ -300,23 +301,70 @@ postgres_plugin_estimate_size (void *cls, unsigned long long *estimate)
 */
 static void
 postgres_plugin_put (void *cls,
-                     const struct GNUNET_HashCode *key,
+                     const struct GNUNET_HashCode *key,
-                     uint32_t size,
+                     bool absent,
+                     uint32_t size,
                     const void *data,
-                     enum GNUNET_BLOCK_Type type,
+                     enum GNUNET_BLOCK_Type type,
                     uint32_t priority,
-                     uint32_t anonymity,
+                     uint32_t anonymity,
                     uint32_t replication,
                     struct GNUNET_TIME_Absolute expiration,
-                     PluginPutCont cont,
+                     PluginPutCont cont,
                     void *cont_cls)
 {
  struct Plugin *plugin = cls;
-  uint32_t utype = type;
  struct GNUNET_HashCode vhash;
+  PGresult *ret;
+  GNUNET_CRYPTO_hash (data,
+                      size,
+                      &vhash);
+  if (!absent)
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_uint32 (&priority),
+      GNUNET_PQ_query_param_uint32 (&replication),
+      GNUNET_PQ_query_param_absolute_time (&expiration),
+      GNUNET_PQ_query_param_auto_from_type (key),
+      GNUNET_PQ_query_param_auto_from_type (&vhash),
+      GNUNET_PQ_query_param_end
+    };
+    ret = GNUNET_PQ_exec_prepared (plugin->dbh,
+                                   "update",
+                                   params);
+    if (GNUNET_OK !=
+        GNUNET_POSTGRES_check_result (plugin->dbh,
+                                      ret,
+                                      PGRES_COMMAND_OK,
+                                      "PQexecPrepared",
+                                      "update"))
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            _("Postgress exec failure"));
+      return;
+    }
+    /* What an awful API, this function really does return a string */
+    bool affected = 0 != strcmp ("0", PQcmdTuples (ret));
+    PQclear (ret);
+    if (affected)
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_NO,
+            NULL);
+      return;
+    }
+  }
+  uint32_t utype = type;
  uint64_t rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
                                              UINT64_MAX);
-  PGresult *ret;
  struct GNUNET_PQ_QueryParam params[] = {
    GNUNET_PQ_query_param_uint32 (&replication),
    GNUNET_PQ_query_param_uint32 (&utype),
@@ -330,7 +378,6 @@ postgres_plugin_put (void *cls,
    GNUNET_PQ_query_param_end
  };
-  GNUNET_CRYPTO_hash (data, size, &vhash);
  ret = GNUNET_PQ_exec_prepared (plugin->dbh,
                                 "put",
                                 params);
@@ -489,11 +536,6 @@ process_result (struct Plugin *plugin,
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key maybe NULL (to match all entries)
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
 * @param proc function to call on the matching value;
@@ -505,7 +547,6 @@ postgres_plugin_get_key (void *cls,
                         uint64_t next_uid,
                         bool random,
                         const struct GNUNET_HashCode *key,
-                         const struct GNUNET_HashCode *vhash,
                         enum GNUNET_BLOCK_Type type,
                         PluginDatumProcessor proc,
                         void *proc_cls)
@@ -514,7 +555,6 @@ postgres_plugin_get_key (void *cls,
  uint32_t utype = type;
  uint16_t use_rvalue = random;
  uint16_t use_key = NULL != key;
-  uint16_t use_vhash = NULL != vhash;
  uint16_t use_type = GNUNET_BLOCK_TYPE_ANY != type;
  uint64_t rvalue;
  struct GNUNET_PQ_QueryParam params[] = {
@@ -523,8 +563,6 @@ postgres_plugin_get_key (void *cls,
    GNUNET_PQ_query_param_uint16 (&use_rvalue),
    GNUNET_PQ_query_param_auto_from_type (key),
    GNUNET_PQ_query_param_uint16 (&use_key),
-    GNUNET_PQ_query_param_auto_from_type (vhash),
-    GNUNET_PQ_query_param_uint16 (&use_vhash),
    GNUNET_PQ_query_param_uint32 (&utype),
    GNUNET_PQ_query_param_uint16 (&use_type),
    GNUNET_PQ_query_param_end
@@ -750,67 +788,6 @@ postgres_plugin_get_expiration (void *cls,
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls our `struct Plugin *`
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls continuation closure
- */
-static void
-postgres_plugin_update (void *cls,
-                        uint64_t uid,
-                        uint32_t priority,
-                        uint32_t replication,
-                        struct GNUNET_TIME_Absolute expire,
-                        PluginUpdateCont cont,
-                        void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  uint32_t oid = (uint32_t) uid;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&priority),
-    GNUNET_PQ_query_param_uint32 (&replication),
-    GNUNET_PQ_query_param_absolute_time (&expire),
-    GNUNET_PQ_query_param_uint32 (&oid),
-    GNUNET_PQ_query_param_end
-  };
-  PGresult *ret;
-  ret = GNUNET_PQ_exec_prepared (plugin->dbh,
-                                 "update",
-                                 params);
-  if (GNUNET_OK !=
-      GNUNET_POSTGRES_check_result (plugin->dbh,
-                                    ret,
-                                    PGRES_COMMAND_OK,
-                                    "PQexecPrepared",
-                                    "update"))
-  {
-    cont (cont_cls,
-          GNUNET_SYSERR,
-          NULL);
-    return;
-  }
-  PQclear (ret);
-  cont (cont_cls,
-        GNUNET_OK,
-        NULL);
-}
-/**
 * Get all of the keys in the datastore.
 *
 * @param cls closure with the `struct Plugin *`
@@ -868,6 +845,74 @@ postgres_plugin_drop (void *cls)
 /**
+ * Remove a particular key in the datastore.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
+ */
+static void
+postgres_plugin_remove_key (void *cls,
+                            const struct GNUNET_HashCode *key,
+                            uint32_t size,
+                            const void *data,
+                            PluginRemoveCont cont,
+                            void *cont_cls)
+{
+  struct Plugin *plugin = cls;
+  PGresult *ret;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (key),
+    GNUNET_PQ_query_param_fixed_size (data, size),
+    GNUNET_PQ_query_param_end
+  };
+  ret = GNUNET_PQ_exec_prepared (plugin->dbh,
+                                 "remove",
+                                 params);
+  if (GNUNET_OK !=
+      GNUNET_POSTGRES_check_result (plugin->dbh,
+                                    ret,
+                                    PGRES_COMMAND_OK,
+                                    "PQexecPrepared",
+                                    "remove"))
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_SYSERR,
+          _("Postgress exec failure"));
+    return;
+  }
+  /* What an awful API, this function really does return a string */
+  bool affected = 0 != strcmp ("0", PQcmdTuples (ret));
+  PQclear (ret);
+  if (!affected)
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_NO,
+          NULL);
+    return;
+  }
+  plugin->env->duc (plugin->env->cls,
+                    - (size + GNUNET_DATASTORE_ENTRY_OVERHEAD));
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                   "datastore-postgres",
+                   "Deleted %u bytes from database\n",
+                   (unsigned int) size);
+  cont (cont_cls,
+        key,
+        size,
+        GNUNET_OK,
+        NULL);
+}
+/**
 * Entry point for the plugin.
 *
 * @param cls the `struct GNUNET_DATASTORE_PluginEnvironment*`
@@ -891,13 +936,13 @@ libgnunet_plugin_datastore_postgres_init (void *cls)
  api->cls = plugin;
  api->estimate_size = &postgres_plugin_estimate_size;
  api->put = &postgres_plugin_put;
-  api->update = &postgres_plugin_update;
  api->get_key = &postgres_plugin_get_key;
  api->get_replication = &postgres_plugin_get_replication;
  api->get_expiration = &postgres_plugin_get_expiration;
  api->get_zero_anonymity = &postgres_plugin_get_zero_anonymity;
  api->get_keys = &postgres_plugin_get_keys;
  api->drop = &postgres_plugin_drop;
+  api->remove_key = &postgres_plugin_remove_key;
  GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
                   "datastore-postgres",
                   _("Postgres database running\n"));
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 1f874e190..323c03856 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -88,6 +88,11 @@ struct Plugin
  sqlite3 *dbh;
  /**
+   * Precompiled SQL for remove_key.
+   */
+  sqlite3_stmt *remove;
+  /**
   * Precompiled SQL for deletion.
   */
  sqlite3_stmt *delRow;
@@ -95,7 +100,7 @@ struct Plugin
  /**
   * Precompiled SQL for update.
   */
-  sqlite3_stmt *updPrio;
+  sqlite3_stmt *update;
  /**
   * Get maximum repl value in database.
@@ -185,10 +190,6 @@ create_indices (sqlite3 * dbh)
                     NULL, NULL, NULL)) ||
      (SQLITE_OK !=
       sqlite3_exec (dbh,
-                     "CREATE INDEX IF NOT EXISTS idx_hash_vhash ON gn090 (hash,vhash)",
-                     NULL, NULL, NULL)) ||
-      (SQLITE_OK !=
-       sqlite3_exec (dbh,
                     "CREATE INDEX IF NOT EXISTS idx_expire_repl ON gn090 (expire ASC,repl DESC)",
                     NULL, NULL, NULL)) ||
      (SQLITE_OK !=
@@ -356,8 +357,8 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                    "SET prio = prio + ?, "
                    "repl = repl + ?, "
                    "expire = MAX(expire, ?) "
-                    "WHERE _ROWID_ = ?",
+                    "WHERE hash = ? AND vhash = ?",
-                    &plugin->updPrio)) ||
+                    &plugin->update)) ||
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
                    "UPDATE gn090 " "SET repl = MAX (0, repl - 1) WHERE _ROWID_ = ?",
@@ -415,15 +416,20 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                    "WHERE _ROWID_ >= ? AND "
                    "(rvalue >= ? OR 0 = ?) AND "
                    "(hash = ? OR 0 = ?) AND "
-                    "(vhash = ? OR 0 = ?) AND "
                    "(type = ? OR 0 = ?) "
                    "ORDER BY _ROWID_ ASC LIMIT 1",
                    &plugin->get)) ||
       (SQLITE_OK !=
        sq_prepare (plugin->dbh,
                    "DELETE FROM gn090 WHERE _ROWID_ = ?",
-                    &plugin->delRow))
+                    &plugin->delRow)) ||
-       )
+       (SQLITE_OK !=
+        sq_prepare (plugin->dbh,
+                    "DELETE FROM gn090 "
+                    "WHERE hash = ? AND "
+                    "value = ? ",
+                    &plugin->remove)) ||
+       false)
  {
    LOG_SQLITE (plugin,
                GNUNET_ERROR_TYPE_ERROR,
@@ -448,10 +454,12 @@ database_shutdown (struct Plugin *plugin)
  sqlite3_stmt *stmt;
 #endif
+  if (NULL != plugin->remove)
+    sqlite3_finalize (plugin->remove);
  if (NULL != plugin->delRow)
    sqlite3_finalize (plugin->delRow);
-  if (NULL != plugin->updPrio)
+  if (NULL != plugin->update)
-    sqlite3_finalize (plugin->updPrio);
+    sqlite3_finalize (plugin->update);
  if (NULL != plugin->updRepl)
    sqlite3_finalize (plugin->updRepl);
  if (NULL != plugin->selRepl)
@@ -541,6 +549,7 @@ delete_by_rowid (struct Plugin *plugin,
 *
 * @param cls closure
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in @a data
 * @param data content stored
 * @param type type of the content
@@ -554,6 +563,7 @@ delete_by_rowid (struct Plugin *plugin,
 static void
 sqlite_plugin_put (void *cls,
                   const struct GNUNET_HashCode *key,
+                   bool absent,
                   uint32_t size,
                   const void *data,
                   enum GNUNET_BLOCK_Type type,
@@ -564,8 +574,63 @@ sqlite_plugin_put (void *cls,
                   PluginPutCont cont,
                   void *cont_cls)
 {
-  uint64_t rvalue;
+  struct Plugin *plugin = cls;
  struct GNUNET_HashCode vhash;
+  char *msg = NULL;
+  GNUNET_CRYPTO_hash (data,
+                      size,
+                      &vhash);
+  if (!absent)
+  {
+    struct GNUNET_SQ_QueryParam params[] = {
+      GNUNET_SQ_query_param_uint32 (&priority),
+      GNUNET_SQ_query_param_uint32 (&replication),
+      GNUNET_SQ_query_param_absolute_time (&expiration),
+      GNUNET_SQ_query_param_auto_from_type (key),
+      GNUNET_SQ_query_param_auto_from_type (&vhash),
+      GNUNET_SQ_query_param_end
+    };
+    if (GNUNET_OK !=
+        GNUNET_SQ_bind (plugin->update,
+                        params))
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            _("sqlite bind failure"));
+      return;
+    }
+    if (SQLITE_DONE != sqlite3_step (plugin->update))
+    {
+      LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                      "sqlite3_step");
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_SYSERR,
+            msg);
+      GNUNET_free_non_null (msg);
+      return;
+    }
+    int changes = sqlite3_changes (plugin->dbh);
+    GNUNET_SQ_reset (plugin->dbh,
+                     plugin->update);
+    if (0 != changes)
+    {
+      cont (cont_cls,
+            key,
+            size,
+            GNUNET_NO,
+            NULL);
+      return;
+    }
+  }
+  uint64_t rvalue;
  uint32_t type32 = (uint32_t) type;
  struct GNUNET_SQ_QueryParam params[] = {
    GNUNET_SQ_query_param_uint32 (&replication),
@@ -579,11 +644,9 @@ sqlite_plugin_put (void *cls,
    GNUNET_SQ_query_param_fixed_size (data, size),
    GNUNET_SQ_query_param_end
  };
-  struct Plugin *plugin = cls;
  int n;
  int ret;
  sqlite3_stmt *stmt;
-  char *msg = NULL;
  if (size > MAX_ITEM_SIZE)
  {
@@ -598,15 +661,13 @@ sqlite_plugin_put (void *cls,
                   GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration),
                                                           GNUNET_YES),
                   GNUNET_STRINGS_absolute_time_to_string (expiration));
-  GNUNET_CRYPTO_hash (data, size, &vhash);
  stmt = plugin->insertContent;
  rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
  if (GNUNET_OK !=
      GNUNET_SQ_bind (stmt,
                      params))
  {
-    cont (cont_cls, key, size, GNUNET_SYSERR, msg);
+    cont (cont_cls, key, size, GNUNET_SYSERR, NULL);
-    GNUNET_free_non_null(msg);
    return;
  }
  n = sqlite3_step (stmt);
@@ -646,79 +707,6 @@ sqlite_plugin_put (void *cls,
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls the plugin context (state for this module)
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls closure for @a cont
- */
-static void
-sqlite_plugin_update (void *cls,
-                      uint64_t uid,
-                      uint32_t priority,
-                      uint32_t replication,
-                      struct GNUNET_TIME_Absolute expire,
-                      PluginUpdateCont cont,
-                      void *cont_cls)
-{
-  struct Plugin *plugin = cls;
-  struct GNUNET_SQ_QueryParam params[] = {
-    GNUNET_SQ_query_param_uint32 (&priority),
-    GNUNET_SQ_query_param_uint32 (&replication),
-    GNUNET_SQ_query_param_absolute_time (&expire),
-    GNUNET_SQ_query_param_uint64 (&uid),
-    GNUNET_SQ_query_param_end
-  };
-  int n;
-  char *msg = NULL;
-  if (GNUNET_OK !=
-      GNUNET_SQ_bind (plugin->updPrio,
-                      params))
-  {
-    cont (cont_cls, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  }
-  n = sqlite3_step (plugin->updPrio);
-  GNUNET_SQ_reset (plugin->dbh,
-                   plugin->updPrio);
-  switch (n)
-  {
-  case SQLITE_DONE:
-    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Block updated\n");
-    cont (cont_cls, GNUNET_OK, NULL);
-    return;
-  case SQLITE_BUSY:
-    LOG_SQLITE_MSG (plugin, &msg,
-                    GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
-                    "sqlite3_step");
-    cont (cont_cls, GNUNET_NO, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  default:
-    LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                    "sqlite3_step");
-    cont (cont_cls, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null(msg);
-    return;
-  }
-}
-/**
 * Execute statement that gets a row and call the callback
 * with the result.  Resets the statement afterwards.
 *
@@ -865,15 +853,10 @@ sqlite_plugin_get_zero_anonymity (void *cls,
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key maybe NULL (to match all entries)
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
- * @param proc function to call on each matching value;
+ * @param proc function to call on the matching value;
- *        will be called once with a NULL value at the end
+ *        will be called with NULL if nothing matches
 * @param proc_cls closure for @a proc
 */
 static void
@@ -881,7 +864,6 @@ sqlite_plugin_get_key (void *cls,
                       uint64_t next_uid,
                       bool random,
                       const struct GNUNET_HashCode *key,
-                       const struct GNUNET_HashCode *vhash,
                       enum GNUNET_BLOCK_Type type,
                       PluginDatumProcessor proc,
                       void *proc_cls)
@@ -892,15 +874,12 @@ sqlite_plugin_get_key (void *cls,
  uint32_t type32 = (uint32_t) type;
  uint16_t use_type = GNUNET_BLOCK_TYPE_ANY != type;
  uint16_t use_key = NULL != key;
-  uint16_t use_vhash = NULL != vhash;
  struct GNUNET_SQ_QueryParam params[] = {
    GNUNET_SQ_query_param_uint64 (&next_uid),
    GNUNET_SQ_query_param_uint64 (&rvalue),
    GNUNET_SQ_query_param_uint16 (&use_rvalue),
    GNUNET_SQ_query_param_auto_from_type (key),
    GNUNET_SQ_query_param_uint16 (&use_key),
-    GNUNET_SQ_query_param_auto_from_type (vhash),
-    GNUNET_SQ_query_param_uint16 (&use_vhash),
    GNUNET_SQ_query_param_uint32 (&type32),
    GNUNET_SQ_query_param_uint16 (&use_type),
    GNUNET_SQ_query_param_end
@@ -1206,6 +1185,79 @@ sqlite_plugin_drop (void *cls)
 /**
+ * Remove a particular key in the datastore.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
+ */
+static void
+sqlite_plugin_remove_key (void *cls,
+                          const struct GNUNET_HashCode *key,
+                          uint32_t size,
+                          const void *data,
+                          PluginRemoveCont cont,
+                          void *cont_cls)
+{
+  struct Plugin *plugin = cls;
+  struct GNUNET_SQ_QueryParam params[] = {
+    GNUNET_SQ_query_param_auto_from_type (key),
+    GNUNET_SQ_query_param_fixed_size (data, size),
+    GNUNET_SQ_query_param_end
+  };
+  if (GNUNET_OK !=
+      GNUNET_SQ_bind (plugin->remove,
+                      params))
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_SYSERR,
+          "bind failed");
+    return;
+  }
+  if (SQLITE_DONE != sqlite3_step (plugin->remove))
+  {
+    LOG_SQLITE (plugin,
+                GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                "sqlite3_step");
+    GNUNET_SQ_reset (plugin->dbh,
+                     plugin->remove);
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_SYSERR,
+          "sqlite3_step failed");
+    return;
+  }
+  int changes = sqlite3_changes (plugin->dbh);
+  GNUNET_SQ_reset (plugin->dbh,
+                   plugin->remove);
+  if (0 == changes)
+  {
+    cont (cont_cls,
+          key,
+          size,
+          GNUNET_NO,
+          NULL);
+    return;
+  }
+  if (NULL != plugin->env->duc)
+    plugin->env->duc (plugin->env->cls,
+                      -(size + GNUNET_DATASTORE_ENTRY_OVERHEAD));
+  cont (cont_cls,
+        key,
+        size,
+        GNUNET_OK,
+        NULL);
+}
+/**
 * Get an estimate of how much space the database is
 * currently using.
 *
@@ -1300,13 +1352,13 @@ libgnunet_plugin_datastore_sqlite_init (void *cls)
  api->cls = &plugin;
  api->estimate_size = &sqlite_plugin_estimate_size;
  api->put = &sqlite_plugin_put;
-  api->update = &sqlite_plugin_update;
  api->get_key = &sqlite_plugin_get_key;
  api->get_replication = &sqlite_plugin_get_replication;
  api->get_expiration = &sqlite_plugin_get_expiration;
  api->get_zero_anonymity = &sqlite_plugin_get_zero_anonymity;
  api->get_keys = &sqlite_plugin_get_keys;
  api->drop = &sqlite_plugin_drop;
+  api->remove_key = &sqlite_plugin_remove_key;
  GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
                   "sqlite",
                   _("Sqlite database running\n"));
diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index 8e44f020d..16bda45d4 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -62,6 +62,7 @@ template_plugin_estimate_size (void *cls, unsigned long long *estimate)
 *
 * @param cls closure
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in data
 * @param data content stored
 * @param type type of the content
@@ -73,11 +74,17 @@ template_plugin_estimate_size (void *cls, unsigned long long *estimate)
 * @param cont_cls continuation closure
 */
 static void
-template_plugin_put (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
+template_plugin_put (void *cls,
-                     const void *data, enum GNUNET_BLOCK_Type type,
+                     const struct GNUNET_HashCode *key,
-                     uint32_t priority, uint32_t anonymity,
+                     bool absent,
+                     uint32_t size,
+                     const void *data,
+                     enum GNUNET_BLOCK_Type type,
+                     uint32_t priority,
+                     uint32_t anonymity,
                     uint32_t replication,
-                     struct GNUNET_TIME_Absolute expiration, PluginPutCont cont,
+                     struct GNUNET_TIME_Absolute expiration,
+                     PluginPutCont cont,
                     void *cont_cls)
 {
  GNUNET_break (0);
@@ -92,11 +99,6 @@ template_plugin_put (void *cls, const struct GNUNET_HashCode * key, uint32_t siz
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key maybe NULL (to match all entries)
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
 * @param proc function to call on each matching value;
@@ -104,10 +106,12 @@ template_plugin_put (void *cls, const struct GNUNET_HashCode * key, uint32_t siz
 * @param proc_cls closure for proc
 */
 static void
-template_plugin_get_key (void *cls, uint64_t next_uid, bool random,
+template_plugin_get_key (void *cls,
-                         const struct GNUNET_HashCode * key,
+                         uint64_t next_uid,
-                         const struct GNUNET_HashCode * vhash,
+                         bool random,
-                         enum GNUNET_BLOCK_Type type, PluginDatumProcessor proc,
+                         const struct GNUNET_HashCode *key,
+                         enum GNUNET_BLOCK_Type type,
+                         PluginDatumProcessor proc,
                         void *proc_cls)
 {
  GNUNET_break (0);
@@ -151,39 +155,6 @@ template_plugin_get_expiration (void *cls, PluginDatumProcessor proc,
 /**
- * Update the priority, replication and expiration for a particular
- * unique ID in the datastore.  If the expiration time in value is
- * different than the time found in the datastore, the higher value
- * should be kept.  The specified priority and replication is added
- * to the existing value.
- *
- * @param cls our "struct Plugin*"
- * @param uid unique identifier of the datum
- * @param priority by how much should the priority
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls continuation closure
- */
-static void
-template_plugin_update (void *cls,
-                        uint64_t uid,
-                        uint32_t priority,
-                        uint32_t replication,
-                        struct GNUNET_TIME_Absolute expire,
-                        PluginUpdateCont cont,
-                        void *cont_cls)
-{
-  GNUNET_break (0);
-  cont (cont_cls, GNUNET_SYSERR, "not implemented");
-}
-/**
 * Call the given processor on an item with zero anonymity.
 *
 * @param cls our "struct Plugin*"
@@ -230,6 +201,29 @@ template_get_keys (void *cls,
 /**
+ * Remove a particular key in the datastore.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
+ */
+static void
+template_plugin_remove_key (void *cls,
+                            const struct GNUNET_HashCode *key,
+                            uint32_t size,
+                            const void *data,
+                            PluginRemoveCont cont,
+                            void *cont_cls)
+{
+  GNUNET_break (0);
+  cont (cont_cls, key, size, GNUNET_SYSERR, "not implemented");
+}
+/**
 * Entry point for the plugin.
 *
 * @param cls the "struct GNUNET_DATASTORE_PluginEnvironment*"
@@ -248,13 +242,13 @@ libgnunet_plugin_datastore_template_init (void *cls)
  api->cls = plugin;
  api->estimate_size = &template_plugin_estimate_size;
  api->put = &template_plugin_put;
-  api->update = &template_plugin_update;
  api->get_key = &template_plugin_get_key;
  api->get_replication = &template_plugin_get_replication;
  api->get_expiration = &template_plugin_get_expiration;
  api->get_zero_anonymity = &template_plugin_get_zero_anonymity;
  api->drop = &template_plugin_drop;
  api->get_keys = &template_get_keys;
+  api->remove_key = &template_plugin_remove_key;
  GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "template",
                   _("Template database running\n"));
  return api;
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 1867d6755..d460daed7 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -49,10 +49,10 @@ enum RunPhase
  RP_ERROR = 0,
  RP_PUT,
  RP_GET,
-  RP_UPDATE,
  RP_ITER_ZERO,
  RP_REPL_GET,
  RP_EXPI_GET,
+  RP_REMOVE,
  RP_DROP
 };
@@ -154,7 +154,7 @@ do_put (struct CpsRunContext *crc)
  /* most content is 32k */
  size = 32 * 1024;
-  if (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) == 0)   /* but some of it is less! */
+  if (0 != i && GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16) == 0)   /* but some of it is less! */
    size = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 32 * 1024);
  size = size - (size & 7);     /* always multiple of 8 */
@@ -168,8 +168,13 @@ do_put (struct CpsRunContext *crc)
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "putting type %u, anon %u under key %s\n", i + 1, i,
              GNUNET_h2s (&key));
-  crc->api->put (crc->api->cls, &key, size, value, i + 1 /* type */ ,
+  crc->api->put (crc->api->cls,
-                 prio, i /* anonymity */ ,
+                 &key,
+                 false /* absent */,
+                 size,
+                 value, i + 1 /* type */ ,
+                 prio,
+                 i /* anonymity */ ,
                 0 /* replication */ ,
                 GNUNET_TIME_relative_to_absolute
                   (GNUNET_TIME_relative_multiply
@@ -177,7 +182,8 @@ do_put (struct CpsRunContext *crc)
                      60 * 60 * 60 * 1000 +
                      GNUNET_CRYPTO_random_u32
                      (GNUNET_CRYPTO_QUALITY_WEAK, 1000))),
-                 put_continuation, crc);
+                 put_continuation,
+                 crc);
  i++;
 }
@@ -215,6 +221,25 @@ iterate_one_shot (void *cls,
 }
+static void
+remove_continuation (void *cls,
+                     const struct GNUNET_HashCode *key,
+                     uint32_t size,
+                     int status,
+                     const char *msg)
+{
+  struct CpsRunContext *crc = cls;
+  GNUNET_assert (NULL != key);
+  GNUNET_assert (32768 == size);
+  GNUNET_assert (GNUNET_OK == status);
+  GNUNET_assert (NULL == msg);
+  crc->phase++;
+  GNUNET_SCHEDULER_add_now (&test,
+                            crc);
+}
 /**
 * Function called when the service shuts
 * down.  Unloads our datastore plugin.
@@ -264,19 +289,6 @@ cleaning_task (void *cls)
 static void
-update_continuation (void *cls,
-                     int status,
-                     const char *msg)
-{
-  struct CpsRunContext *crc = cls;
-  GNUNET_assert (GNUNET_OK == status);
-  crc->phase++;
-  GNUNET_SCHEDULER_add_now (&test, crc);
-}
-static void
 test (void *cls)
 {
  struct CpsRunContext *crc = cls;
@@ -311,21 +323,10 @@ test (void *cls)
                       0,
                       false,
                       &key,
-                       NULL,
                       GNUNET_BLOCK_TYPE_ANY,
                       &iterate_one_shot,
                       crc);
    break;
-  case RP_UPDATE:
-    crc->api->update (crc->api->cls,
-                      guid,
-                      1,
-                      1,
-                      GNUNET_TIME_UNIT_ZERO_ABS,
-                      &update_continuation,
-                      crc);
-    break;
  case RP_ITER_ZERO:
    if (crc->cnt == 1)
    {
@@ -342,6 +343,23 @@ test (void *cls)
  case RP_EXPI_GET:
    crc->api->get_expiration (crc->api->cls, &iterate_one_shot, crc);
    break;
+  case RP_REMOVE:
+    {
+      struct GNUNET_HashCode key;
+      uint32_t size = 32768;
+      char value[size];
+      gen_key (0, &key);
+      memset (value, 0, size);
+      value[0] = crc->i;
+      crc->api->remove_key (crc->api->cls,
+                            &key,
+                            size,
+                            value,
+                            &remove_continuation,
+                            crc);
+      break;
+    }
  case RP_DROP:
    crc->api->drop (crc->api->cls);
    GNUNET_SCHEDULER_add_now (&cleaning_task, crc);
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index e1c7ea535..95a48f8cc 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -464,19 +464,21 @@ continue_after_remove (void *cls,
 * @param type type of the content
 * @param priority priority of the content
 * @param anonymity anonymity-level for the content
+ * @param replication replication-level for the content
 * @param expiration expiration time for the content
 * @param uid unique identifier for the datum;
 *        maybe 0 if no unique identifier is available
 */
 static void
 process_kblock_for_unindex (void *cls,
-                            const struct GNUNET_HashCode *key,
+                            const struct GNUNET_HashCode *key,
-                            size_t size,
+                            size_t size,
                            const void *data,
-                            enum GNUNET_BLOCK_Type type,
+                            enum GNUNET_BLOCK_Type type,
-                            uint32_t priority,
+                            uint32_t priority,
-                            uint32_t anonymity,
+                            uint32_t anonymity,
-                            struct GNUNET_TIME_Absolute expiration,
+                            uint32_t replication,
+                            struct GNUNET_TIME_Absolute expiration,
                            uint64_t uid)
 {
  struct GNUNET_FS_UnindexContext *uc = cls;
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index f76f17a51..e2edbcc2c 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -221,7 +221,7 @@ GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle);
 *                       Can be NULL.
 * @param disconnects Function called when a channel is disconnected.
 * @param handlers Callbacks for messages we care about, NULL-terminated.
- * @return Port handle.
+ * @return Port handle, NULL if port is in use
 */
 struct GNUNET_CADET_Port *
 GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h
index 516ba525c..36a3fbec2 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -134,7 +134,8 @@ typedef void
 * @param cls closure
 * @param key key for the item stored
 * @param size size of the item stored
- * @param status #GNUNET_OK or #GNUNET_SYSERROR
+ * @param status #GNUNET_OK if inserted, #GNUNET_NO if updated,
+ *        or #GNUNET_SYSERROR if error
 * @param msg error message on error
 */
 typedef void
@@ -152,6 +153,7 @@ typedef void
 *
 * @param cls closure
 * @param key key for the item
+ * @param absent true if the key was not found in the bloom filter
 * @param size number of bytes in @a data
 * @param data content stored
 * @param type type of the content
@@ -165,15 +167,16 @@ typedef void
 typedef void
 (*PluginPut) (void *cls,
              const struct GNUNET_HashCode *key,
-              uint32_t size,
+              bool absent,
-              const void *data,
+              uint32_t size,
-              enum GNUNET_BLOCK_Type type,
+              const void *data,
-              uint32_t priority,
+              enum GNUNET_BLOCK_Type type,
-              uint32_t anonymity,
+              uint32_t priority,
-              uint32_t replication,
+              uint32_t anonymity,
-              struct GNUNET_TIME_Absolute expiration,
+              uint32_t replication,
-              PluginPutCont cont,
+              struct GNUNET_TIME_Absolute expiration,
-              void *cont_cls);
+              PluginPutCont cont,
+              void *cont_cls);
 /**
@@ -209,11 +212,6 @@ typedef void
 * @param next_uid return the result with lowest uid >= next_uid
 * @param random if true, return a random result instead of using next_uid
 * @param key maybe NULL (to match all entries)
- * @param vhash hash of the value, maybe NULL (to
- *        match all values that have the right key).
- *        Note that for DBlocks there is no difference
- *        betwen key and vhash, but for other blocks
- *        there may be!
 * @param type entries of which type are relevant?
 *     Use 0 for any type.
 * @param proc function to call on the matching value;
@@ -225,68 +223,62 @@ typedef void
                 uint64_t next_uid,
                 bool random,
                 const struct GNUNET_HashCode *key,
-                 const struct GNUNET_HashCode *vhash,
                 enum GNUNET_BLOCK_Type type,
                 PluginDatumProcessor proc,
                 void *proc_cls);
 /**
- * Get a random item (additional constraints may apply depending on
+ * Remove continuation.
- * the specific implementation).  Calls @a proc with all values ZERO or
- * NULL if no item applies, otherwise @a proc is called once and only
- * once with an item.
 *
 * @param cls closure
- * @param proc function to call the value (once only).
+ * @param key key for the content removed
- * @param proc_cls closure for @a proc
+ * @param size number of bytes removed
+ * @param status #GNUNET_OK if removed, #GNUNET_NO if not found,
+ *        or #GNUNET_SYSERROR if error
+ * @param msg error message on error
 */
 typedef void
-(*PluginGetRandom) (void *cls,
+(*PluginRemoveCont) (void *cls,
-                    PluginDatumProcessor proc,
+                     const struct GNUNET_HashCode *key,
-                    void *proc_cls);
+                     uint32_t size,
+                     int status,
+                     const char *msg);
 /**
- * Update continuation.
+ * Remove a particular key in the datastore.
 *
 * @param cls closure
- * @param status #GNUNET_OK or #GNUNET_SYSERR
+ * @param key key for the content
- * @param msg error message on error
+ * @param size number of bytes in data
+ * @param data content stored
+ * @param cont continuation called with success or failure status
+ * @param cont_cls continuation closure for @a cont
 */
 typedef void
-(*PluginUpdateCont) (void *cls,
+(*PluginRemoveKey) (void *cls,
-                     int status,
+                    const struct GNUNET_HashCode *key,
-                     const char *msg);
+                    uint32_t size,
+                    const void *data,
+                    PluginRemoveCont cont,
+                    void *cont_cls);
 /**
- * Update the priority, replication and expiration for a particular
+ * Get a random item (additional constraints may apply depending on
- * unique ID in the datastore.  If the expiration time in value is
+ * the specific implementation).  Calls @a proc with all values ZERO or
- * different than the time found in the datastore, the higher value
+ * NULL if no item applies, otherwise @a proc is called once and only
- * should be kept.  The specified priority and replication is added
+ * once with an item.
- * to the existing value.
 *
 * @param cls closure
- * @param uid unique identifier of the datum
+ * @param proc function to call the value (once only).
- * @param priority by how much should the priority
+ * @param proc_cls closure for @a proc
- *     change?
- * @param replication by how much should the replication
- *     change?
- * @param expire new expiration time should be the
- *     MAX of any existing expiration time and
- *     this value
- * @param cont continuation called with success or failure status
- * @param cons_cls continuation closure
 */
 typedef void
-(*PluginUpdate) (void *cls,
+(*PluginGetRandom) (void *cls,
-                 uint64_t uid,
+                    PluginDatumProcessor proc,
-                 uint32_t priority,
+                    void *proc_cls);
-                 uint32_t replication,
-                 struct GNUNET_TIME_Absolute expire,
-                 PluginUpdateCont cont,
-                 void *cont_cls);
 /**
@@ -342,16 +334,6 @@ struct GNUNET_DATASTORE_PluginFunctions
  PluginPut put;
  /**
-   * Update the priority for a particular key in the datastore.  If
-   * the expiration time in value is different than the time found in
-   * the datastore, the higher value should be kept.  For the
-   * anonymity level, the lower value is to be used.  The specified
-   * priority should be added to the existing priority, ignoring the
-   * priority in value.
-   */
-  PluginUpdate update;
-  /**
   * Get a particular datum matching a given hash from the datastore.
   */
  PluginGetKey get_key;
@@ -388,6 +370,10 @@ struct GNUNET_DATASTORE_PluginFunctions
   */
  PluginGetKeys get_keys;
+  /**
+   * Function to remove an item from the database.
+   */
+  PluginRemoveKey remove_key;
 };
 #endif
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index 02c4b3674..be2885460 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -331,7 +331,8 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, off_t offset,
 * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
 */
 int
-GNUNET_DISK_file_size (const char *filename, uint64_t *size,
+GNUNET_DISK_file_size (const char *filename,
+                       uint64_t *size,
                       int include_symbolic_links,
                       int single_file_mode);
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index ce721d8d8..f2682bea7 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -263,6 +263,17 @@ GNUNET_JSON_spec_absolute_time (const char *name,
 /**
+ * Absolute time in network byte order.
+ *
+ * @param name name of the JSON field
+ * @param[out] at where to store the absolute time found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_absolute_time_nbo (const char *name,
+                                    struct GNUNET_TIME_AbsoluteNBO *at);
+/**
 * Relative time.
 *
 * @param name name of the JSON field
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index dca2106aa..194ec5c76 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -610,6 +610,83 @@ GNUNET_JSON_spec_absolute_time (const char *name,
 /**
+ * Parse given JSON object to absolute time.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static int
+parse_abs_time_nbo (void *cls,
+                    json_t *root,
+                    struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_TIME_AbsoluteNBO *abs = spec->ptr;
+  const char *val;
+  unsigned long long int tval;
+  struct GNUNET_TIME_Absolute a;
+  val = json_string_value (root);
+  if (NULL == val)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ( (0 == strcasecmp (val,
+                         "/forever/")) ||
+       (0 == strcasecmp (val,
+                         "/end of time/")) ||
+       (0 == strcasecmp (val,
+                         "/never/")) )
+  {
+    *abs = GNUNET_TIME_absolute_hton (GNUNET_TIME_UNIT_FOREVER_ABS);
+    return GNUNET_OK;
+  }
+  if (1 != sscanf (val,
+                   "/Date(%llu)/",
+                   &tval))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  /* Time is in seconds in JSON, but in microseconds in GNUNET_TIME_Absolute */
+  a.abs_value_us = tval * 1000LL * 1000LL;
+  if ( (a.abs_value_us) / 1000LL / 1000LL != tval)
+  {
+    /* Integer overflow */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  *abs = GNUNET_TIME_absolute_hton (a);
+  return GNUNET_OK;
+}
+/**
+ * Absolute time in network byte order.
+ *
+ * @param name name of the JSON field
+ * @param[out] at where to store the absolute time found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_absolute_time_nbo (const char *name,
+                                    struct GNUNET_TIME_AbsoluteNBO *at)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_abs_time_nbo,
+    .cleaner = NULL,
+    .cls = NULL,
+    .field = name,
+    .ptr = at,
+    .ptr_size = sizeof (uint64_t),
+    .size_ptr = NULL
+  };
+  return ret;
+}
+/**
 * Parse given JSON object to relative time.
 *
 * @param cls closure, NULL
diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 1a61abb09..8a754d3db 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -51,12 +51,13 @@ gnunet_service_multicast_LDADD = \
  $(GN_LIBINTL)
 check_PROGRAMS = \
- test_multicast \
+  test_multicast_multipeer
- test_multicast_2peers
+#  test_multicast 
-# test_multicast_multipeer
+#  test_multicast_2peers
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME; export GNUNET_FORCE_LOG=';;;;INFO';
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME;
+#AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME; export GNUNET_FORCE_LOG=';;;;INFO';
 TESTS = $(check_PROGRAMS)
 endif
@@ -67,8 +68,15 @@ test_multicast_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_multicast_2peers_SOURCE = \
+test_multicast_multipeer_SOURCES = \
- test_multicast_2peers.c
+  test_multicast_multipeer.c
+test_multicast_multipeer_LDADD = \
+  libgnunetmulticast.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+test_multicast_2peers_SOURCES = \
+  test_multicast_2peers.c
 test_multicast_2peers_LDADD = \
  libgnunetmulticast.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c
index 058533e50..8ce4d585f 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -181,6 +181,7 @@ member_message (void *cls,
  GNUNET_SCHEDULER_shutdown ();
 }
 static void
 origin_join_request (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -215,6 +216,7 @@ origin_join_request (void *cls,
  result = GNUNET_OK;
 }
 int
 origin_notify (void *cls,
               size_t *data_size,
@@ -246,6 +248,7 @@ origin_request (void *cls,
                                  NULL);
 }
 static void
 origin_message (void *cls,
                const struct GNUNET_MULTICAST_MessageHeader *msg)
@@ -262,17 +265,18 @@ service_connect1 (void *cls,
 {
  member = ca_result;
-  if (NULL != member)
+  if (NULL == member)
  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to multicast service of member\n");
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
  }
  else
  {
-    result = GNUNET_SYSERR;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to multicast service of member\n");
-    GNUNET_SCHEDULER_shutdown ();
  }
 }
 static void
 multicast_da1 (void *cls,
               void * op_result)
@@ -359,9 +363,10 @@ peer_information_cb (void *cls,
                                          multicast_da1,     /* callback to be called when closing the
                                                                opened service connection */
                                          NULL);                   /* closure for the above two callbacks */
-    }
+  }
 }
 /**
 * Test logic of peer "0" being origin starts here.
 *
@@ -495,7 +500,7 @@ main (int argc, char *argv[])
  result = GNUNET_SYSERR;
  ret = GNUNET_TESTBED_test_run
-      ("test-multicast-multipeer",  /* test case name */
+      ("test-multicast-2peers",  /* test case name */
       "test_multicast.conf", /* template configuration */
       NUM_PEERS,       /* number of peers to start */
       0LL, /* Event mask - set to 0 for no event notifications */
@@ -508,4 +513,5 @@ main (int argc, char *argv[])
  return 0;
 }
-/* end of test_multicast_multipeer.c */
+/* end of test_multicast_2peers.c */
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index 58e43d4ba..c2078abf9 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -33,34 +33,39 @@
 #include "gnunet_testbed_service.h"
 #include "gnunet_multicast_service.h"
-#define NUM_PEERS 2
+#define NUM_PEERS 3
-static struct GNUNET_TESTBED_Operation *op0;
-static struct GNUNET_TESTBED_Operation *op1;
-static struct GNUNET_TESTBED_Operation *pi_op0;
-static struct GNUNET_TESTBED_Operation *pi_op1;
+struct multicast_peer
+{
+  int peer; /* peer number */
+  struct GNUNET_TESTBED_Operation *op; /* not yet in use */
+  struct GNUNET_TESTBED_Operation *pi_op; /* not yet in use */
+  uint8_t test_ok;
+};
+static void service_connect (void *cls,
+                             struct GNUNET_TESTBED_Operation *op,
+                             void *ca_result,
+                             const char *emsg);
+static struct multicast_peer **mc_peers;
 static struct GNUNET_TESTBED_Peer **peers;
-const struct GNUNET_PeerIdentity *peer_id[2];
-static struct GNUNET_SCHEDULER_Task *timeout_tid;
+// FIXME: refactor
+static struct GNUNET_TESTBED_Operation *op[NUM_PEERS];
+static struct GNUNET_TESTBED_Operation *pi_op[NUM_PEERS];
+static const struct GNUNET_PeerIdentity *peer_id[NUM_PEERS];
 static struct GNUNET_MULTICAST_Origin *origin;
-static struct GNUNET_MULTICAST_Member *member;
+static struct GNUNET_MULTICAST_Member *member[NUM_PEERS]; /* first element always empty */
-struct GNUNET_CRYPTO_EddsaPrivateKey *group_key;
+static struct GNUNET_SCHEDULER_Task *timeout_tid;
-struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key;
-struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key;
-struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *group_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey *group_pub_key;
-enum
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key[NUM_PEERS];
-{
+static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[NUM_PEERS];
-  TEST_INIT          = 0,
-  TEST_ORIGIN_START  = 1,
-  TEST_MEMBER_JOIN   = 2,
-} test;
 /**
@@ -68,7 +73,6 @@ enum
 */
 static int result;
 /**
 * Function run on CTRL-C or shutdown (i.e. success/timeout/etc.).
 * Cleans up.
@@ -76,31 +80,35 @@ static int result;
 static void
 shutdown_task (void *cls)
 {
-  if (NULL != op0)
+  if (NULL != mc_peers)
-  {
-    GNUNET_TESTBED_operation_done (op0);
-    op0 = NULL;
-  }
-  if (NULL != op1)
  {
-    GNUNET_TESTBED_operation_done (op1);
+    for (int i=0; i < NUM_PEERS; i++)
-    op1 = NULL;
+    {
+      GNUNET_free (mc_peers[i]);
+      mc_peers[i] = NULL;
+    }
+    GNUNET_free (mc_peers);
  }
-  if (NULL != pi_op0)
+  for (int i=0;i<NUM_PEERS;i++)
  {
-    GNUNET_TESTBED_operation_done (pi_op0);
+    if (NULL != op[i])
-    pi_op0 = NULL;
+    {
+      GNUNET_TESTBED_operation_done(op[i]);
+      op[i] = NULL;
+    }
+    if (NULL != pi_op[i])
+    {
+      GNUNET_TESTBED_operation_done (pi_op[i]);
+      pi_op[i] = NULL;
+    }
  }
-  if (NULL != pi_op1)
+  if (NULL != timeout_tid)
  {
-    GNUNET_TESTBED_operation_done (pi_op1);
+    GNUNET_SCHEDULER_cancel (timeout_tid);
-    pi_op1 = NULL;
+    timeout_tid = NULL;
  }
-  if (NULL != timeout_tid)
-    {
-      GNUNET_SCHEDULER_cancel (timeout_tid);
-      timeout_tid = NULL;
-    }
 }
@@ -120,22 +128,26 @@ member_join_request (void *cls,
                     const struct GNUNET_MessageHeader *join_msg,
                     struct GNUNET_MULTICAST_JoinHandle *jh)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Member sent a join request.\n");
+              "Peer #%u sent a join request.\n", mc_peer->peer);
 }
-int notify (void *cls,
-            size_t *data_size,
+static int 
-            void *data)
+notify (void *cls,
+        size_t *data_size,
+        void *data)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
  char text[] = "ping";
  *data_size = strlen(text)+1;
  GNUNET_memcpy(data, text, *data_size);
  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-              "Member sents message to origin: %s\n", text);
+              "Peer #%u sents message to origin: %s\n", mc_peer->peer, text);
  return GNUNET_YES;
 }
@@ -149,21 +161,23 @@ member_join_decision (void *cls,
                      const struct GNUNET_PeerIdentity *relays,
                      const struct GNUNET_MessageHeader *join_msg)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
  struct GNUNET_MULTICAST_MemberTransmitHandle *req;
  
  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-              "Member received a decision from origin: %s\n", (GNUNET_YES == is_admitted)?"accepted":"rejected");
+              "Peer #%u received a decision from origin: %s\n", mc_peer->peer, (GNUNET_YES == is_admitted)?"accepted":"rejected");
  
  if (GNUNET_YES == is_admitted)
  {
-    req = GNUNET_MULTICAST_member_to_origin (member,
+    req = GNUNET_MULTICAST_member_to_origin (member[mc_peer->peer],
                                             0,
                                             notify,
-                                             NULL);
+                                             cls);
    
  }
 }
 static void
 member_replay_frag ()
 {
@@ -171,6 +185,7 @@ member_replay_frag ()
              "member replay frag...\n");
 }
 static void
 member_replay_msg ()
 {
@@ -178,17 +193,42 @@ member_replay_msg ()
              "member replay msg...\n");
 }
 static void
-member_message ()
+member_message (void *cls, 
+                const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
+  if (0 != strncmp ("pong", (char *)&msg[1], 4)) 
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "peer #%i did not receive pong\n", 
+                mc_peer->peer);
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
+  }
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "member message...\n");
+              "peer #%i receives: %s\n", 
+              mc_peer->peer,
+              (char *)&msg[1]);
+  mc_peer->test_ok = GNUNET_OK;
+  // FIXME: ugly test function
+  /*
+  for (int i=1; i<NUM_PEERS; i++)
+    if (!mc_peers[i]->test_ok)
+      return;
-  // FIXME: not finished here
  result = GNUNET_YES;
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_SCHEDULER_shutdown();
+  */
 }
 static void
 origin_join_request (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -223,6 +263,7 @@ origin_join_request (void *cls,
  result = GNUNET_OK;
 }
 static void
 origin_replay_frag (void *cls,
                    const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -233,6 +274,7 @@ origin_replay_frag (void *cls,
  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay fraq msg\n");
 }
 static void
 origin_replay_msg (void *cls,
                   const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -246,7 +288,7 @@ origin_replay_msg (void *cls,
 }
-int
+static int
 origin_notify (void *cls, 
               size_t *data_size, 
               void *data)
@@ -275,9 +317,10 @@ origin_request (void *cls,
                                  0,
                                  0,
                                  origin_notify,
-                                  NULL);
+                                  cls);
 }
 static void
 origin_message (void *cls,
                const struct GNUNET_MULTICAST_MessageHeader *msg) 
@@ -287,176 +330,169 @@ origin_message (void *cls,
 static void
-service_connect1 (void *cls,
+multicast_da (void *cls,
-                  struct GNUNET_TESTBED_Operation *op,
+              void *op_result)
-                  void *ca_result,
-                  const char *emsg)
 {
-  member = ca_result;
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
-  if (NULL != member)
+  if (0 == mc_peer->peer)
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to multicast service of member\n");
+  {
-  else
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-    result = GNUNET_SYSERR;
+                "Origin closes multicast group\n");
-}
-static void
+    GNUNET_MULTICAST_origin_stop (origin, NULL, cls);
-multicast_da1 (void *cls,
+  }
-               void * op_result)
+  else 
-{
+  {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Member parting from multicast group\n");
+                "peer #%u parting from multicast group\n", mc_peer->peer);
-  GNUNET_MULTICAST_member_part (member, NULL, NULL);
+    GNUNET_MULTICAST_member_part (member[mc_peer->peer], NULL, cls);
+  }
 }
 static void *
-multicast_ca1 (void *cls,
+multicast_ca (void *cls,
-               const struct GNUNET_CONFIGURATION_Handle *cfg)
+              const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
  struct GNUNET_MessageHeader *join_msg;
+  char data[64];
-  // Get members keys
-  member_key = GNUNET_CRYPTO_ecdsa_key_create ();
-  GNUNET_CRYPTO_ecdsa_key_get_public (member_key, &member_pub_key);
  
-  char data[] = "Hi, can I enter?";
+  if (0 == mc_peer->peer)
-  uint8_t data_size = strlen (data) + 1;
+  {
-  join_msg = GNUNET_malloc (sizeof (join_msg) + data_size);
+    group_pub_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPublicKey);
-  join_msg->size = htons (sizeof (join_msg) + data_size);
+    group_key = GNUNET_CRYPTO_eddsa_key_create ();
-  join_msg->type = htons (123);
+    GNUNET_CRYPTO_eddsa_key_get_public (group_key, group_pub_key);
-  GNUNET_memcpy (&join_msg[1], data, data_size);
+    return GNUNET_MULTICAST_origin_start (cfg,
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                                          group_key,
-              "Members tries to join multicast group\n");
+                                          0,
+                                          origin_join_request,
-  return GNUNET_MULTICAST_member_join (cfg,
+                                          origin_replay_frag,
-                                       &group_pub_key,
+                                          origin_replay_msg,
-                                       member_key,
+                                          origin_request,
-                                       peer_id[0],
+                                          origin_message,
-                                       0,
+                                          cls);
-                                       NULL,
+  }
-                                       join_msg, /* join message */
+  else
-                                       member_join_request,
+  {
-                                       member_join_decision,
+    // Get members keys
-                                       member_replay_frag,
+    member_pub_key[mc_peer->peer] = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
-                                       member_replay_msg,
+    member_key[mc_peer->peer] = GNUNET_CRYPTO_ecdsa_key_create ();
-                                       member_message,
+    GNUNET_CRYPTO_ecdsa_key_get_public (member_key[mc_peer->peer], member_pub_key[mc_peer->peer]);
-                                       NULL);
+    
+    sprintf(data, "Hi, I am peer #%u. Can I enter?", mc_peer->peer);
+    uint8_t data_size = strlen (data) + 1;
+    join_msg = GNUNET_malloc (sizeof (join_msg) + data_size);
+    join_msg->size = htons (sizeof (join_msg) + data_size);
+    join_msg->type = htons (123);
+    GNUNET_memcpy (&join_msg[1], data, data_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Peer #%u tries to join multicast group\n", mc_peer->peer);
+    return GNUNET_MULTICAST_member_join (cfg,
+                                         group_pub_key,
+                                         member_key[mc_peer->peer],
+                                         peer_id[0],
+                                         0,
+                                         NULL,
+                                         join_msg, /* join message */
+                                         member_join_request,
+                                         member_join_decision,
+                                         member_replay_frag,
+                                         member_replay_msg,
+                                         member_message,
+                                         cls);
+  }
 }
 static void
 peer_information_cb (void *cls,
-                     struct GNUNET_TESTBED_Operation *op,
+                     struct GNUNET_TESTBED_Operation *operation,
                     const struct GNUNET_TESTBED_PeerInformation *pinfo,
                     const char *emsg)
 {
-  int i = (int) (long) cls;
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
  if (NULL == pinfo) {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got no peer information\n");
    result = GNUNET_SYSERR;
    GNUNET_SCHEDULER_shutdown ();
  }
-  peer_id[i] = pinfo->result.id;
+  peer_id[mc_peer->peer] = pinfo->result.id;
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Got peer information of %s (%s)\n", (0==i)?"origin":"member" ,GNUNET_i2s(pinfo->result.id));
+              "Got peer information of %s (%s)\n", (0==mc_peer->peer)?"origin":"member" ,GNUNET_i2s(pinfo->result.id));
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Create member peer\n");
+              "Create peer #%u\n", mc_peer->peer);
-  if (0 == i) {
+  if (0 != mc_peer->peer)
-  /* connect to multicast service of member */
+  {
-  op1 = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
+    /* connect to multicast service of members */
-                                        peers[1],                /* The peer whose service to connect to */
+    op[mc_peer->peer] = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
-                                        "multicast",             /* The name of the service */
+                                                        peers[mc_peer->peer],                /* The peer whose service to connect to */
-                                        service_connect1,   /* callback to call after a handle to service
+                                                        "multicast",             /* The name of the service */
-                                                               is opened */
+                                                        service_connect,         /* callback to call after a handle to service
-                                        NULL,                    /* closure for the above callback */
+                                                                                    is opened */
-                                        multicast_ca1,      /* callback to call with peer's configuration;
+                                                        cls,               /* closure for the above callback */
-                                                               this should open the needed service connection */
+                                                        multicast_ca,            /* callback to call with peer's configuration;
-                                        multicast_da1,     /* callback to be called when closing the
+                                                                                    this should open the needed service connection */
-                                                              opened service connection */
+                                                        multicast_da,            /* callback to be called when closing the
-                                        NULL);                   /* closure for the above two callbacks */
+                                                                                    opened service connection */
+                                                        cls);              /* closure for the above two callbacks */
  }
 }
-/**
- * Test logic of peer "0" being origin starts here.
- *
- * @param cls closure, for the example: NULL
- * @param op should be equal to "dht_op"
- * @param ca_result result of the connect operation, the
- *        connection to the DHT service
- * @param emsg error message, if testbed somehow failed to
- *        connect to the DHT.
- */
 static void
-service_connect0 (void *cls,
+service_connect (void *cls,
-                  struct GNUNET_TESTBED_Operation *op,
+                 struct GNUNET_TESTBED_Operation *op,
-                  void *ca_result,
+                 void *ca_result,
-                  const char *emsg)
+                 const char *emsg)
 {
-  origin = ca_result;
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Connected to multicast service of origin\n");
-  // Get GNUnet identity of origin
-  pi_op0 = GNUNET_TESTBED_peer_get_information (peers[0],
-                                               GNUNET_TESTBED_PIT_IDENTITY,
-                                               peer_information_cb,
-                                               (void *) 0);
-  // Get GNUnet identity of member
-  pi_op1 = GNUNET_TESTBED_peer_get_information (peers[1],
-                                               GNUNET_TESTBED_PIT_IDENTITY,
-                                               peer_information_cb,
-                                               (void *) 1);
-  /* Connection to service successful. Here we'd usually do something with
-   * the service. */
-  result = GNUNET_OK;
-  //GNUNET_SCHEDULER_shutdown (); /* Also kills the testbed */
-}
+  if (NULL == ca_result)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+                "Connection adapter not created for peer #%u\n", mc_peer->peer);
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown();
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+              "Connected to multicast service of peer #%u\n", mc_peer->peer);
-/**
+  if (0 == mc_peer->peer)
- * Function run when service multicast has started and is providing us
+  {
- * with a configuration file.
+    origin = ca_result;
- */
-static void *
-multicast_ca0 (void *cls,
-               const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  group_key = GNUNET_CRYPTO_eddsa_key_create ();
-  GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key);
-  return GNUNET_MULTICAST_origin_start (cfg,
-                                        group_key,
-                                        0,
-                                        origin_join_request,
-                                        origin_replay_frag,
-                                        origin_replay_msg,
-                                        origin_request,
-                                        origin_message,
-                                        NULL);
-}
-static void
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-multicast_da0 (void *cls,
+                "Connected to multicast service of origin\n");
-               void *op_result)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Origin closes multicast group\n");
-  GNUNET_MULTICAST_origin_stop (origin, NULL, NULL);
+    // Get GNUnet identity of members
+    for (int i = 0; i<NUM_PEERS; i++) 
+    {
+      pi_op[i] = GNUNET_TESTBED_peer_get_information (peers[i],
+                                                      GNUNET_TESTBED_PIT_IDENTITY,
+                                                      peer_information_cb,
+                                                      mc_peers[i]);
+    }
+  }
+  else 
+  {
+    member[mc_peer->peer] = ca_result;
+  }
 }
 /**
 * Main function inovked from TESTBED once all of the
 * peers are up and running.  This one then connects
@@ -483,6 +519,7 @@ testbed_master (void *cls,
 {
  /* Testbed is ready with peers running and connected in a pre-defined overlay
     topology (FIXME)  */
+  
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              "Connected to testbed_master()\n");
@@ -490,22 +527,33 @@ testbed_master (void *cls,
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              "Create origin peer\n");
-  op0 = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
-                                        peers[0],                /* The peer whose service to connect to */
+  mc_peers = GNUNET_new_array (NUM_PEERS, struct multicast_peer*);
-                                        "multicast",             /* The name of the service */
-                                        service_connect0,   /* callback to call after a handle to service
+  // Create test contexts for members
-                                                               is opened */
+  for (int i = 0; i<NUM_PEERS; i++) 
-                                        NULL,                    /* closure for the above callback */
+  {
-                                        multicast_ca0,      /* callback to call with peer's configuration;
+    mc_peers[i] = GNUNET_new (struct multicast_peer);
-                                                               this should open the needed service connection */
+    mc_peers[i]->peer = i;
-                                        multicast_da0,     /* callback to be called when closing the
+    mc_peers[i]->test_ok = GNUNET_NO;
-                                                              opened service connection */
+  }
-                                        NULL);                   /* closure for the above two callbacks */
+  op[0] = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
+                                          peers[0],                /* The peer whose service to connect to */
+                                          "multicast",             /* The name of the service */
+                                          service_connect,   /* callback to call after a handle to service
+                                                                 is opened */
+                                          mc_peers[0],                    /* closure for the above callback */
+                                          multicast_ca,      /* callback to call with peer's configuration;
+                                                                 this should open the needed service connection */
+                                          multicast_da,     /* callback to be called when closing the
+                                                                opened service connection */
+                                          mc_peers[0]);                   /* closure for the above two callbacks */
  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */
  /* Schedule the shutdown task with a delay of a few Seconds */
-  timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 48),
+  timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 80),
                                              &timeout_task, NULL);
 }
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index de46e9c89..1b99fcc45 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -114,7 +114,6 @@ libgnunetnamestore_la_SOURCES = \
 libgnunetnamestore_la_LIBADD = \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la  \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/dns/libgnunetdnsparser.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 libgnunetnamestore_la_LDFLAGS = \
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 4b9a06c40..5ab8739af 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -47,8 +47,9 @@ libgnunetsecretsharing_la_SOURCES = \
  secretsharing_api.c \
  secretsharing_common.c \
  secretsharing.h
-libgnunetsecretsharing_la_LIBADD = \
+libgnunetsecretsharing_la_LIBADD = \ 
  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LIBGCRYPT_LIBS) \
  $(LTLIBINTL)
 libgnunetsecretsharing_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 61cfba2ff..94b981eee 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -106,7 +106,6 @@ libgnunettestbed_la_SOURCES = \
  testbed_api_sd.c testbed_api_sd.h \
  testbed_api_barriers.c
 libgnunettestbed_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/core/libgnunetcore.la \
 $(top_builddir)/src/statistics/libgnunetstatistics.la \
 $(top_builddir)/src/transport/libgnunettransport.la \
 $(top_builddir)/src/hello/libgnunethello.la \
diff --git a/src/util/strings.c b/src/util/strings.c
index d3268f4d9..f554a9e83 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -818,6 +818,7 @@ GNUNET_STRINGS_get_short_name (const char *filename)
 {
  const char *short_fn = filename;
  const char *ss;
  while (NULL != (ss = strstr (short_fn, DIR_SEPARATOR_STR))
      && (ss[1] != '\0'))
    short_fn = 1 + ss;